🚑 긴급 수정 - 로그인 시 token 데이터가 갱신되지 않는 오류 수정

ITZipProject · Aug 8, 2024 · 69b7469 · 69b7469
2 parents 4b1a3cb + e14e978
commit 69b7469
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/darkoverload/itzip/feature/jwt/domain/Token.java b/src/main/java/darkoverload/itzip/feature/jwt/domain/Token.java
@@ -21,14 +21,10 @@ public class Token {
     private String grantType;
 
     // 업데이트 빌더
-    public Token update(String accessToken, String refreshToken, String grantType) {
-        return Token.builder()
-                .id(this.id)
-                .user(this.user)
-                .accessToken(accessToken)
-                .refreshToken(refreshToken)
-                .grantType(grantType)
-                .build();
+    public void update(String accessToken, String refreshToken, String grantType) {
+        this.accessToken = accessToken;
+        this.refreshToken = refreshToken;
+        this.grantType = grantType;
     }
 
     public TokenEntity convertToEntity() {

diff --git a/src/main/java/darkoverload/itzip/feature/jwt/repository/TokenRepository.java b/src/main/java/darkoverload/itzip/feature/jwt/repository/TokenRepository.java
@@ -6,7 +6,7 @@
 import java.util.Optional;
 
 public interface TokenRepository extends JpaRepository<TokenEntity, Long> {
-    TokenEntity findByUserEntityId(Long userId);
+    Optional<TokenEntity> findByUserEntityId(Long userId);
     Optional<TokenEntity> findByAccessToken(String accessToken);
     Optional<TokenEntity> findByRefreshToken(String refreshToken);
 }
diff --git a/src/main/java/darkoverload/itzip/feature/jwt/service/TokenServiceImpl.java b/src/main/java/darkoverload/itzip/feature/jwt/service/TokenServiceImpl.java
@@ -23,14 +23,14 @@ public class TokenServiceImpl implements TokenService {
      */
     @Transactional
     public void saveOrUpdate(Token token) {
-        Token oldToken = tokenRepository.findByUserEntityId(token.getUser().getId()).convertToDomain();
+        Optional<Token> oldToken = tokenRepository.findByUserEntityId(token.getUser().getId()).map(TokenEntity::convertToDomain);
 
-        if (oldToken == null) {
+        if (oldToken.isEmpty()) {
             tokenRepository.save(token.convertToEntity());
         } else {
-            oldToken.update(token.getAccessToken(), token.getRefreshToken(), token.getGrantType());
+            oldToken.get().update(token.getAccessToken(), token.getRefreshToken(), token.getGrantType());
 
-            tokenRepository.save(oldToken.convertToEntity());
+            tokenRepository.save(oldToken.get().convertToEntity());
         }
     }