MODDCB-152 Add borrowing pickup role (#128)

* MODDCB-152 Add borrowing pickup role * MODDCB-152 Add tests (cherry picked from commit b29c260)
folio-org · Dec 12, 2024 · a77aba1 · a77aba1
1 parent 2d742e7
commit a77aba1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java
@@ -1,7 +1,7 @@
 package org.folio.dcb.service.impl;
 
-import static java.lang.String.format;
 import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.BORROWER;
+import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.BORROWING_PICKUP;
 import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.LENDER;
 import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.PICKUP;
 
@@ -51,7 +51,10 @@ public TransactionStatusResponse createEcsRequestTransactions(String ecsRequestT
       RequestStatus.from(circulationRequest.getStatus()))) {
       if (dcbTransaction.getRole() == LENDER) {
         createLenderEcsRequestTransactions(ecsRequestTransactionsId, dcbTransaction, circulationRequest);
-      } else if(dcbTransaction.getRole() == BORROWER || dcbTransaction.getRole() == PICKUP) {
+      } else if(dcbTransaction.getRole() == BORROWER
+        || dcbTransaction.getRole() == PICKUP
+        || dcbTransaction.getRole() == BORROWING_PICKUP) {
+
         createBorrowerEcsRequestTransactions(ecsRequestTransactionsId, dcbTransaction,
           circulationRequest);
       } else {

diff --git a/src/test/java/org/folio/dcb/controller/EcsRequestTransactionsApiControllerTest.java b/src/test/java/org/folio/dcb/controller/EcsRequestTransactionsApiControllerTest.java
@@ -2,6 +2,7 @@
 
 import static org.folio.dcb.utils.EntityUtils.CIRCULATION_REQUEST_ID;
 import static org.folio.dcb.utils.EntityUtils.createBorrowingEcsRequestTransactionByRole;
+import static org.folio.dcb.utils.EntityUtils.createBorrowingPickupEcsRequestTransactionByRole;
 import static org.folio.dcb.utils.EntityUtils.createLendingEcsRequestTransactionByRole;
 import static org.folio.dcb.utils.EntityUtils.createPickupEcsRequestTransactionByRole;
 import static org.hamcrest.Matchers.is;
@@ -97,6 +98,19 @@ void createPickupEcsRequestTest() throws Exception {
       .andExpect(status().isCreated());
   }
 
+  @Test
+  void createBorrowingPickupEcsRequestTest() throws Exception {
+    removeExistedTransactionFromDbIfSoExists();
+
+    this.mockMvc.perform(
+        post("/ecs-request-transactions/" + CIRCULATION_REQUEST_ID)
+          .content(asJsonString(createBorrowingPickupEcsRequestTransactionByRole()))
+          .headers(defaultHeaders())
+          .contentType(MediaType.APPLICATION_JSON)
+          .accept(MediaType.APPLICATION_JSON))
+      .andExpect(status().isCreated());
+  }
+
   @Test
   void checkErrorStatusForInvalidRequest() throws Exception {
     DcbTransaction dcbTransaction = createLendingEcsRequestTransactionByRole();

diff --git a/src/test/java/org/folio/dcb/utils/EntityUtils.java b/src/test/java/org/folio/dcb/utils/EntityUtils.java
@@ -101,6 +101,15 @@ public static DcbTransaction createPickupEcsRequestTransactionByRole() {
       .build();
   }
 
+  public static DcbTransaction createBorrowingPickupEcsRequestTransactionByRole() {
+    return DcbTransaction.builder()
+      .requestId(REQUEST_ID)
+      .item(createDcbItem())
+      .role(DcbTransaction.RoleEnum.BORROWING_PICKUP)
+      .pickup(createDcbPickup())
+      .build();
+  }
+
   public static org.folio.dcb.domain.dto.ServicePointRequest createServicePointRequest() {
     return org.folio.dcb.domain.dto.ServicePointRequest.builder()
       .id(PICKUP_SERVICE_POINT_ID)