-
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 #115 from folio-org/MODDCB-124
MODDCB-124: Merge branch `ecs-tlr` into `master`
- Loading branch information
Showing
27 changed files
with
452 additions
and
29 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
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
39 changes: 39 additions & 0 deletions
39
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,39 @@ | ||
| 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
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
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
119 changes: 119 additions & 0 deletions
119
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,119 @@ | ||
| package org.folio.dcb.service.impl; | ||
|
|
||
| import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.BORROWER; | ||
| import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.LENDER; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| import org.folio.dcb.domain.dto.CirculationItem; | ||
| 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.Item; | ||
| import org.folio.dcb.domain.dto.TransactionStatusResponse; | ||
| import org.folio.dcb.exception.ResourceAlreadyExistException; | ||
| import org.folio.dcb.repository.TransactionRepository; | ||
| import org.folio.dcb.service.CirculationItemService; | ||
| import org.folio.dcb.service.CirculationRequestService; | ||
| import org.folio.dcb.service.EcsRequestTransactionsService; | ||
| import org.folio.dcb.service.RequestService; | ||
| import org.folio.dcb.utils.RequestStatus; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| @Log4j2 | ||
| public class EcsRequestTransactionsServiceImpl implements EcsRequestTransactionsService { | ||
|
|
||
| private final BaseLibraryService baseLibraryService; | ||
| private final TransactionRepository transactionRepository; | ||
| private final RequestService requestService; | ||
| private final CirculationRequestService circulationRequestService; | ||
| private final CirculationItemService circulationItemService; | ||
|
|
||
| @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 if(dcbTransaction.getRole() == BORROWER) { | ||
| createBorrowerEcsRequestTransactions(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()); | ||
| } | ||
|
|
||
| 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"); | ||
| } | ||
| baseLibraryService.checkItemExistsInInventoryAndThrow(itemVirtual.getBarcode()); | ||
| CirculationItem item = circulationItemService.checkIfItemExistsAndCreate(itemVirtual, circulationRequest.getPickupServicePointId()); | ||
| circulationRequest.setItemId(UUID.fromString(item.getId())); | ||
| circulationRequest.setItem(Item.builder() | ||
| .barcode(item.getBarcode()) | ||
| .build()); | ||
| circulationRequest.setHoldingsRecordId(UUID.fromString(item.getHoldingsRecordId())); | ||
| requestService.updateCirculationRequest(circulationRequest); | ||
| 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
Oops, something went wrong.