CIRC-1925 Update reminder scheduler to handle printed notices (folio-org#1417)

* CIRC-1925 Update reminder scheduler to handle printed notices

* CIRC-1925 fix merge from master

---------

Co-authored-by: Niels Erik <nielserik@indexdata.com>

Author: JanisSaldabols

src/main/java/org/folio/circulation/domain/notice/NoticeFormat.java

@@ -5,7 +5,7 @@
 public enum NoticeFormat {
 
   EMAIL("Email", "email", "text/html"),
-  PRINT("Print", "mail", "text"),
+  PRINT("Print", "mail", "text/html"),
   UNKNOWN("Unknown", "", "");
 
 

src/main/java/org/folio/circulation/resources/ScheduledDigitalRemindersProcessingResource.java

@@ -41,7 +41,6 @@ protected CompletableFuture<Result<MultipleRecords<ScheduledNotice>>> findNotice
     return CqlQuery.lessThanOrEqualTo("nextRunTime", formatDateTime(ClockUtil.getZonedDateTime().withZoneSameInstant(ZoneOffset.UTC)))
       .combine(exactMatch("noticeConfig.sendInRealTime", "true"), CqlQuery::and)
       .combine(exactMatch("triggeringEvent", DUE_DATE_WITH_REMINDER_FEE.getRepresentation()), CqlQuery::and)
-      .combine(exactMatch("noticeConfig.format", "Email"), CqlQuery::and)
       .map(cqlQuery -> cqlQuery.sortBy(CqlSortBy.ascending("nextRunTime")))
       .after(query -> scheduledNoticesRepository.findBy(query, pageLimit));
   }

src/test/java/api/loans/ReminderFeeTests.java

@@ -5,6 +5,7 @@
 import api.support.builders.FeeFineOwnerBuilder;
 import api.support.builders.HoldingBuilder;
 import api.support.builders.ItemBuilder;
+import api.support.fakes.FakeModNotify;
 import api.support.http.IndividualResource;
 import api.support.http.ItemResource;
 import api.support.http.UserResource;
@@ -402,7 +403,9 @@ void willScheduleRemindersAroundClosedDays() {
     verifyNumberOfPublishedEvents(NOTICE, 3);
     verifyNumberOfPublishedEvents(NOTICE_ERROR, 0);
     waitAtMost(1, SECONDS).until(accountsClient::getAll, hasSize(2));
-
+    waitAtMost(1, SECONDS).until(() ->
+      FakeModNotify.getSentPatronNotices().stream()
+        .filter(r -> r.getString("deliveryChannel").equals("mail")).toList(), hasSize(1));
   }
 
   @Test

src/test/java/api/support/fixtures/OverdueFinePoliciesFixture.java

@@ -129,7 +129,7 @@ public IndividualResource remindersOneDayBetween(boolean canScheduleRemindersOnC
       .withAddedReminderEntry(1, "day", 0.00,
         "Email", SECOND_REMINDER_TEMPLATE_ID.toString())
       .withAddedReminderEntry(1,"day", 2.15,
-        "Email", THIRD_REMINDER_TEMPLATE_ID.toString())
+        "Print", THIRD_REMINDER_TEMPLATE_ID.toString())
       .withCanSendReminderUponClosedDay(canScheduleRemindersOnClosedDays)
       .withAllowRenewalOfItemsWithReminderFees(true);
     return overdueFinePolicyRecordCreator.createIfAbsent(policy.create());