From bc5c5a645dde95eaa119b13a6a9b927a467a2519 Mon Sep 17 00:00:00 2001
From: dainnida <dain0928@g.hongik.ac.kr>
Date: Wed, 12 Feb 2025 16:26:25 +0900
Subject: [PATCH] =?UTF-8?q?Refactor:=20=EA=B0=99=EC=9D=80=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=EC=9D=B4=EB=A9=B4=20=EB=B0=94=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=84=B1=EA=B3=B5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mercury/domain/user/service/UserService.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 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
index cd50556..4255b73 100644
--- 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());