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 @@ -365,7 +365,7 @@ public ResponseEntity<ApiResponse<Void>> acceptFollow(@AuthenticationPrincipal U
* */
@Operation(
summary = "랜덤 닉네임 재생성 API",
description = "랜덤 닉네임을 다시 생성하여 등록하고 바뀐 닉네임을 반환합니다."
description = "랜덤 닉네임을 다시 생성하여 반환합니다."
)
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "닉네임 재생성 성공"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,11 @@ public LoginResponseDTO loginWithKakao(String code, String type){

// 신규 회원가입 처리 로직 (DB 저장)
private Member signUp(String socialId, String email, String name, String picture, String socialType) {

// 랜덤 닉네임 생성
String nickname = nicknameGenerator.generateUniqueNickname();

Member newUser = Member.builder()
.email(email)
.name(name)
.profileImage(picture)
.nickname(nickname)
.nickname(null)
.password("OAuth Password") // 임시 패스워드
.privacyLevel(PrivacyLevel.PUBLIC) // 기본값: 전체공개
.socialId(socialId)
Expand Down Expand Up @@ -350,14 +346,11 @@ public JwtTokenDTO reissueToken(String refreshToken){
// 닉네임 재생성
@Transactional
public NicknameResponseDTO regenerateNickname(String email) {
Member member = getMemberByEmail(email);
getMemberByEmail(email);

// 랜덤 닉네임 생성
String newNickname = nicknameGenerator.generateUniqueNickname();

// 닉네임 업데이트
member.updateNickname(newNickname);

return NicknameResponseDTO.builder()
.nickname(newNickname)
.build();
Expand All @@ -370,6 +363,12 @@ public NicknameResponseDTO updateNickname(String email, NicknameRequestDTO nickn

String nickname = nicknameRequestDTO.getNickname();

if (Objects.equals(member.getNickname(), nickname)) {
return NicknameResponseDTO.builder()
.nickname(nickname)
.build();
}

// 닉네임 중복 체크
if (memberRepository.findByNickname(nickname).isPresent()) {
throw new BadRequestException(ErrorStatus.NICKNAME_ALREADY_EXISTS_EXCEPTION.getMessage());
Expand Down