MOSU-308 feat: 카카오 중복 판단 로직 추가

Author: wlgns12370

src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java

@@ -20,12 +20,28 @@ public class SignUpAccountStepProcessor implements StepProcessor<UserJpaEntity,
     @Transactional
     @Override
     public UserJpaEntity process(UserJpaEntity user) {
-        if (userRepository.existsByPhoneNumber(user.getOriginPhoneNumber())) {
-            throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS);
-        } else if (userRepository.existsByLoginId(user.getLoginId())) {
+
+        validateForNewSignUp(user);
+
+        return userRepository.save(user);
+    }
+
+    private void validateForNewSignUp(UserJpaEntity user) {
+
+        userRepository.findByPhoneNumber(user.getOriginPhoneNumber())
+                .ifPresent(existingUser -> {
+                    if (existingUser.isPendingUser()) {
+                        switch (existingUser.getProvider()) {
+                            case MOSU:
+                                throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS);
+                            case KAKAO:
+                                throw new CustomRuntimeException(ErrorCode.KAKAO_DUPLICATED);
+                        }
+                    }
+                });
+
+        if (userRepository.existsByLoginId(user.getLoginId())) {
             throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS);
         }
-        log.info("Processing user sign-up: {}", user);
-        return userRepository.save(user);
     }
 }

src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java

@@ -17,20 +17,21 @@ public class OAuthUserPersistenceProcessor implements StepProcessor<OAuthUserInf
 
     private final UserJpaRepository userRepository;
 
-    /**
-     * this method is processing OAuthUserInfo to UserJpaEntity that is Get or Create.
-     *
-     * @param info
-     * @return
-     */
     @Override
     @Transactional
     public UserJpaEntity process(final OAuthUserInfo info) {
         return userRepository.findByPhoneNumber(
                         PhoneNumberUtil.formatPhoneNumber(info.phoneNumber()))
                 .map(existingUser -> {
-                    if (existingUser.isMosuUser()) {
-                        throw new OAuthException("DUPLICATE");
+                    switch (existingUser.getProvider()) {
+                        case MOSU:
+                            if (existingUser.isPendingUser()) {
+                                throw new OAuthException("DUPLICATE");
+                            }
+                        case KAKAO:
+                            if (existingUser.isPendingUser()) {
+                                throw new OAuthException("KAKAO_DUPLICATE");
+                            }
                     }
                     existingUser.updateOAuthUser(
                             info.gender(),

src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java

@@ -113,6 +113,10 @@ public boolean isMosuUser() {
         return this.provider.equals(AuthProvider.MOSU);
     }
 
+    public boolean isPendingUser() {
+        return this.userRole.equals(UserRole.ROLE_PENDING);
+    }
+
     public void grantUserRole() {
         this.userRole = UserRole.ROLE_USER;
     }

src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java

@@ -28,6 +28,8 @@ public enum ErrorCode {
     INVALID_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 리프레시 토큰입니다."),
     VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "인증에 실패했습니다."),
 
+    KAKAO_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 카카오 계정입니다."),
+
     //토큰 관련 에러
     INVALID_SIGN_UP_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 회원가입 인증 토큰입니다."),
     MISSING_SIGNUP_TOKEN(HttpStatus.BAD_REQUEST, "회원가입 인증 토큰이 누락되었습니다."),