Merge pull request #58 from indexdata/CIRC-2019

Circ 2019

NEWS.md

@@ -1,3 +1,7 @@
+## 24.2.1 2024-03-29
+
+* Fix item details not fully populated when response contains more than 50 loans (CIRC-2059)
+
 ## 24.2.0 2024-03-21
 
 * Update `feesfines` interface version to 19.0 (CIRC-1914)

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mod-circulation</artifactId>
   <groupId>org.folio</groupId>
-  <version>24.3.0-SNAPSHOT</version>
+  <version>24.2.2-SNAPSHOT</version>
   <licenses>
     <license>
       <name>Apache License 2.0</name>

src/main/java/org/folio/circulation/domain/Loan.java

@@ -501,6 +501,7 @@ public Loan overrideRenewal(ZonedDateTime dueDate, String basedUponLoanPolicyId,
     changeDueDate(dueDate);
     incrementRenewalCount();
     changeActionComment(actionComment);
+    resetReminders();
 
     return this;
   }

src/main/java/org/folio/circulation/domain/LoanRepresentation.java

@@ -1,18 +1,15 @@
 package org.folio.circulation.domain;
 
 import static java.util.Objects.isNull;
-import static org.folio.circulation.domain.representations.LoanProperties.BORROWER;
-import static org.folio.circulation.domain.representations.LoanProperties.LOAN_POLICY;
-import static org.folio.circulation.domain.representations.LoanProperties.LOST_ITEM_POLICY;
-import static org.folio.circulation.domain.representations.LoanProperties.OVERDUE_FINE_POLICY;
-import static org.folio.circulation.domain.representations.LoanProperties.PATRON_GROUP_ID_AT_CHECKOUT;
+import static org.folio.circulation.domain.representations.LoanProperties.*;
 import static org.folio.circulation.support.json.JsonPropertyWriter.write;
 
 import java.lang.invoke.MethodHandles;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.folio.circulation.domain.policy.Policy;
+import org.folio.circulation.domain.policy.RemindersPolicy;
 import org.folio.circulation.domain.representations.ItemSummaryRepresentation;
 import org.folio.circulation.domain.representations.LoanProperties;
 import org.folio.circulation.resources.context.RenewalContext;
@@ -59,6 +56,13 @@ public JsonObject extendedLoan(Loan loan) {
       extendedRepresentation.remove(BORROWER);
     }
 
+    if (loan.getOverdueFinePolicy().isReminderFeesPolicy()
+      && loan.getLastReminderFeeBilledNumber() != null) {
+        extendedRepresentation.getJsonObject(REMINDERS).put(
+          "renewalBlocked",
+          !loan.getOverdueFinePolicy().getRemindersPolicy().getAllowRenewalOfItemsWithReminderFees());
+    }
+
     addPolicy(extendedRepresentation, loan.getLoanPolicy(), LOAN_POLICY);
     addPolicy(extendedRepresentation, loan.getOverdueFinePolicy(), OVERDUE_FINE_POLICY);
     addPolicy(extendedRepresentation, loan.getLostItemPolicy(), LOST_ITEM_POLICY);

src/main/java/org/folio/circulation/domain/validation/RenewalOfItemsWithReminderFeesValidator.java

@@ -3,6 +3,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.folio.circulation.domain.Loan;
+import org.folio.circulation.domain.override.BlockOverrides;
 import org.folio.circulation.domain.policy.OverdueFinePolicy;
 import org.folio.circulation.resources.context.RenewalContext;
 import org.folio.circulation.support.HttpFailure;
@@ -14,6 +15,7 @@
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.folio.circulation.support.ValidationErrorFailure.singleValidationError;
+import static org.folio.circulation.support.json.JsonPropertyFetcher.getObjectProperty;
 import static org.folio.circulation.support.results.Result.failed;
 import static org.folio.circulation.support.results.Result.succeeded;
 
