Merge branch 'dev'

LoveMarker · Nov 28, 2024 · 5d2e331 · 5d2e331
2 parents 49ce867 + 8403c34
commit 5d2e331
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/com/lovemarker/domain/user/controller/UserController.java b/src/main/java/com/lovemarker/domain/user/controller/UserController.java
@@ -1,7 +1,8 @@
 package com.lovemarker.domain.user.controller;
 
-import com.lovemarker.domain.user.dto.response.FindMyPageResponse;
 import com.lovemarker.domain.user.dto.request.UpdateUserNicknameRequest;
+import com.lovemarker.domain.user.dto.response.FindMyPageResponse;
+import com.lovemarker.domain.user.dto.response.UpdateUserNicknameResponse;
 import com.lovemarker.domain.user.service.UserService;
 import com.lovemarker.global.config.resolver.UserId;
 import com.lovemarker.global.constant.SuccessCode;
@@ -29,11 +30,11 @@ public ApiResponseDto<FindMyPageResponse> findMyPage(
     }
 
     @PatchMapping("/nickname")
-    public ApiResponseDto updateUserNickname(
+    public ApiResponseDto<UpdateUserNicknameResponse> updateUserNickname(
         @UserId Long userId,
         @Valid @RequestBody final UpdateUserNicknameRequest updateUserNicknameRequest
     ) {
-        userService.updateUserNickname(userId, updateUserNicknameRequest.nickname());
-        return ApiResponseDto.success(SuccessCode.UPDATE_USER_NICKNAME_SUCCESS);
+        return ApiResponseDto.success(SuccessCode.UPDATE_USER_NICKNAME_SUCCESS,
+            userService.updateUserNickname(userId, updateUserNicknameRequest.nickname()));
     }
 }
diff --git a/src/main/java/com/lovemarker/domain/user/dto/response/UpdateUserNicknameResponse.java b/src/main/java/com/lovemarker/domain/user/dto/response/UpdateUserNicknameResponse.java
@@ -0,0 +1,11 @@
+package com.lovemarker.domain.user.dto.response;
+
+import com.lovemarker.domain.user.User;
+
+public record UpdateUserNicknameResponse(
+    String nickname
+) {
+    public static UpdateUserNicknameResponse from(User user) {
+        return new UpdateUserNicknameResponse(user.getNickname());
+    }
+}
diff --git a/src/main/java/com/lovemarker/domain/user/service/UserService.java b/src/main/java/com/lovemarker/domain/user/service/UserService.java
@@ -3,6 +3,7 @@
 import com.lovemarker.domain.couple.Couple;
 import com.lovemarker.domain.user.User;
 import com.lovemarker.domain.user.dto.response.FindMyPageResponse;
+import com.lovemarker.domain.user.dto.response.UpdateUserNicknameResponse;
 import com.lovemarker.domain.user.exception.UserNicknameDuplicateException;
 import com.lovemarker.domain.user.exception.UserNotFoundException;
 import com.lovemarker.domain.user.repository.UserRepository;
@@ -21,9 +22,11 @@ public class UserService {
     private final UserRepository userRepository;
 
     @Transactional
-    public void updateUserNickname(Long userId, String nickname) {
+    public UpdateUserNicknameResponse updateUserNickname(Long userId, String nickname) {
         checkDuplicatedNickname(nickname);
-        getUserByUserId(userId).updateUserNickname(nickname);
+        User user = getUserByUserId(userId);
+        user.updateUserNickname(nickname);
+        return UpdateUserNicknameResponse.from(user);
     }
 
     @Transactional(readOnly = true)