Merge pull request #6935 from ORCID/AllwaysSend2DaysRemider

allways send 2 days reminder
ORCID · Nov 16, 2023 · f5767f3 · f5767f3
2 parents 4bf960c + c21173d
commit f5767f3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...duler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java b/...duler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java
@@ -569,19 +569,19 @@ private String getHtmlBody(NotificationAdministrative notificationAdministrative
 
     @Override
     synchronized public void processUnverifiedEmails2Days() {
-        processUnverifiedEmails(verifyReminderAfterTwoDays, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT_SKIPPED);
+        processUnverifiedEmails(true, verifyReminderAfterTwoDays, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT_SKIPPED);
     }
 
     synchronized public void processUnverifiedEmails7Days() {
-        processUnverifiedEmails(verifyReminderAfterSevenDays, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT_SKIPPED);
+        processUnverifiedEmails(false, verifyReminderAfterSevenDays, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT_SKIPPED);
     }
 
     synchronized public void processUnverifiedEmails28Days() {
-        processUnverifiedEmails(verifyReminderAfterTwentyEightDays, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT_SKIPPED);
+        processUnverifiedEmails(false, verifyReminderAfterTwentyEightDays, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT_SKIPPED);
     }
 
-    private void processUnverifiedEmails(int unverifiedDays, EmailEventType sent, EmailEventType failed) {
-        if (Features.SEND_ALL_VERIFICATION_EMAILS.isActive()) {
+    private void processUnverifiedEmails(boolean forceSending, int unverifiedDays, EmailEventType sent, EmailEventType failed) {
+        if (forceSending || Features.SEND_ALL_VERIFICATION_EMAILS.isActive()) {
             LOGGER.info("About to process unverIfied emails for {}  days reminder", unverifiedDays);
             List<Triple<String, String, Boolean>> elements = Collections.<Triple<String, String, Boolean>> emptyList();
             elements = profileDaoReadOnly.findEmailsUnverfiedDays(unverifiedDays, sent);