Merge pull request #99 from Central-MakeUs/dev

[Refactor] 같은 이메일이면 바로 로그인 성공하도록 수정
Central-MakeUs · Feb 12, 2025 · e005a9e · e005a9e
2 parents df8bfaa + bc5c5a6
commit e005a9e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/java/com/cmc/mercury/domain/user/service/UserService.java b/src/main/java/com/cmc/mercury/domain/user/service/UserService.java
@@ -36,15 +36,24 @@ public class UserService {
     public User createTestUser(UserTestRequest request) {
 
         // 이메일과 OAuthType으로 중복 검증
-        if (userRepository.existsByEmailAndOauthType(request.email(), OAuthType.TEST)) {
+/*        if (userRepository.existsByEmailAndOauthType(request.email(), OAuthType.TEST)) {
             throw new CustomException(ErrorCode.DUPLICATE_USER);
+        }*/
+        User existingUser = userRepository.findByEmailAndOauthType(request.email(), OAuthType.TEST)
+                .orElse(null);
+
+
+        if (existingUser != null) {
+            // 기존 유저가 있으면 로그인 처리 (토큰 갱신)
+            setTestUserTokens(existingUser, request.isShortLivedAccessToken());
+            return existingUser;
         }
 
-        User user = User.TestUserBuilder()
+        User newUser = User.TestUserBuilder()
                         .email(request.email())
                         .TestUserBuild();
 
-        User savedUser = userRepository.save(user);
+        User savedUser = userRepository.save(newUser);
 
         setTestUserTokens(savedUser, request.isShortLivedAccessToken());