CIRC-2084 renamed storage-loan-7-2.json to storage-loan-7-3.json and …

…changes made in LoanRepository
folio-org · Jun 6, 2024 · 79a2328 · 79a2328
1 parent 875e9ef
commit 79a2328
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/main/java/org/folio/circulation/infrastructure/storage/loans/LoanRepository.java b/src/main/java/org/folio/circulation/infrastructure/storage/loans/LoanRepository.java
@@ -298,9 +298,12 @@ private Result<MultipleRecords<Loan>> mapResponseToLoans(Response response) {
   }
 
   private static void addIsDcbProperty(Loan loan, Item item, JsonObject storageLoan) {
-      write(storageLoan, IS_DCB, (nonNull(loan.getUser()) && nonNull(loan.getUser().getLastName())
-              && loan.getUser().getLastName().equalsIgnoreCase(DCB_USER_LASTNAME))
-              || item.isDcbItem());
+    write(storageLoan, IS_DCB, isDcbLoan(loan, item));
+  }
+
+  private static boolean isDcbLoan(Loan loan, Item item) {
+      return item.isDcbItem() || (nonNull(loan.getUser()) && nonNull(loan.getUser().getLastName())
+              && loan.getUser().getLastName().equalsIgnoreCase(DCB_USER_LASTNAME));
   }
 
   private static JsonObject mapToStorageRepresentation(Loan loan, Item item) {

diff --git a/src/test/java/api/support/fakes/StorageSchema.java b/src/test/java/api/support/fakes/StorageSchema.java
@@ -12,7 +12,7 @@ public static JsonSchemaValidator validatorForStorageItemSchema() throws IOExcep
   }
 
   public static JsonSchemaValidator validatorForStorageLoanSchema() throws IOException {
-    return JsonSchemaValidator.fromResource("/storage-loan-7-2.json");
+    return JsonSchemaValidator.fromResource("/storage-loan-7-3.json");
   }
 
   public static JsonSchemaValidator validatorForLocationInstSchema() throws IOException {

diff --git a/src/test/java/api/support/fixtures/CirculationItemsFixture.java b/src/test/java/api/support/fixtures/CirculationItemsFixture.java
@@ -27,10 +27,17 @@ public IndividualResource createCirculationItem(String barcode, UUID holdingId,
     return circulationItemClient.create(circulationItemsBuilder);
   }
 
-  public IndividualResource createCirculationItemForDcb(String barcode, UUID holdingId, UUID locationId, String instanceTitle,boolean isDcb) {
-    CirculationItemsBuilder circulationItemsBuilder = new CirculationItemsBuilder().withBarcode(barcode).withHoldingId(holdingId)
-      .withLoanType(loanTypesFixture.canCirculate().getId()).withMaterialType(materialTypesFixture.book().getId())
-      .withLocationId(locationId).withInstanceTitle(instanceTitle).withDcb(isDcb);
+  public IndividualResource createCirculationItemForDcb(String barcode, UUID holdingId, UUID locationId,
+                                                        String instanceTitle, boolean isDcb) {
+    CirculationItemsBuilder circulationItemsBuilder = new CirculationItemsBuilder()
+      .withBarcode(barcode)
+      .withHoldingId(holdingId)
+      .withLoanType(loanTypesFixture.canCirculate().getId())
+      .withMaterialType(materialTypesFixture.book().getId())
+      .withLocationId(locationId)
+      .withInstanceTitle(instanceTitle)
+      .withDcb(isDcb);
+
     return circulationItemClient.create(circulationItemsBuilder);
   }
 

diff --git a/src/test/resources/storage-loan-7-2.json → src/test/resources/storage-loan-7-3.json b/src/test/resources/storage-loan-7-2.json → src/test/resources/storage-loan-7-3.json