Fix - Transaction Rollback Error

Mobydick-Team · Jul 9, 2023 · fa95217 · fa95217
1 parent 2f338a2
commit fa95217
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/kkm/kkm_server_v2/domain/auth/service/LoginService.java b/src/main/java/com/kkm/kkm_server_v2/domain/auth/service/LoginService.java
@@ -24,15 +24,14 @@ public class LoginService {
     private final JwtTokenProvider jwtTokenProvider;
     private final UserRepository userRepository;
 
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, noRollbackFor = UserNotFoundException.class)
     public TokenResponse execute(LoginRequest request) {
         User user = userFacade.findUserByUserId(request.getUserId());
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime lastActivity = user.getModifiedDateTime();
         if (user.getStatus() == UserStatus.DEACTIVATED) {
             if (ChronoUnit.DAYS.between(lastActivity, now) >= 30) {
                 user.updateStatus(UserStatus.DELETED);
-                userRepository.save(user);
                 throw UserNotFoundException.EXCEPTION;
             } else {
                 throw UserIsDeactivateException.EXCEPTION;
@@ -48,6 +47,7 @@ public TokenResponse execute(LoginRequest request) {
                     .userId(user.getUserId())
                     .build();
         }
+
         throw UserNotFoundException.EXCEPTION;
     }