Skip to content

Commit 2b5c336

Browse files
committed
refactor: long id를 받도록 MyPageController 수정
1 parent d1d7b07 commit 2b5c336

3 files changed

Lines changed: 15 additions & 14 deletions

File tree

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import com.example.solidconnection.common.resolver.AuthorizedUser;
5-
import com.example.solidconnection.siteuser.domain.SiteUser;
65
import com.example.solidconnection.siteuser.dto.MyPageResponse;
76
import com.example.solidconnection.siteuser.service.MyPageService;
87
import lombok.RequiredArgsConstructor;
@@ -23,19 +22,19 @@ class MyPageController {
2322

2423
@GetMapping
2524
public ResponseEntity<MyPageResponse> getMyPageInfo(
26-
@AuthorizedUser SiteUser siteUser
25+
@AuthorizedUser long siteUserId
2726
) {
28-
MyPageResponse myPageResponse = myPageService.getMyPageInfo(siteUser);
27+
MyPageResponse myPageResponse = myPageService.getMyPageInfo(siteUserId);
2928
return ResponseEntity.ok(myPageResponse);
3029
}
3130

3231
@PatchMapping
3332
public ResponseEntity<Void> updateMyPageInfo(
34-
@AuthorizedUser SiteUser siteUser,
33+
@AuthorizedUser long siteUserId,
3534
@RequestParam(value = "file", required = false) MultipartFile imageFile,
3635
@RequestParam(value = "nickname", required = false) String nickname
3736
) {
38-
myPageService.updateMyPageInfo(siteUser, imageFile, nickname);
37+
myPageService.updateMyPageInfo(siteUserId, imageFile, nickname);
3938
return ResponseEntity.ok().build();
4039
}
4140
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ public class MyPageService {
3434
* 마이페이지 정보를 조회한다.
3535
* */
3636
@Transactional(readOnly = true)
37-
public MyPageResponse getMyPageInfo(SiteUser siteUser) {
37+
public MyPageResponse getMyPageInfo(long siteUserId) {
38+
SiteUser siteUser = siteUserRepository.findById(siteUserId)
39+
.orElseThrow(() -> new CustomException(USER_NOT_FOUND));
3840
int likedUnivApplyInfoCount = likedUnivApplyInfoRepository.countBySiteUserId(siteUser.getId());
3941
return MyPageResponse.of(siteUser, likedUnivApplyInfoCount);
4042
}
@@ -43,8 +45,8 @@ public MyPageResponse getMyPageInfo(SiteUser siteUser) {
4345
* 마이페이지 정보를 수정한다.
4446
* */
4547
@Transactional
46-
public void updateMyPageInfo(SiteUser siteUser, MultipartFile imageFile, String nickname) {
47-
SiteUser user = siteUserRepository.findById(siteUser.getId())
48+
public void updateMyPageInfo(long siteUserId, MultipartFile imageFile, String nickname) {
49+
SiteUser user = siteUserRepository.findById(siteUserId)
4850
.orElseThrow(() -> new CustomException(USER_NOT_FOUND));
4951

5052
if (nickname != null) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void setUp() {
7575
int likedUnivApplyInfoCount = createLikedUnivApplyInfos(user);
7676

7777
// when
78-
MyPageResponse response = myPageService.getMyPageInfo(user);
78+
MyPageResponse response = myPageService.getMyPageInfo(user.getId());
7979

8080
// then
8181
Assertions.assertAll(
@@ -101,7 +101,7 @@ class 프로필_이미지_수정_테스트 {
101101
.willReturn(new UploadedFileUrlResponse(expectedUrl));
102102

103103
// when
104-
myPageService.updateMyPageInfo(user, imageFile, "newNickname");
104+
myPageService.updateMyPageInfo(user.getId(), imageFile, "newNickname");
105105

106106
// then
107107
SiteUser updatedUser = siteUserRepository.findById(user.getId()).get();
@@ -116,7 +116,7 @@ class 프로필_이미지_수정_테스트 {
116116
.willReturn(new UploadedFileUrlResponse("newProfileImageUrl"));
117117

118118
// when
119-
myPageService.updateMyPageInfo(user, imageFile, "newNickname");
119+
myPageService.updateMyPageInfo(user.getId(), imageFile, "newNickname");
120120

121121
// then
122122
then(s3Service).should(never()).deleteExProfile(any());
@@ -131,7 +131,7 @@ class 프로필_이미지_수정_테스트 {
131131
.willReturn(new UploadedFileUrlResponse("newProfileImageUrl"));
132132

133133
// when
134-
myPageService.updateMyPageInfo(커스텀_프로필_사용자, imageFile, "newNickname");
134+
myPageService.updateMyPageInfo(커스텀_프로필_사용자.getId(), imageFile, "newNickname");
135135

136136
// then
137137
then(s3Service).should().deleteExProfile(argThat(userId -> userId.equals(커스텀_프로필_사용자.getId())));
@@ -154,7 +154,7 @@ void setUp() {
154154
String newNickname = "newNickname";
155155

156156
// when
157-
myPageService.updateMyPageInfo(user, imageFile, newNickname);
157+
myPageService.updateMyPageInfo(user.getId(), imageFile, newNickname);
158158

159159
// then
160160
SiteUser updatedUser = siteUserRepository.findById(user.getId()).get();
@@ -171,7 +171,7 @@ void setUp() {
171171
siteUserRepository.save(user);
172172

173173
// when & then
174-
assertThatCode(() -> myPageService.updateMyPageInfo(user, imageFile, "nickname12"))
174+
assertThatCode(() -> myPageService.updateMyPageInfo(user.getId(), imageFile, "nickname12"))
175175
.isInstanceOf(CustomException.class)
176176
.hasMessage(createExpectedErrorMessage(modifiedAt));
177177
}

0 commit comments

Comments
 (0)