Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ public class AuthController implements AuthControllerSwagger {
@PostMapping("/kakao")
public ResponseEntity<KakaoOauthResponse> processKakaoOauth(@RequestBody KakaoCodeRequest kakaoCodeRequest) {
KakaoOauthResponse kakaoOauthResponse = signInService.signIn(kakaoCodeRequest);
return ResponseEntity
.ok(kakaoOauthResponse);
return ResponseEntity.ok(kakaoOauthResponse);
}

@PostMapping("/sign-up")
public ResponseEntity<SignUpResponse> signUp(@Valid @RequestBody SignUpRequest signUpRequest) {
SignUpResponse signUpResponseDto = signUpService.signUp(signUpRequest);
return ResponseEntity
.ok(signUpResponseDto);
return ResponseEntity.ok(signUpResponseDto);
}

@PostMapping("/sign-out")
Expand All @@ -57,7 +55,6 @@ public ResponseEntity<Void> quit(Principal principal) {
@PostMapping("/reissue")
public ResponseEntity<ReissueResponse> reissueToken(Principal principal) {
ReissueResponse reissueResponse = authService.reissue(principal.getName());
return ResponseEntity
.ok(reissueResponse);
return ResponseEntity.ok(reissueResponse);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}