src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java

@@ -5,11 +5,12 @@ import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.AuthToken;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    Optional<AuthToken> findByLastUsedAtAndExpiresAtBefore(LocalDateTime lastUsedAt, LocalDateTime expiresAtBefore);
+    List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
     Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
 }

src/main/java/ru/soune/nocopy/service/auth/AuthService.java

@@ -92,6 +92,7 @@ public class AuthService {
         AuthToken authToken = authTokenRepository.findByToken(token)
                 .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
         authToken.setLastUsedAt(LocalDateTime.now());
+        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
 
         authTokenRepository.save(authToken);
 

src/main/java/ru/soune/nocopy/service/auth/CleanupTokenSessionsService.java

@@ -25,14 +25,13 @@ public class CleanupTokenSessionsService {
 
     @Transactional
     @Scheduled(fixedDelay = 30000)
-    public void cleanupExpiredFiles() {
+    public void cleanupExpiredTokens() {
-        LocalDateTime hourBefore = LocalDateTime.now().minusHours(authTokenLife);
+        LocalDateTime now = LocalDateTime.now();
 
-        List<AuthToken> tokensForDelete = authTokenRepository.findByLastUsedAtBefore(hourBefore).stream().toList();
+        List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
-        List<AuthToken> tokensDeleteWithNullUpdate = authTokenRepository.findByLastUsedAtAndExpiresAtBefore(
-                null, hourBefore).stream().toList();
 
-        authTokenRepository.deleteAll(tokensForDelete);
+        if (!expiredTokens.isEmpty()) {
-        authTokenRepository.deleteAll(tokensDeleteWithNullUpdate);
+            authTokenRepository.deleteAll(expiredTokens);
+        }
     }
 }