CIRC-2050 set returnDate for lost loans

folio-org · Apr 8, 2024 · 5592ad8 · 5592ad8
1 parent 533b373
commit 5592ad8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/org/folio/circulation/domain/Loan.java b/src/main/java/org/folio/circulation/domain/Loan.java
@@ -740,9 +740,10 @@ public FeeAmount getRemainingFeeFineAmount() {
       .orElse(noFeeAmount());
   }
 
-  public void closeLoanAsLostAndPaid() {
+  public void closeLoanAsLostAndPaid(ZonedDateTime returnDate) {
     log.debug("closeLoanAsLostAndPaid:: ");
     closeLoan(CLOSED_LOAN);
+    changeReturnDate(returnDate);
     changeItemStatusForItemAndLoan(ItemStatus.LOST_AND_PAID);
   }
 

diff --git a/src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java b/src/main/java/org/folio/circulation/services/CloseLoanWithLostItemService.java
@@ -21,6 +21,7 @@
 import org.folio.circulation.infrastructure.storage.loans.LoanRepository;
 import org.folio.circulation.infrastructure.storage.loans.LostItemPolicyRepository;
 import org.folio.circulation.support.results.Result;
+import org.folio.circulation.support.utils.ClockUtil;
 
 public class CloseLoanWithLostItemService {
 
@@ -78,7 +79,7 @@ private CompletableFuture<Result<Loan>> closeLoanAsLostAndPaid(Loan loan,
     }
 
     boolean wasLoanOpen = loan.isOpen();
-    loan.closeLoanAsLostAndPaid();
+    loan.closeLoanAsLostAndPaid(ClockUtil.getZonedDateTime());
 
     return new StoreLoanAndItem(loanRepository, itemRepository).updateLoanAndItemInStorage(loan)
       .thenCompose(r -> r.after(l -> publishLoanClosedEvent(l, wasLoanOpen, eventPublisher)));

diff --git a/src/main/java/org/folio/circulation/services/LostItemFeeChargingService.java b/src/main/java/org/folio/circulation/services/LostItemFeeChargingService.java
@@ -40,6 +40,7 @@
 import org.folio.circulation.services.support.CreateAccountCommand;
 import org.folio.circulation.support.Clients;
 import org.folio.circulation.support.results.Result;
+import org.folio.circulation.support.utils.ClockUtil;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -142,7 +143,7 @@ private CompletableFuture<Result<Loan>> closeLoanAsLostAndPaidAndPublishEvent(Lo
   }
 
   private CompletableFuture<Result<Loan>> closeLoanAsLostAndPaidAndUpdateInStorage(Loan loan) {
-    loan.closeLoanAsLostAndPaid();
+    loan.closeLoanAsLostAndPaid(ClockUtil.getZonedDateTime());
     return storeLoanAndItem.updateLoanAndItemInStorage(loan);
   }
 

diff --git a/...n/java/org/folio/circulation/services/agedtolost/ChargeLostFeesWhenAgedToLostService.java b/...n/java/org/folio/circulation/services/agedtolost/ChargeLostFeesWhenAgedToLostService.java
@@ -61,6 +61,7 @@
 import org.folio.circulation.support.fetching.PageableFetcher;
 import org.folio.circulation.support.http.client.CqlQuery;
 import org.folio.circulation.support.results.Result;
+import org.folio.circulation.support.utils.ClockUtil;
 
 import lombok.val;
 
@@ -322,7 +323,7 @@ private CompletableFuture<Result<Loan>> closeLoanAsLostAndPaid(LoanToChargeFees
     final Loan loan = loanToChargeFees.getLoan();
 
     loan.setLostItemHasBeenBilled();
-    loan.closeLoanAsLostAndPaid();
+    loan.closeLoanAsLostAndPaid(ClockUtil.getZonedDateTime());
 
     return storeLoanAndItem.updateLoanAndItemInStorage(loan);
   }