Merge pull request #93 from OnAndOff-UMC/refactor/#88

[refactor]: 유저 정보 수정 API 요청DTO, 응답DTO enum value로 변경
OnAndOff-UMC · Feb 17, 2024 · 0256f82 · 0256f82
2 parents d90d565 + d15945b
commit 0256f82
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/src/main/java/com/onnoff/onnoff/domain/user/User.java b/src/main/java/com/onnoff/onnoff/domain/user/User.java
@@ -101,9 +101,12 @@ public void setUserStatusInactive(){
     }
 
     public void updateUser(UserRequestDTO.ModifyUserDTO modifyUserDTO) {
+        FieldOfWork fieldOfWork = FieldOfWork.fromValue(modifyUserDTO.getFieldOfWork());
+        ExperienceYear experienceYear = ExperienceYear.fromValue(modifyUserDTO.getExperienceYear());
+
         this.nickname = modifyUserDTO.getNickname();
-        this.fieldOfWork = modifyUserDTO.getFieldOfWork();
         this.job = modifyUserDTO.getJob();
-        this.experienceYear = modifyUserDTO.getExperienceYear();
+        this.fieldOfWork = fieldOfWork;
+        this.experienceYear = experienceYear;
     }
 }
diff --git a/src/main/java/com/onnoff/onnoff/domain/user/controller/UserController.java b/src/main/java/com/onnoff/onnoff/domain/user/controller/UserController.java
@@ -37,8 +37,8 @@ public ApiResponse<UserResponseDTO.UserDetailDTO> withdrawUser(){
 
     @PutMapping("/")
     @Operation(summary = "회원 정보 수정 API" , description = "회원 정보 수정 API입니다.")
-    public ApiResponse<UserResponseDTO.UserDetailDTO> modifyUser(@RequestBody UserRequestDTO.ModifyUserDTO modifyUserDTO) {
-        return ApiResponse.onSuccess(UserConverter.toUserDetailDTO(userService.modifyUser(modifyUserDTO)));
+    public ApiResponse<UserResponseDTO.UserModificationResponseDTO> modifyUser(@RequestBody UserRequestDTO.ModifyUserDTO modifyUserDTO) {
+        return ApiResponse.onSuccess(UserConverter.toUserModificationResponseDTO(userService.modifyUser(modifyUserDTO)));
     }
 
     //테스트용

diff --git a/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java b/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java
@@ -74,5 +74,12 @@ public static UserResponseDTO.UserInformationResponseDTO toUserInformationRespon
                 .fieldOfWork(user.getFieldOfWork())
                 .build();
     }
-
+    public static UserResponseDTO.UserModificationResponseDTO toUserModificationResponseDTO(User user){
+        return UserResponseDTO.UserModificationResponseDTO.builder()
+                .nickname(user.getNickname())
+                .experienceYear(user.getExperienceYear().getValue())
+                .fieldOfWork(user.getFieldOfWork().getValue())
+                .job(user.getJob())
+                .build();
+    }
 }
diff --git a/src/main/java/com/onnoff/onnoff/domain/user/dto/UserRequestDTO.java b/src/main/java/com/onnoff/onnoff/domain/user/dto/UserRequestDTO.java
@@ -23,9 +23,9 @@ public class UserRequestDTO {
     @AllArgsConstructor
     public static class ModifyUserDTO{
         private String nickname;
-        private FieldOfWork fieldOfWork;
+        private String fieldOfWork;
         private String job;
-        private ExperienceYear experienceYear;
+        private String experienceYear;
     }
 
     @Getter

diff --git a/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java b/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java
@@ -52,5 +52,14 @@ public static class UserInformationResponseDTO {
         private FieldOfWork fieldOfWork;
         private ExperienceYear experienceYear;
     }
-
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class UserModificationResponseDTO {
+        private String nickname;
+        private String fieldOfWork;
+        private String experienceYear;
+        private String job;
+    }
 }