Tht server 182 마이페이지 상세 추가정보 추가 (#196)

* fix : 토큰 시간 변경 * docs : 유저 마이페이지 설정 상세조회 추가정보 문서화 * feat : 마이페이지 유저 상세정보 추가 * feat : 다른 유저 정보 조회 상태값 변경
THT-Team · Mar 19, 2024 · dc27811 · dc27811
1 parent db44450
commit dc27811
Show file tree

Hide file tree

Showing 5 changed files with 511 additions and 468 deletions.
diff --git a/src/main/java/com/tht/api/app/config/security/TokenProvider.java b/src/main/java/com/tht/api/app/config/security/TokenProvider.java
@@ -28,9 +28,7 @@
 @Component
 public class TokenProvider {
 
-//    private static final long ACCESS_TOKEN_VALID_PERIOD =  1000L * 60 * 90;
-
-    private static final long ACCESS_TOKEN_VALID_PERIOD =  1000L * 30;
+    private static final long ACCESS_TOKEN_VALID_PERIOD =  1000L * 60 * 60 * 24 * 7; //7일
 
     private final Key jwtSecretKey;
     private final UserService userService;

diff --git a/src/main/java/com/tht/api/app/entity/enums/Gender.java b/src/main/java/com/tht/api/app/entity/enums/Gender.java
@@ -2,16 +2,21 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tht.api.exception.custom.EnumStateNotFoundException;
-import java.util.Arrays;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Arrays;
+
 @Getter
+@AllArgsConstructor
 @JsonFormat(shape = JsonFormat.Shape.STRING)
-public enum Gender {
+public enum Gender implements EnumModel{
+
+    MALE("MALE"),
+    FEMALE("FEMALE"),
+    BISEXUAL("BISEXUAL");
 
-    MALE,
-    FEMALE,
-    BISEXUAL;
+    private final String value;
 
     public static Gender toConverter(final String name) {
         return Arrays.stream(Gender.values())
@@ -20,4 +25,13 @@ public static Gender toConverter(final String name) {
             .orElseThrow(() -> EnumStateNotFoundException.ofGender(name));
     }
 
+    @Override
+    public String getKey() {
+        return name();
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/src/main/java/com/tht/api/app/facade/user/response/UserDetailResponse.java b/src/main/java/com/tht/api/app/facade/user/response/UserDetailResponse.java
@@ -1,5 +1,9 @@
 package com.tht.api.app.facade.user.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.tht.api.app.entity.enums.Gender;
+import com.tht.api.app.entity.enums.UserFrequency;
+import com.tht.api.app.entity.enums.UserReligion;
 import com.tht.api.app.entity.user.User;
 import com.tht.api.app.entity.user.UserLocationInfo;
 import com.tht.api.app.entity.user.UserProfilePhoto;
@@ -8,6 +12,7 @@
 import com.tht.api.app.repository.mapper.IdealTypeMapper;
 import com.tht.api.app.repository.mapper.InterestMapper;
 import com.tht.api.app.utils.ConvertAgeUtils;
+
 import java.util.List;
 
 public record UserDetailResponse (
@@ -18,6 +23,13 @@ public record UserDetailResponse (
     String address,
     String phoneNumber,
     String email,
+    Gender gender,
+    @JsonProperty("prefer_gender")
+    Gender preferGender,
+    int tall,
+    UserFrequency smoking,
+    UserFrequency drinking,
+    UserReligion religion,
     List<IdealTypeResponse> idealTypeList,
     List<InterestResponse> interestsList,
     List<UserProfilePhotoResponse> userProfilePhotos
@@ -38,6 +50,12 @@ public static UserDetailResponse of(
             userLocationInfo.getAddress(),
             user.getPhoneNumber(),
             user.getEmail(),
+            user.getGender(),
+            user.getPreferGender(),
+            user.getTall(),
+            user.getSmoking(),
+            user.getDrinking(),
+            user.getReligion(),
             idealTypeMappers.stream().map(IdealTypeResponse::of).toList(),
             interestMappers.stream().map(InterestResponse::of).toList(),
             profilePhotoMappers.stream().map(UserProfilePhotoResponse::of).toList()