refactor: long id를 받도록 MyPageController 수정

Author: nayonsoso

src/main/java/com/example/solidconnection/siteuser/controller/MyPageController.java

@@ -2,7 +2,6 @@
 
 
 import com.example.solidconnection.common.resolver.AuthorizedUser;
-import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.dto.MyPageResponse;
 import com.example.solidconnection.siteuser.service.MyPageService;
 import lombok.RequiredArgsConstructor;
@@ -23,19 +22,19 @@ class MyPageController {
 
     @GetMapping
     public ResponseEntity<MyPageResponse> getMyPageInfo(
-            @AuthorizedUser SiteUser siteUser
+            @AuthorizedUser long siteUserId
     ) {
-        MyPageResponse myPageResponse = myPageService.getMyPageInfo(siteUser);
+        MyPageResponse myPageResponse = myPageService.getMyPageInfo(siteUserId);
         return ResponseEntity.ok(myPageResponse);
     }
 
     @PatchMapping
     public ResponseEntity<Void> updateMyPageInfo(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @RequestParam(value = "file", required = false) MultipartFile imageFile,
             @RequestParam(value = "nickname", required = false) String nickname
     ) {
-        myPageService.updateMyPageInfo(siteUser, imageFile, nickname);
+        myPageService.updateMyPageInfo(siteUserId, imageFile, nickname);
         return ResponseEntity.ok().build();
     }
 }

src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java

@@ -34,7 +34,9 @@ public class MyPageService {
      * 마이페이지 정보를 조회한다.
      * */
     @Transactional(readOnly = true)
-    public MyPageResponse getMyPageInfo(SiteUser siteUser) {
+    public MyPageResponse getMyPageInfo(long siteUserId) {
+        SiteUser siteUser = siteUserRepository.findById(siteUserId)
+                .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
         int likedUnivApplyInfoCount = likedUnivApplyInfoRepository.countBySiteUserId(siteUser.getId());
         return MyPageResponse.of(siteUser, likedUnivApplyInfoCount);
     }
@@ -43,8 +45,8 @@ public MyPageResponse getMyPageInfo(SiteUser siteUser) {
      * 마이페이지 정보를 수정한다.
      * */
     @Transactional
-    public void updateMyPageInfo(SiteUser siteUser, MultipartFile imageFile, String nickname) {
-        SiteUser user = siteUserRepository.findById(siteUser.getId())
+    public void updateMyPageInfo(long siteUserId, MultipartFile imageFile, String nickname) {
+        SiteUser user = siteUserRepository.findById(siteUserId)
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
 
         if (nickname != null) {

src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java

@@ -5,7 +5,6 @@
 import static com.example.solidconnection.siteuser.service.MyPageService.NICKNAME_LAST_CHANGE_DATE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.BDDMockito.any;
 import static org.mockito.BDDMockito.eq;
 import static org.mockito.BDDMockito.given;
@@ -75,7 +74,7 @@ void setUp() {
         int likedUnivApplyInfoCount = createLikedUnivApplyInfos(user);
 
         // when
-        MyPageResponse response = myPageService.getMyPageInfo(user);
+        MyPageResponse response = myPageService.getMyPageInfo(user.getId());
 
         // then
         Assertions.assertAll(
@@ -101,7 +100,7 @@ class 프로필_이미지_수정_테스트 {
                     .willReturn(new UploadedFileUrlResponse(expectedUrl));
 
             // when
-            myPageService.updateMyPageInfo(user, imageFile, "newNickname");
+            myPageService.updateMyPageInfo(user.getId(), imageFile, "newNickname");
 
             // then
             SiteUser updatedUser = siteUserRepository.findById(user.getId()).get();
@@ -116,10 +115,10 @@ class 프로필_이미지_수정_테스트 {
                     .willReturn(new UploadedFileUrlResponse("newProfileImageUrl"));
 
             // when
-            myPageService.updateMyPageInfo(user, imageFile, "newNickname");
+            myPageService.updateMyPageInfo(user.getId(), imageFile, "newNickname");
 
             // then
-            then(s3Service).should(never()).deleteExProfile(any());
+            then(s3Service).should(never()).deleteExProfile(user.getId());
         }
 
         @Test
@@ -131,10 +130,10 @@ class 프로필_이미지_수정_테스트 {
                     .willReturn(new UploadedFileUrlResponse("newProfileImageUrl"));
 
             // when
-            myPageService.updateMyPageInfo(커스텀_프로필_사용자, imageFile, "newNickname");
+            myPageService.updateMyPageInfo(커스텀_프로필_사용자.getId(), imageFile, "newNickname");
 
             // then
-            then(s3Service).should().deleteExProfile(argThat(userId -> userId.equals(커스텀_프로필_사용자.getId())));
+            then(s3Service).should().deleteExProfile(커스텀_프로필_사용자.getId());
         }
     }
 
@@ -154,7 +153,7 @@ void setUp() {
             String newNickname = "newNickname";
 
             // when
-            myPageService.updateMyPageInfo(user, imageFile, newNickname);
+            myPageService.updateMyPageInfo(user.getId(), imageFile, newNickname);
 
             // then
             SiteUser updatedUser = siteUserRepository.findById(user.getId()).get();
@@ -171,7 +170,7 @@ void setUp() {
             siteUserRepository.save(user);
 
             // when & then
-            assertThatCode(() -> myPageService.updateMyPageInfo(user, imageFile, "nickname12"))
+            assertThatCode(() -> myPageService.updateMyPageInfo(user.getId(), imageFile, "nickname12"))
                     .isInstanceOf(CustomException.class)
                     .hasMessage(createExpectedErrorMessage(modifiedAt));
         }