Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix : DIG-111 닉네임 중복체크 계속 중복으로 판단되는 버그 수정 #102

Merged
merged 1 commit into from
Nov 26, 2023
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 @@ -50,10 +50,10 @@ public ApiResponse<?> logout(HttpServletResponse response,
*/
@GetMapping("/check-duplication")
public ApiResponse<?> checkNicknameDuplication(
@RequestParam("nickname") String nickname,
@RequestParam("nickname") String newNickname,
@AuthenticationPrincipal OAuth2JwtUserDetails userDetails
) {
String message = userService.checkNicknameDuplication(nickname, userDetails.getNickname());
String message = userService.checkNicknameDuplication(userDetails.getNickname(), newNickname);
return new ApiResponse<>(ErrorCode.SUCCESS.changeMessage(message));
}

Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/ogjg/daitgym/user/service/UserHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@ public User findUserByEmail(String email) {
}

public boolean isUserNotFoundByEmail(String loginEmail) {
return !userRepository.findByEmail(loginEmail).isPresent();
return userRepository.findByEmail(loginEmail).isEmpty();
}

public boolean isNicknameAlreadyExist(String nickname, String newNickname) {
return !nickname.equals(newNickname) && userRepository.findByNickname(newNickname).isPresent();
public boolean isNicknameAlreadyExist(String loginNickname, String newNickname) {
return isNotMyNickname(loginNickname, newNickname) && userRepository.findByNickname(newNickname).isPresent();
}

private boolean isNotMyNickname(String loginNickname, String newNickname) {
return !loginNickname.equals(newNickname);
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/ogjg/daitgym/user/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ public EditInitialNicknameResponse editInitialNickname(String loginEmail, EditNi
}

@Transactional(readOnly = true)
public String checkNicknameDuplication(String nickname, String newNickname) {
if (userHelper.isNicknameAlreadyExist(nickname, newNickname)) {
public String checkNicknameDuplication(String loginNickname, String newNickname) {
if (userHelper.isNicknameAlreadyExist(loginNickname, newNickname)) {
return "중복";
}
return "사용가능";
Expand Down