Merge pull request #71 from Block-Guard/fix/#70/fix-error-msg

[Fix] 회원가입오류 메세지 수정

Author: chaeyuuu

src/main/java/com/blockguard/server/domain/auth/application/AuthService.java

@@ -21,6 +21,7 @@
 import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -32,7 +33,14 @@ public class AuthService {
     private JwtTokenGenerator jwtTokenGenerator;
 
     public RegisterResponse register(RegisterRequest registerRequest) {
-        if (userRepository.findByEmail((registerRequest.getEmail())).isPresent()) {
+
+        Optional<User> everyUser = userRepository.findAnyByEmail(registerRequest.getEmail());
+
+        if (everyUser.isPresent()) {
+            User user = everyUser.get();
+            if (user.getDeletedAt() != null) {
+                throw new BusinessExceptionHandler(ErrorCode.DELETED_USER_CANNOT_REJOIN);
+            }
             throw new BusinessExceptionHandler(ErrorCode.DUPLICATED_EMAIL);
         }
 

src/main/java/com/blockguard/server/domain/user/dao/UserRepository.java

@@ -2,12 +2,18 @@
 
 import com.blockguard.server.domain.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.time.LocalDate;
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
 
+    @Query(value = "SELECT * FROM users WHERE email = :email LIMIT 1", nativeQuery = true)
+    Optional<User> findAnyByEmail(@Param("email") String email);
+
+
     Optional<User> findByNameAndPhoneNumberAndBirthDate(String name, String phoneNumber, LocalDate birthDate);
 }

src/main/java/com/blockguard/server/global/common/codes/ErrorCode.java

@@ -38,6 +38,7 @@ public enum ErrorCode {
     FAIL_TO_CRAWLING_NEWS(HttpStatus.BAD_REQUEST, 4035, "뉴스 크롤링에 실패하였습니다."),
     MUST_BE_POSITIVE_NUMBER(HttpStatus.BAD_REQUEST, 4036, "페이지와 사이즈는 1이상의 값을 입력해야합니다."),
     UPDATE_PROFILE_CONFLICT(HttpStatus.CONFLICT, 4037, "기본 이미지로 변경 요청과 프로필 사진 수정 요청이 동시에 들어올 수 없습니다."),
+    DELETED_USER_CANNOT_REJOIN(HttpStatus.BAD_REQUEST, 4038,"탈퇴한 회원은 재가입할 수 없습니다."),
 
     // 5000~ : server error
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 5000, "서버 오류가 발생했습니다."),