diff --git a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java index c126da674..b73812a2a 100644 --- a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java +++ b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java @@ -31,15 +31,13 @@ public class AuthController implements AuthControllerSwagger { @PostMapping("/kakao") public ResponseEntity processKakaoOauth(@RequestBody KakaoCodeRequest kakaoCodeRequest) { KakaoOauthResponse kakaoOauthResponse = signInService.signIn(kakaoCodeRequest); - return ResponseEntity - .ok(kakaoOauthResponse); + return ResponseEntity.ok(kakaoOauthResponse); } @PostMapping("/sign-up") public ResponseEntity signUp(@Valid @RequestBody SignUpRequest signUpRequest) { SignUpResponse signUpResponseDto = signUpService.signUp(signUpRequest); - return ResponseEntity - .ok(signUpResponseDto); + return ResponseEntity.ok(signUpResponseDto); } @PostMapping("/sign-out") @@ -57,7 +55,6 @@ public ResponseEntity quit(Principal principal) { @PostMapping("/reissue") public ResponseEntity reissueToken(Principal principal) { ReissueResponse reissueResponse = authService.reissue(principal.getName()); - return ResponseEntity - .ok(reissueResponse); + return ResponseEntity.ok(reissueResponse); } } diff --git a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java index 0f035c905..892094394 100644 --- a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java +++ b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java @@ -19,6 +19,9 @@ public record MyPageResponse( @Schema(description = "생년월일", example = "1990-01-01") String birth, + @Schema(description = "이메일", example = "example@solid-conenct.net") + String email, + @Schema(description = "좋아요 누른 게시물 수", example = "0") int likedPostCount, @@ -34,6 +37,7 @@ public static MyPageResponse of(SiteUser siteUser, int likedUniversityCount) { siteUser.getProfileImageUrl(), siteUser.getRole(), siteUser.getBirth(), + siteUser.getEmail(), 0, // TODO: 커뮤니티 기능 생기면 업데이트 필요 0, // TODO: 멘토 기능 생기면 업데이트 필요 likedUniversityCount diff --git a/src/test/java/com/example/solidconnection/e2e/MyPageTest.java b/src/test/java/com/example/solidconnection/e2e/MyPageTest.java index 953fddf8b..059e00cde 100644 --- a/src/test/java/com/example/solidconnection/e2e/MyPageTest.java +++ b/src/test/java/com/example/solidconnection/e2e/MyPageTest.java @@ -52,6 +52,7 @@ public void setUpUserAndToken() { assertAll("불러온 마이 페이지 정보가 DB의 정보와 일치한다.", () -> assertThat(myPageResponse.nickname()).isEqualTo(savedSiteUser.getNickname()), () -> assertThat(myPageResponse.birth()).isEqualTo(savedSiteUser.getBirth()), - () -> assertThat(myPageResponse.profileImageUrl()).isEqualTo(savedSiteUser.getProfileImageUrl())); + () -> assertThat(myPageResponse.profileImageUrl()).isEqualTo(savedSiteUser.getProfileImageUrl()), + () -> assertThat(myPageResponse.email()).isEqualTo(savedSiteUser.getEmail())); } }