From 2fdc8647dcdb3bbd588ededc308f9010a52e263c Mon Sep 17 00:00:00 2001
From: GyungA <gga612@naver.com>
Date: Tue, 2 Jul 2024 16:52:48 +0900
Subject: [PATCH] =?UTF-8?q?Feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EC=8B=9C,=20=EC=86=8C=ED=94=84=ED=8A=B8=20=EB=94=9C=EB=A6=AC?=
 =?UTF-8?q?=ED=8A=B8=20=EA=B3=A0=EB=A0=A4=ED=95=98=EC=97=AC=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84/=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=EC=97=AC=EB=B6=80=20=EC=9E=AC=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elice/ustory/domain/user/service/UserService.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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);