From 35033958eba4481327d98752383d09aa1bf2673b Mon Sep 17 00:00:00 2001
From: thalals <thalsal@naver.com>
Date: Sat, 3 Aug 2024 15:32:57 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20sns=20=ED=86=B5=ED=95=A9=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=EC=8B=9C=20=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=ED=86=A0=ED=81=B0=20=EC=A4=91=EB=B3=B5=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thtapis/facade/user/UserJoinFacade.java   |  3 ++-
 .../thtapis/facade/user/UserLoginFacade.java  |  2 +-
 .../entity/user/service/UserTokenService.java | 20 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java
index 9044c1ae..3961761f 100644
--- a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java
+++ b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java
@@ -69,7 +69,8 @@ public TokenDto signUp(final UserSignUpRequest request) {
 
     private TokenDto getUserSignUpResponse(User user) {
         final TokenDto tokenDto = tokenProvider.generateJWT(user);
-        userTokenService.create(user.getUserUuid(), tokenDto.accessToken());
+
+        userTokenService.generateUserToken(user.getUserUuid(), tokenDto.accessToken());
 
         return tokenDto;
     }
diff --git a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java
index f3ea9ddd..40a3506a 100644
--- a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java
+++ b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java
@@ -38,7 +38,7 @@ public TokenDto login(final UserLoginRequest request) {
     private TokenDto getGenerateJWT(final User user) {
 
         final TokenDto tokenDto = tokenProvider.generateJWT(user);
-        userTokenService.findByUserUuid(user.getUserUuid()).refresh(tokenDto.accessToken());
+        userTokenService.refresh(user.getUserUuid(), tokenDto.accessToken());
 
         return tokenDto;
     }
diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java b/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java
index ceb377f3..f361d1e4 100644
--- a/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java
+++ b/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java
@@ -7,6 +7,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -27,7 +29,23 @@ public UserToken findByUserUuid(final String userUuid) {
     }
 
 
-    public void create(final String userUuid, final String accessToken) {
+
+    public void refresh(final String userUuid, final String accessToken) {
+        UserToken userToken = findByUserUuid(userUuid);
+        userToken.refresh(accessToken);
+    }
+
+    public void generateUserToken(final String userUuid, final String accessToken) {
+        final Optional<UserToken> userToken = userTokenRepository.findByUserUuid(userUuid);
+
+        if(userToken.isPresent()) {
+            userToken.get().refresh(accessToken);
+            return;
+        }
+        create(userUuid, accessToken);
+    }
+
+    private void create(final String userUuid, final String accessToken) {
         userTokenRepository.save(UserToken.create(userUuid, accessToken));
     }
 }