diff --git a/src/main/java/org/folio/dcb/controller/EcsRequestTransactionsApiController.java b/src/main/java/org/folio/dcb/controller/EcsRequestTransactionsApiController.java index 8b86c9f7..e85b53b7 100644 --- a/src/main/java/org/folio/dcb/controller/EcsRequestTransactionsApiController.java +++ b/src/main/java/org/folio/dcb/controller/EcsRequestTransactionsApiController.java @@ -22,6 +22,7 @@ public class EcsRequestTransactionsApiController implements EcsRequestTransactio @Override public ResponseEntity createEcsRequestTransactions( String ecsRequestTransactionId, DcbTransaction dcbTransaction) { + log.info("createEcsRequestTransactions:: creating ECS Request Transaction {} with ID {}", dcbTransaction, ecsRequestTransactionId); TransactionStatusResponse transactionStatusResponse; diff --git a/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java index 0b6daacd..722660b2 100644 --- a/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java @@ -39,6 +39,7 @@ public class EcsRequestTransactionsServiceImpl implements EcsRequestTransactions @Override public TransactionStatusResponse createEcsRequestTransactions(String ecsRequestTransactionsId, DcbTransaction dcbTransaction) { + log.info("createEcsRequestTransactions:: creating new transaction request for role {} ", dcbTransaction.getRole()); checkEcsRequestTransactionExistsAndThrow(ecsRequestTransactionsId); @@ -60,7 +61,7 @@ public TransactionStatusResponse createEcsRequestTransactions(String ecsRequestT .patron(dcbTransaction.getPatron()) .build(); } else { - throw new IllegalArgumentException("Unable to create ecs transaction as could not find open request"); + throw new IllegalArgumentException("Unable to create ECS transaction as could not find open request"); } } @@ -74,6 +75,7 @@ private void checkEcsRequestTransactionExistsAndThrow(String dcbTransactionId) { private void createLenderEcsRequestTransactions(String ecsRequestTransactionsId, DcbTransaction dcbTransaction, CirculationRequest circulationRequest) { + dcbTransaction.setItem(DcbItem.builder() .id(String.valueOf(circulationRequest.getItemId())) .barcode(circulationRequest.getItem().getBarcode()) @@ -91,6 +93,7 @@ private void createLenderEcsRequestTransactions(String ecsRequestTransactionsId, private void createBorrowerEcsRequestTransactions(String ecsRequestTransactionsId, DcbTransaction dcbTransaction, CirculationRequest circulationRequest) { + var itemVirtual = dcbTransaction.getItem(); if (itemVirtual == null) { throw new IllegalArgumentException("Item is required for borrower transaction"); diff --git a/src/test/java/org/folio/dcb/controller/TransactionApiControllerTest.java b/src/test/java/org/folio/dcb/controller/TransactionApiControllerTest.java index 59cbbbc2..5edbc7ff 100644 --- a/src/test/java/org/folio/dcb/controller/TransactionApiControllerTest.java +++ b/src/test/java/org/folio/dcb/controller/TransactionApiControllerTest.java @@ -602,11 +602,11 @@ void lenderTransactionStatusUpdateFromCreatedToOpen() throws Exception { systemUserScopedExecutionService.executeAsyncSystemUserScoped(TENANT, () -> transactionRepository.save(dcbTransaction)); this.mockMvc.perform( - put("/transactions/" + transactionID + "/status") - .content(asJsonString(createTransactionStatus(TransactionStatus.StatusEnum.OPEN))) - .headers(defaultHeaders()) - .contentType(MediaType.APPLICATION_JSON) - .accept(MediaType.APPLICATION_JSON)) + put("/transactions/" + transactionID + "/status") + .content(asJsonString(createTransactionStatus(TransactionStatus.StatusEnum.OPEN))) + .headers(defaultHeaders()) + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.status").value("OPEN")); }