Do not delete expired user-roles without notification

OpenConext · May 15, 2024 · 853cd69 · 853cd69
1 parent 485062c
commit 853cd69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/src/main/java/access/cron/ResourceCleaner.java b/server/src/main/java/access/cron/ResourceCleaner.java
@@ -93,7 +93,7 @@ private List<User> cleanOrphanedUser() {
     }
 
     private List<UserRole> cleanUserRoles() {
-        List<UserRole> userRoles = userRoleRepository.findByEndDateBefore(Instant.now());
+        List<UserRole> userRoles = userRoleRepository.findByEndDateBeforeAndExpiryNotifications(Instant.now(), 1);
 
         LOG.info(String.format("Deleted %s userRoles with an endDate in the past: %s",
                 userRoles.size(),

diff --git a/server/src/test/java/access/cron/ResourceCleanerTest.java b/server/src/test/java/access/cron/ResourceCleanerTest.java
@@ -86,7 +86,10 @@ private void deleteUserRoles(String sub) {
     private void markUserRole(String sub) {
         User user = userRepository.findBySubIgnoreCase(sub).get();
         Instant past = Instant.now().minus(Period.ofDays(1050));
-        user.getUserRoles().forEach(userRole -> userRole.setEndDate(past));
+        user.getUserRoles().forEach(userRole -> {
+            userRole.setEndDate(past);
+            userRole.setExpiryNotifications(1);
+        });
         userRepository.save(user);
     }