[배포]: 카카오 중복 판단 로직 추가 및 로그 제거

src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java

@@ -23,13 +23,11 @@ public class SignUpService {
     @Transactional
     public Token signUp(final SignUpAccountRequest request) {
         UserJpaEntity user = doAccountStep(request);
-        log.info("User signed up successfully: {}", user);
         return authTokenManager.generateAuthToken(user);
     }
 
     private UserJpaEntity doAccountStep(SignUpAccountRequest request) {
         UserJpaEntity user = request.toAuthEntity(passwordEncoder);
-        log.info("log : {}", user);
         return signUpAccountStepProcessor.process(user);
     }
 }

src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcContext.java

@@ -1,12 +1,13 @@
 package life.mosu.mosuserver.application.auth.kmc.tx;
 
-import life.mosu.mosuserver.domain.auth.signup.Token;
+import life.mosu.mosuserver.domain.auth.token.Token;
 
 public record KmcContext(
         String certNum,
         Long expiration,
         Boolean isSuccess
 ) {
+
     public static KmcContext ofSuccess(String certNum, Long expiration) {
         return new KmcContext(certNum, expiration, true);
     }
@@ -17,8 +18,8 @@ public static KmcContext ofFailure(String certNum) {
 
     public Token toToken() {
         return Token.of(
-            this.certNum,
-            this.expiration
+                this.certNum,
+                this.expiration
         );
     }
 }

src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventListener.java

@@ -1,7 +1,7 @@
 package life.mosu.mosuserver.application.auth.kmc.tx;
 
-import life.mosu.mosuserver.domain.auth.signup.Token;
-import life.mosu.mosuserver.domain.auth.signup.TokenRepository;
+import life.mosu.mosuserver.domain.auth.token.Token;
+import life.mosu.mosuserver.domain.auth.token.TokenRepository;
 import life.mosu.mosuserver.global.tx.TxFailureHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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/auth/provider/OneTimeTokenProvider.java

@@ -8,19 +8,20 @@
 import io.jsonwebtoken.security.Keys;
 import java.security.Key;
 import java.util.Date;
-import life.mosu.mosuserver.domain.auth.signup.Token;
-import life.mosu.mosuserver.domain.auth.signup.TokenRepository;
+import life.mosu.mosuserver.domain.auth.token.Token;
+import life.mosu.mosuserver.domain.auth.token.TokenRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
 @Slf4j
 @Service
 public class OneTimeTokenProvider {
-    private final TokenRepository tokenRepository;
+
     private static final String tokenType = "ONE_TIME";
     private static final String TOKEN_TYPE_KEY = "type";
     private static final String PHONE_NUMBER_KEY = "phone";
-
+    private final TokenRepository tokenRepository;
     private final Long expireTime;
     private final Key key;
 

src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java

@@ -37,15 +37,10 @@ public void notify(LunaNotificationEvent event) {
         NotifySender<LunaNotificationVariable> sender = senderResolver.resolve(event.status());
 
         sender.send(phone, event, notifyVariable);
-        log.info("[NotifyService] 알림톡 전송 성공: userId={}, status={}", event.userId(), event.status());
     }
 
     @Recover
     public void recover(CustomRuntimeException exception, LunaNotificationEvent event) {
-        log.warn(
-                "[NotifyService] 알림톡 전송 실패: userId={}, status={}, reason={}",
-                event.userId(), event.status(), exception.getMessage()
-        );
         DiscordExceptionNotifyEventRequest request = DiscordExceptionNotifyEventRequest.of(
                 exception.getCause() != null ? exception.getCause().toString() : "N/A",
                 exception.getMessage(),

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

@@ -17,20 +17,23 @@ 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");
+                            }
+                            break;
+                        case KAKAO:
+                            if (existingUser.isPendingUser()) {
+                                throw new OAuthException("KAKAO_DUPLICATE");
+                            }
+                            break;
                     }
                     existingUser.updateOAuthUser(
                             info.gender(),

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

@@ -46,8 +46,6 @@ public OAuth2User loadUser(final OAuth2UserRequest userRequest)
                     .orElse(false);
         }
 
-        log.info("동의 여부{}", agreedToMarketing);
-
         final String registrationId = userRequest.getClientRegistration().getRegistrationId();
         final String userNameAttributeName = userRequest.getClientRegistration()
                 .getProviderDetails()

src/main/java/life/mosu/mosuserver/application/user/UserService.java

@@ -1,6 +1,5 @@
 package life.mosu.mosuserver.application.user;
 
-import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity;
 import life.mosu.mosuserver.domain.user.entity.UserJpaEntity;
 import life.mosu.mosuserver.domain.user.repository.UserJpaRepository;
 import life.mosu.mosuserver.global.exception.CustomRuntimeException;
@@ -31,13 +30,6 @@ public UserJpaEntity getUserOrThrow(Long userId) {
         );
     }
 
-    public void syncUserInfoFromProfile(UserJpaEntity user, ProfileJpaEntity profile) {
-        if (user.isMosuUser()) {
-            user.updateUserInfo(profile.getGender(), profile.getUserName(),
-                    profile.getPhoneNumber(), profile.getBirth());
-        }
-    }
-
     public Long saveOrGetUser(UserJpaEntity user) {
         return userJpaRepository.findByPhoneNumber(
                         PhoneNumberUtil.formatGuestPhoneNumber(user.getPhoneNumber()))

src/main/java/life/mosu/mosuserver/domain/auth/signup/Token.java → src/main/java/life/mosu/mosuserver/domain/auth/token/Token.java

@@ -1,17 +1,18 @@
-package life.mosu.mosuserver.domain.auth.signup;
+package life.mosu.mosuserver.domain.auth.token;
 
 public record Token(
         String certNum,
         Long expiration
 ) {
+
     public static Token of(String certNum, Long expiration) {
         return new Token(certNum, expiration);
     }
 
-    public static Token from(SignUpTokenRedisEntity signUpTokenRedisEntity) {
+    public static Token from(TokenRedisEntity tokenRedisEntity) {
         return new Token(
-                signUpTokenRedisEntity.getCertNum(),
-                signUpTokenRedisEntity.getExpiration()
+                tokenRedisEntity.getCertNum(),
+                tokenRedisEntity.getExpiration()
         );
     }
 }

src/main/java/life/mosu/mosuserver/domain/auth/token/TokenKeyValueRepository.java

@@ -0,0 +1,8 @@
+package life.mosu.mosuserver.domain.auth.token;
+
+import org.springframework.data.keyvalue.repository.KeyValueRepository;
+
+public interface TokenKeyValueRepository extends
+        KeyValueRepository<TokenRedisEntity, String> {
+
+}

src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisEntity.java → src/main/java/life/mosu/mosuserver/domain/auth/token/TokenRedisEntity.java

@@ -1,4 +1,4 @@
-package life.mosu.mosuserver.domain.auth.signup;
+package life.mosu.mosuserver.domain.auth.token;
 
 import java.util.concurrent.TimeUnit;
 import lombok.AllArgsConstructor;
@@ -13,7 +13,7 @@
 @RedisHash(value = "token")
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
-public class SignUpTokenRedisEntity {
+public class TokenRedisEntity {
 
     @Id
     @Indexed
@@ -22,7 +22,7 @@ public class SignUpTokenRedisEntity {
     @TimeToLive(unit = TimeUnit.MILLISECONDS)
     private Long expiration;
 
-    public static SignUpTokenRedisEntity from(final Token token) {
-        return new SignUpTokenRedisEntity(token.certNum(), token.expiration());
+    public static TokenRedisEntity from(final Token token) {
+        return new TokenRedisEntity(token.certNum(), token.expiration());
     }
 }

src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisRepository.java → src/main/java/life/mosu/mosuserver/domain/auth/token/TokenRedisRepository.java

@@ -1,4 +1,4 @@
-package life.mosu.mosuserver.domain.auth.signup;
+package life.mosu.mosuserver.domain.auth.token;
 
 import life.mosu.mosuserver.global.exception.CustomRuntimeException;
 import life.mosu.mosuserver.global.exception.ErrorCode;
@@ -9,23 +9,23 @@
 @Slf4j
 @Repository
 @RequiredArgsConstructor
-public class SignUpTokenRedisRepository implements TokenRepository {
+public class TokenRedisRepository implements TokenRepository {
 
-    private final SignUpTokenKeyValueRepository repository;
+    private final TokenKeyValueRepository repository;
 
     @Override
     public void save(Token signUpToken) {
-        SignUpTokenRedisEntity entity = SignUpTokenRedisEntity.from(signUpToken);
+        TokenRedisEntity entity = TokenRedisEntity.from(signUpToken);
         repository.save(entity);
     }
 
     @Override
     public Token findByCertNum(String certNum) {
         log.info("findByCertNum certNum={}", certNum);
-        SignUpTokenRedisEntity signUpTokenRedisEntity = repository.findById(certNum).orElseThrow(
+        TokenRedisEntity tokenRedisEntity = repository.findById(certNum).orElseThrow(
                 () -> new CustomRuntimeException(ErrorCode.NOT_FOUND_TOKEN)
         );
-        return Token.from(signUpTokenRedisEntity);
+        return Token.from(tokenRedisEntity);
     }
 
     @Override

src/main/java/life/mosu/mosuserver/domain/auth/signup/TokenRepository.java → src/main/java/life/mosu/mosuserver/domain/auth/token/TokenRepository.java

@@ -1,6 +1,7 @@
-package life.mosu.mosuserver.domain.auth.signup;
+package life.mosu.mosuserver.domain.auth.token;
 
 public interface TokenRepository {
+
     Token findByCertNum(String certNum);
 
     void save(Token signUpToken);

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/annotation/PasswordPattern.java

@@ -9,7 +9,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
+@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
 @NotBlank
 @Target({ElementType.FIELD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -0,0 +1,26 @@
+package life.mosu.mosuserver.global.exception;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum CriticalLevel {
+    LOW("낮음"),
+    MEDIUM("중간"),
+    HIGH("높음"),
+    CRITICAL("심각함");
+
+    private final String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public boolean isEmergency() {
+        return this == HIGH || this == CRITICAL;
+    }
+
+    @Override
+    public String toString() {
+        return this.description;
+    }
+}

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

@@ -9,11 +9,13 @@
 public class CustomRuntimeException extends RuntimeException {
 
     private final HttpStatus status;
+    private final CriticalLevel criticalLevel;
     private final String message;
     private final String code;
 
     public CustomRuntimeException(ErrorCode errorCode) {
         this.status = errorCode.getStatus();
+        this.criticalLevel = errorCode.getCriticalLevel();
         this.message = errorCode.getMessage();
         this.code = errorCode.name();
 
@@ -22,6 +24,7 @@ public CustomRuntimeException(ErrorCode errorCode) {
 
     public CustomRuntimeException(ErrorCode errorCode, Object... cause) {
         this.status = errorCode.getStatus();
+        this.criticalLevel = errorCode.getCriticalLevel();
         this.message = String.format(errorCode.getMessage(), cause);
         this.code = errorCode.name();