diff --git a/src/main/java/com/elice/ustory/domain/user/service/UserService.java b/src/main/java/com/elice/ustory/domain/user/service/UserService.java index 96a10b1..005da61 100644 --- a/src/main/java/com/elice/ustory/domain/user/service/UserService.java +++ b/src/main/java/com/elice/ustory/domain/user/service/UserService.java @@ -79,7 +79,9 @@ public Users signUp(SignUpRequest signUpRequest) { // 1-2. 이메일 중복 재확인 String email = signUpRequest.getEmail(); - if (userRepository.findByEmail(email).isPresent()) { + + int emailCountWithSoftDeleted = userRepository.countByEmailWithSoftDeleted(email); + if (emailCountWithSoftDeleted > 0) { throw new ConflictException(String.format(UserMessageConstants.DUPLICATE_EMAIL_MESSAGE, email)); } @@ -260,7 +262,6 @@ public MyPageResponse showMyPage(Long userId) { } public ValidateNicknameResponse isValidNickname(ValidateNicknameRequest validateNicknameRequest) { - // TODO: 닉네임, 이메일 중복여부 회원가입 단계에서 한 번 더 확인 String nickname = validateNicknameRequest.getNickname(); int nicknameCountWithSoftDeleted = userRepository.countByNicknameWithSoftDeleted(nickname);