improve SyncLdapTask

Author: nkonev

aaa/src/main/java/name/nkonev/aaa/entity/jdbc/UserAccount.java

@@ -320,6 +320,32 @@ public UserAccount withLoginColor(String newLoginColor) {
         );
     }
 
+    public UserAccount withSyncLdapTime(LocalDateTime newSyncLdapDateTime) {
+        return new UserAccount(
+            id,
+            creationType,
+            username,
+            password,
+            avatar,
+            avatarBig,
+            shortInfo,
+            expired,
+            locked,
+            enabled,
+            confirmed,
+            roles,
+            email,
+            lastLoginDateTime,
+            facebookId,
+            vkontakteId,
+            googleId,
+            keycloakId,
+            ldapId,
+            loginColor,
+            newSyncLdapDateTime
+        );
+    }
+
     public UserAccount withOauthIdentifiers(OAuth2Identifiers newOauthIdentifiers) {
         return new UserAccount(
                 id,

aaa/src/main/java/name/nkonev/aaa/repository/jdbc/UserAccountRepository.java

@@ -42,11 +42,7 @@ public interface UserAccountRepository extends ListCrudRepository<UserAccount, L
 
     List<UserAccount> findByLdapIdInOrderById(Collection<String> strings);
 
-    @Modifying
-    @Query("update user_account set sync_ldap_time = :newSyncLdapDateTime where ldap_id in (:ldapUserIds)")
-    void updateSyncLdapTime(Set<String> ldapUserIds, LocalDateTime newSyncLdapDateTime);
-
     @Modifying
     @Query("delete from user_account where ldap_id is not null and sync_ldap_time < :currTime")
-    void deleteWithLdapIdElderThan(LocalDateTime currTime);
+    long deleteWithLdapIdElderThan(LocalDateTime currTime);
 }

aaa/src/main/java/name/nkonev/aaa/tasks/SyncLdapTask.java

@@ -22,7 +22,6 @@
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -94,7 +93,8 @@ public void doWork() {
         handler.processLeftovers();
 
         LOGGER.info("Deleting entries from database");
-        transactionTemplate.executeWithoutResult(s -> userAccountRepository.deleteWithLdapIdElderThan(currTime));
+        var deleted = transactionTemplate.execute(s -> userAccountRepository.deleteWithLdapIdElderThan(currTime));
+        LOGGER.info("Deleted {} entries from database", deleted);
 
         LOGGER.info("Sync ldap task finish");
     }
@@ -193,6 +193,7 @@ private void processUserBatch(List<LdapEntity> attributes) {
                             }
 
                             if (shouldUpdateInDb) {
+                                userAccount = userAccount.withSyncLdapTime(currTime);
                                 LOGGER.info("Updating userId={}, ldapId={}", userAccount.id(), ldapUserId);
                                 userAccountRepository.save(userAccount);
                             }
@@ -229,10 +230,6 @@ private void processUserBatch(List<LdapEntity> attributes) {
                 var inserted = userAccountRepository.saveAll(usersToInsert);
                 LOGGER.debug("Inserted {} to database", inserted);
             }
-
-            if (!byLdapId.keySet().isEmpty()) {
-                userAccountRepository.updateSyncLdapTime(byLdapId.keySet(), currTime);
-            }
         });
     }
 }