minor refactor in refresh token repository and account service

Author: ashutoshgngwr

src/integrationTest/java/com/trynoice/api/identity/entities/RefreshTokenRepositoryTest.java

@@ -26,7 +26,7 @@ public class RefreshTokenRepositoryTest {
     private RefreshTokenRepository refreshTokenRepository;
 
     @Test
-    void expireAllByOwnerId() {
+    void updateExpiresAtOfAllByOwnerId() {
         val user = createAuthUser(entityManager);
 
         val ownedRefreshTokens = IntStream.range(0, 5)
@@ -37,11 +37,13 @@ void expireAllByOwnerId() {
             .mapToObj(i -> createRefreshToken(entityManager, createAuthUser(entityManager)))
             .collect(Collectors.toUnmodifiableList());
 
-        refreshTokenRepository.expireAllByOwnerId(user.getId());
+        refreshTokenRepository.updateExpiresAtOfAllByOwnerId(OffsetDateTime.now(), user.getId());
         ownedRefreshTokens.stream()
             .map(t -> entityManager.find(RefreshToken.class, t.getId()))
             .forEach(t -> assertTrue(t.getExpiresAt().isBefore(OffsetDateTime.now())));
 
-        unownedRefreshTokens.forEach(t -> assertTrue(refreshTokenRepository.existsById(t.getId())));
+        unownedRefreshTokens.stream()
+            .map(t -> entityManager.find(RefreshToken.class, t.getId()))
+            .forEach(t -> assertTrue(t.getExpiresAt().isAfter(OffsetDateTime.now())));
     }
 }

src/main/java/com/trynoice/api/identity/AccountService.java

@@ -155,7 +155,7 @@ private String createSignInToken(@NonNull AuthUser authUser) throws TooManySignI
      * @param accessJwt  access token provided by the client.
      * @throws RefreshTokenVerificationException if the refresh token is invalid, expired or re-used.
      */
-    @Transactional(rollbackFor = Throwable.class)
+    @Transactional(rollbackFor = Throwable.class, noRollbackFor = RefreshTokenVerificationException.class)
     public void signOut(@NonNull String refreshJwt, @NonNull String accessJwt) throws RefreshTokenVerificationException {
         val refreshToken = verifyRefreshJWT(refreshJwt);
         refreshToken.setExpiresAt(OffsetDateTime.now());
@@ -291,7 +291,7 @@ public void deleteAccount(@NonNull Long userId) {
         user.setDeactivatedAt(OffsetDateTime.now());
         authUserRepository.save(user);
         deactivatedUserIdsCache.put(userId, Boolean.TRUE);
-        refreshTokenRepository.expireAllByOwnerId(userId);
+        refreshTokenRepository.updateExpiresAtOfAllByOwnerId(OffsetDateTime.now(), userId);
     }
 
     @Override

src/main/java/com/trynoice/api/identity/entities/RefreshTokenRepository.java

@@ -7,6 +7,8 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.OffsetDateTime;
+
 /**
  * A JPA {@link Repository} declaration for database interactions of {@link RefreshToken} entity.
  */
@@ -21,6 +23,6 @@ public interface RefreshTokenRepository extends CrudRepository<RefreshToken, Lon
      */
     @Modifying(flushAutomatically = true, clearAutomatically = true)
     @Transactional
-    @Query("update RefreshToken e set e.expiresAt = now() where e.owner.id = ?1")
-    void expireAllByOwnerId(@NonNull Long ownerId);
+    @Query("update RefreshToken e set e.expiresAt = ?1 where e.owner.id = ?2")
+    void updateExpiresAtOfAllByOwnerId(@NonNull OffsetDateTime expiresAt, @NonNull Long ownerId);
 }