This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit cf5b7cf39b4d1c7cccb4990a3fee23e63f726d92 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Nov 26 23:41:29 2020 +0700 [OPENMEETINGS-2526] logic is fixed --- .../java/org/apache/openmeetings/service/scheduler/ReminderJob.java | 2 +- .../test/java/org/apache/openmeetings/service/scheduler/TestJob.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java index 9cb9060..8c15121 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java @@ -145,7 +145,7 @@ public class ReminderJob extends AbstractJob { groupNotifications.put(g.getId(), now); continue; } - if (Duration.between(now, lastChecked).minusHours(g.getNotifyInterval()).isNegative()) { + if (!Duration.between(lastChecked, now).minusHours(g.getNotifyInterval()).isNegative()) { long count = groupUserDao.getGroupUserCountAddedAfter(g.getId(), Date.from(lastChecked.atZone(ZoneId.systemDefault()).toInstant())); if (count > 0) { for (User u : groupUserDao.getGroupModerators(g.getId())) { diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/service/scheduler/TestJob.java b/openmeetings-web/src/test/java/org/apache/openmeetings/service/scheduler/TestJob.java index ab7ffc2..89515a8 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/service/scheduler/TestJob.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/service/scheduler/TestJob.java @@ -21,6 +21,7 @@ package org.apache.openmeetings.service.scheduler; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS; import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.times; @@ -69,6 +70,7 @@ class TestJob extends AbstractWicketTester { reminderJob.remindExpiringRecordings(); reminderJob.remindMeetings(); reminderJob.notifyNewGroupUsers(); + assertTrue(true, "All methods are executed, no exception"); } finally { setInitComplete(true); }
