-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #72 from folio-org/MODDCB-90
MODDCB-90 Accept existing circulation request ID
- Loading branch information
Showing
15 changed files
with
302 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
src/main/java/org/folio/dcb/controller/EcsRequestTransactionsApiController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package org.folio.dcb.controller; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dcb.domain.dto.DcbTransaction; | ||
| import org.folio.dcb.domain.dto.TransactionStatusResponse; | ||
| import org.folio.dcb.rest.resource.EcsRequestTransactionsApi; | ||
| import org.folio.dcb.service.EcsRequestTransactionsService; | ||
| import org.folio.dcb.service.TransactionAuditService; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| @Log4j2 | ||
| @RequiredArgsConstructor | ||
| public class EcsRequestTransactionsApiController implements EcsRequestTransactionsApi { | ||
|
|
||
| private final EcsRequestTransactionsService ecsRequestTransactionsService; | ||
| private final TransactionAuditService transactionAuditService; | ||
|
|
||
| @Override | ||
| public ResponseEntity<TransactionStatusResponse> createEcsRequestTransactions( | ||
| String ecsRequestTransactionId, DcbTransaction dcbTransaction) { | ||
| log.info("createEcsRequestTransactions:: creating ECS Request Transaction {} with ID {}", | ||
| dcbTransaction, ecsRequestTransactionId); | ||
| TransactionStatusResponse transactionStatusResponse; | ||
| try { | ||
| transactionStatusResponse = ecsRequestTransactionsService.createEcsRequestTransactions( | ||
| ecsRequestTransactionId, dcbTransaction); | ||
| } catch (Exception ex) { | ||
| transactionAuditService.logErrorIfTransactionAuditNotExists(ecsRequestTransactionId, | ||
| dcbTransaction, ex.getMessage()); | ||
| throw ex; | ||
| } | ||
| return ResponseEntity.status(HttpStatus.CREATED).body(transactionStatusResponse); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
src/main/java/org/folio/dcb/service/EcsRequestTransactionsService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package org.folio.dcb.service; | ||
|
|
||
| import org.folio.dcb.domain.dto.DcbTransaction; | ||
| import org.folio.dcb.domain.dto.TransactionStatusResponse; | ||
|
|
||
| public interface EcsRequestTransactionsService { | ||
| TransactionStatusResponse createEcsRequestTransactions(String ecsRequestTransactionsId, | ||
| DcbTransaction dcbTransaction); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
src/main/java/org/folio/dcb/service/impl/EcsRequestTransactionsServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package org.folio.dcb.service.impl; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dcb.domain.dto.CirculationRequest; | ||
| import org.folio.dcb.domain.dto.DcbItem; | ||
| import org.folio.dcb.domain.dto.DcbPatron; | ||
| import org.folio.dcb.domain.dto.DcbPickup; | ||
| import org.folio.dcb.domain.dto.DcbTransaction; | ||
| import org.folio.dcb.domain.dto.TransactionStatusResponse; | ||
| import org.folio.dcb.exception.ResourceAlreadyExistException; | ||
| import org.folio.dcb.repository.TransactionRepository; | ||
| import org.folio.dcb.service.CirculationRequestService; | ||
| import org.folio.dcb.service.EcsRequestTransactionsService; | ||
| import org.folio.dcb.utils.RequestStatus; | ||
| import org.springframework.stereotype.Service; | ||
| import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.LENDER; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| @Log4j2 | ||
| public class EcsRequestTransactionsServiceImpl implements EcsRequestTransactionsService { | ||
|
|
||
| private final BaseLibraryService baseLibraryService; | ||
| private final TransactionRepository transactionRepository; | ||
| private final CirculationRequestService circulationRequestService; | ||
|
|
||
| @Override | ||
| public TransactionStatusResponse createEcsRequestTransactions(String ecsRequestTransactionsId, | ||
| DcbTransaction dcbTransaction) { | ||
| log.info("createEcsRequestTransactions:: creating new transaction request for role {} ", | ||
| dcbTransaction.getRole()); | ||
| checkEcsRequestTransactionExistsAndThrow(ecsRequestTransactionsId); | ||
| CirculationRequest circulationRequest = circulationRequestService.fetchRequestById( | ||
| dcbTransaction.getRequestId()); | ||
| if (circulationRequest != null && RequestStatus.isRequestOpen( | ||
| RequestStatus.from(circulationRequest.getStatus()))) { | ||
| if (dcbTransaction.getRole() == LENDER) { | ||
| createLenderEcsRequestTransactions(ecsRequestTransactionsId, dcbTransaction, circulationRequest); | ||
| } else { | ||
| throw new IllegalArgumentException("Unimplemented role: " + dcbTransaction.getRole()); | ||
| } | ||
| return TransactionStatusResponse.builder() | ||
| .status(TransactionStatusResponse.StatusEnum.CREATED) | ||
| .item(dcbTransaction.getItem()) | ||
| .patron(dcbTransaction.getPatron()) | ||
| .build(); | ||
| } else { | ||
| throw new IllegalArgumentException("Unable to create ecs transaction as could not find open request"); | ||
| } | ||
| } | ||
|
|
||
| private void checkEcsRequestTransactionExistsAndThrow(String dcbTransactionId) { | ||
| if (transactionRepository.existsById(dcbTransactionId)) { | ||
| throw new ResourceAlreadyExistException( | ||
| String.format("unable to create ECS transaction with ID %s as it already exists", | ||
| dcbTransactionId)); | ||
| } | ||
| } | ||
|
|
||
| private void createLenderEcsRequestTransactions(String ecsRequestTransactionsId, | ||
| DcbTransaction dcbTransaction, CirculationRequest circulationRequest) { | ||
| dcbTransaction.setItem(DcbItem.builder() | ||
| .id(String.valueOf(circulationRequest.getItemId())) | ||
| .barcode(circulationRequest.getItem().getBarcode()) | ||
| .build()); | ||
| dcbTransaction.setPatron(DcbPatron.builder() | ||
| .id(String.valueOf(circulationRequest.getRequesterId())) | ||
| .barcode(circulationRequest.getRequester().getBarcode()) | ||
| .build()); | ||
| dcbTransaction.setPickup(DcbPickup.builder() | ||
| .servicePointId(String.valueOf(circulationRequest.getPickupServicePointId())) | ||
| .build()); | ||
| baseLibraryService.saveDcbTransaction(ecsRequestTransactionsId, dcbTransaction, | ||
| dcbTransaction.getRequestId()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
src/test/java/org/folio/dcb/controller/EcsRequestTransactionsApiControllerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package org.folio.dcb.controller; | ||
|
|
||
| import org.folio.dcb.domain.dto.DcbTransaction; | ||
| import org.folio.dcb.domain.entity.TransactionAuditEntity; | ||
| import org.folio.dcb.repository.TransactionAuditRepository; | ||
| import org.folio.dcb.repository.TransactionRepository; | ||
| import org.folio.spring.service.SystemUserScopedExecutionService; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.http.MediaType; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.LENDER; | ||
| import static org.folio.dcb.utils.EntityUtils.CIRCULATION_REQUEST_ID; | ||
| import static org.folio.dcb.utils.EntityUtils.createEcsRequestTransactionByRole; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| class EcsRequestTransactionsApiControllerTest extends BaseIT { | ||
|
|
||
| private static final String TRANSACTION_AUDIT_DUPLICATE_ERROR_ACTION = "DUPLICATE_ERROR"; | ||
| private static final String DUPLICATE_ERROR_TRANSACTION_ID = "-1"; | ||
|
|
||
| @Autowired | ||
| private TransactionRepository transactionRepository; | ||
| @Autowired | ||
| private TransactionAuditRepository transactionAuditRepository; | ||
| @Autowired | ||
| private SystemUserScopedExecutionService systemUserScopedExecutionService; | ||
|
|
||
| @Test | ||
| void createLendingEcsRequestTest() throws Exception { | ||
| removeExistedTransactionFromDbIfSoExists(); | ||
|
|
||
| this.mockMvc.perform( | ||
| post("/ecs-request-transactions/" + CIRCULATION_REQUEST_ID) | ||
| .content(asJsonString(createEcsRequestTransactionByRole(LENDER))) | ||
| .headers(defaultHeaders()) | ||
| .contentType(MediaType.APPLICATION_JSON) | ||
| .accept(MediaType.APPLICATION_JSON)) | ||
| .andExpect(status().isCreated()); | ||
|
|
||
| //Trying to create another transaction with same transaction id | ||
| this.mockMvc.perform( | ||
| post("/ecs-request-transactions/" + CIRCULATION_REQUEST_ID) | ||
| .content(asJsonString(createEcsRequestTransactionByRole(LENDER))) | ||
| .headers(defaultHeaders()) | ||
| .contentType(MediaType.APPLICATION_JSON) | ||
| .accept(MediaType.APPLICATION_JSON)) | ||
| .andExpectAll(status().is4xxClientError(), | ||
| jsonPath("$.errors[0].code", is("DUPLICATE_ERROR"))); | ||
|
|
||
| // check for DUPLICATE_ERROR propagated into transactions_audit. | ||
| systemUserScopedExecutionService.executeAsyncSystemUserScoped( | ||
| TENANT, | ||
| () -> { | ||
| TransactionAuditEntity auditExisting = transactionAuditRepository | ||
| .findLatestTransactionAuditEntityByDcbTransactionId(CIRCULATION_REQUEST_ID) | ||
| .orElse(null); | ||
| Assertions.assertNotNull(auditExisting); | ||
| Assertions.assertNotEquals(TRANSACTION_AUDIT_DUPLICATE_ERROR_ACTION, auditExisting.getAction()); | ||
| Assertions.assertNotEquals(DUPLICATE_ERROR_TRANSACTION_ID, auditExisting.getTransactionId()); } | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void checkErrorStatusForInvalidRequest() throws Exception { | ||
| DcbTransaction dcbTransaction = createEcsRequestTransactionByRole(LENDER); | ||
| dcbTransaction.setRequestId(UUID.randomUUID().toString()); | ||
| this.mockMvc.perform( | ||
| post("/ecs-request-transactions/" + CIRCULATION_REQUEST_ID) | ||
| .content(asJsonString(dcbTransaction)) | ||
| .headers(defaultHeaders()) | ||
| .contentType(MediaType.APPLICATION_JSON) | ||
| .accept(MediaType.APPLICATION_JSON)) | ||
| .andExpectAll(status().is4xxClientError()); | ||
| } | ||
|
|
||
| private void removeExistedTransactionFromDbIfSoExists() { | ||
| systemUserScopedExecutionService.executeAsyncSystemUserScoped(TENANT, () -> { | ||
| if (transactionRepository.existsById(CIRCULATION_REQUEST_ID)){ | ||
| transactionRepository.deleteById(CIRCULATION_REQUEST_ID); | ||
| } | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.