Fixes #561

Author: oharsta

server/src/main/java/invite/cron/RoleExpirationNotifier.java

@@ -52,13 +52,14 @@ public void sweep() {
     }
 
     public List<String> doSweep() {
-        Instant instant = Instant.now().plus(roleExpirationNotificationDays, ChronoUnit.DAYS);
-        List<UserRole> userRoles = userRoleRepository.findByEndDateBeforeAndExpiryNotifications(instant, 0);
+        Instant now = Instant.now();
+        Instant futureDate = now.plus(roleExpirationNotificationDays, ChronoUnit.DAYS);
+        List<UserRole> userRoles = userRoleRepository.findByEndDateBeforeAndExpiryNotifications(futureDate, 0);
         return userRoles.stream().map(userRole -> {
             List<GroupedProviders> groupedProviders = manage.getGroupedProviders(List.of(userRole.getRole()));
             GroupedProviders groupedProvider = groupedProviders.isEmpty() ? null : groupedProviders.get(0);
             Instant endDate = userRole.getEndDate();
-            long daysBetween = Math.min(ChronoUnit.DAYS.between(endDate, instant) - roleExpirationNotificationDays, roleExpirationNotificationDays) ;
+            long daysBetween = ChronoUnit.DAYS.between(now, endDate) + 1;
             String mail = mailBox.sendUserRoleExpirationNotificationMail(userRole, groupedProvider, (int) daysBetween);
             //https://stackoverflow.com/a/75121707
             userRoleRepository.updateExpiryNotifications(1, userRole.getId());

server/src/test/java/invite/cron/RoleExpirationNotifierTest.java

@@ -23,7 +23,7 @@ class RoleExpirationNotifierTest extends AbstractMailTest {
     @Test
     void sweep() {
         UserRole userRole = userRoleRepository.findByRoleName("Mail").get(0);
-        userRole.setEndDate(Instant.now().minus(1, ChronoUnit.DAYS));
+        userRole.setEndDate(Instant.now().plus(3, ChronoUnit.DAYS));
         super.stubForManageProviderById(EntityType.OIDC10_RP, "5");
 
         userRoleRepository.save(userRole);
@@ -35,7 +35,7 @@ void sweep() {
         //Due to HTML formatting, we can't be sure of the line breaks
         Stream.of("Your Inviter role Mail at the application Calendar EN will expire".split(" "))
                 .forEach(s -> assertTrue(htmlContent.contains(s)));
-        assertTrue(htmlContent.contains("1 day(s)"));
+        assertTrue(htmlContent.contains("3 day(s)"));
 
         userRole = userRoleRepository.findByRoleName("Mail").get(0);
         assertEquals(1, userRole.getExpiryNotifications());