@@ -27,13 +29,12 @@ public CompletableFuture<Result<RenewalContext>> blockRenewalIfReminderFeesExist
 
   Result<RenewalContext> blockRenewalIfRuledByRemindersFeePolicy(RenewalContext renewalContext) {
     log.debug("blockRenewalIfRuledByRemindersFeePolicy:: parameters: renewalContext: {}", renewalContext);
-
-    Loan loan = renewalContext.getLoan();
-    Integer lastFeeBilledCount = loan.getLastReminderFeeBilledNumber();
-    OverdueFinePolicy overdueFinePolicy = loan.getOverdueFinePolicy();
-    Boolean allowRenewalWithReminders = overdueFinePolicy.getRemindersPolicy().getAllowRenewalOfItemsWithReminderFees();
-
-    if ((lastFeeBilledCount != null && lastFeeBilledCount > 0) && Boolean.FALSE.equals(allowRenewalWithReminders)) {
+    BlockOverrides overrides = BlockOverrides.from(getObjectProperty(renewalContext.getRenewalRequest(), "overrideBlocks"));
+    final boolean overrideRenewalBlock = overrides.getRenewalBlockOverride().isRequested();
+    final boolean overrideRenewalBlockDueDateRequired = overrides.getRenewalDueDateRequiredBlockOverride().isRequested();
+    if (overrideRenewalBlock || overrideRenewalBlockDueDateRequired) {
+      return succeeded(renewalContext);
+    } else if (renewalBlockedDueToReminders(renewalContext)) {
       String reason = "Renewals not allowed for loans with reminders.";
       log.info("createBlockedRenewalDueToReminderFeesPolicyError:: {}", reason);
       return failed(createBlockedRenewalDueToReminderFeesPolicyError("Renewals not allowed for loans with reminders.", reason));
@@ -48,4 +49,19 @@ private HttpFailure createBlockedRenewalDueToReminderFeesPolicyError(String mess
 
     return singleValidationError(new ValidationError(message, "reason", reason));
   }
+
+  private static boolean renewalBlockedDueToReminders(RenewalContext renewalContext) {
+    Loan loan = renewalContext.getLoan();
+    return loanHasReminders(loan) && policyBlocksRenewalWithReminders(loan);
+  }
+
+  private static Boolean loanHasReminders(Loan loan) {
+    return loan.getLastReminderFeeBilledNumber() != null && loan.getLastReminderFeeBilledNumber() > 0;
+  }
+
+  private static boolean policyBlocksRenewalWithReminders (Loan loan) {
+    OverdueFinePolicy overdueFinePolicy = loan.getOverdueFinePolicy();
+    Boolean allowRenewalWithReminders = overdueFinePolicy.getRemindersPolicy().getAllowRenewalOfItemsWithReminderFees();
+    return Boolean.FALSE.equals(allowRenewalWithReminders);
+  }
 }

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

@@ -103,7 +103,8 @@ public static ValidationError errorForNotMatchingOverrideCases(LoanPolicy loanPo
       "renewal date falls outside of the date ranges in the loan policy, " +
       "items cannot be renewed when there is an active recall request, " +
       DECLARED_LOST_ITEM_RENEWED_ERROR + ", item is Aged to lost, " +
-      "renewal would not change the due date";
+      "renewal would not change the due date, " +
+      "loan has reminder fees";
 
     return loanPolicyValidationError(loanPolicy, reason);
   }

src/main/java/org/folio/circulation/resources/renewal/RenewalResource.java

@@ -492,6 +492,10 @@ private Result<Loan> overrideRenewal(Loan loan, ZonedDateTime systemDate,
         return processRenewal(newDueDateResult, loan, comment);
       }
 
+      if (loan.getLastReminderFeeBilledNumber() != null && loan.getLastReminderFeeBilledNumber()>0) {
+        return processRenewal(newDueDateResult, loan, comment);
+      }
+
       return failedValidation(errorForNotMatchingOverrideCases(loanPolicy));
 
     } catch (Exception e) {

src/test/java/api/loans/OverrideRenewByBarcodeTests.java

@@ -521,7 +521,8 @@ void cannotOverrideRenewalWhenLoanDoesNotMatchAnyOfOverrideCases() {
         "renewal date falls outside of the date ranges in the loan policy, " +
         "items cannot be renewed when there is an active recall request, " +
         "item is Declared lost, item is Aged to lost, " +
-        "renewal would not change the due date"))));
+        "renewal would not change the due date, " +
+        "loan has reminder fees"))));
   }
 
   @Test

src/test/java/api/requests/RequestsAPILoanRenewalTests.java

@@ -592,7 +592,8 @@ void forbidRenewalOverrideWhenRecallIsForDifferentItemOfSameInstance() {
         "renewal date falls outside of the date ranges in the loan policy, " +
         "items cannot be renewed when there is an active recall request, " +
         "item is Declared lost, item is Aged to lost, " +
-        "renewal would not change the due date"))));
+        "renewal would not change the due date, " +
+        "loan has reminder fees"))));
   }
 
   @Test
@@ -623,7 +624,8 @@ void forbidRenewalOverrideWhenTitleLevelRecallRequestExistsForDifferentItemOfSam
         "renewal date falls outside of the date ranges in the loan policy, " +
         "items cannot be renewed when there is an active recall request, " +
         "item is Declared lost, item is Aged to lost, " +
-        "renewal would not change the due date"))));
+        "renewal would not change the due date, " +
+        "loan has reminder fees"))));
   }
 
   @Test