diff --git a/src/main/java/org/folio/dcb/client/feign/CirculationRequestClient.java b/src/main/java/org/folio/dcb/client/feign/CirculationRequestClient.java index e5b8554f..ab4cc7af 100644 --- a/src/main/java/org/folio/dcb/client/feign/CirculationRequestClient.java +++ b/src/main/java/org/folio/dcb/client/feign/CirculationRequestClient.java @@ -8,7 +8,7 @@ @FeignClient(name = "request-storage", configuration = FeignClientConfiguration.class) public interface CirculationRequestClient { - @GetMapping("/requests/{circulationItemId}") - CirculationRequest fetchRequestById(@PathVariable("circulationItemId") String circulationItemId); + @GetMapping("/requests/{requestId}") + CirculationRequest fetchRequestById(@PathVariable("requestId") String requestId); } diff --git a/src/main/java/org/folio/dcb/domain/entity/TransactionEntity.java b/src/main/java/org/folio/dcb/domain/entity/TransactionEntity.java index 71e688b7..d42f75b1 100644 --- a/src/main/java/org/folio/dcb/domain/entity/TransactionEntity.java +++ b/src/main/java/org/folio/dcb/domain/entity/TransactionEntity.java @@ -42,14 +42,12 @@ public class TransactionEntity extends AuditableEntity implements Serializable { private String servicePointId; private String servicePointName; private String materialType; - private String pickupLibraryName; private String pickupLibraryCode; private String lendingLibraryCode; @Convert(converter = UUIDConverter.class) private String patronId; private String patronGroup; private String patronBarcode; - private String borrowingLibraryCode; private UUID requestId; @Enumerated(EnumType.STRING) private StatusEnum status; diff --git a/src/main/java/org/folio/dcb/domain/mapper/TransactionMapper.java b/src/main/java/org/folio/dcb/domain/mapper/TransactionMapper.java index bf4b23b9..d8f0be46 100644 --- a/src/main/java/org/folio/dcb/domain/mapper/TransactionMapper.java +++ b/src/main/java/org/folio/dcb/domain/mapper/TransactionMapper.java @@ -26,11 +26,9 @@ public TransactionEntity mapToEntity(String transactionId, DcbTransaction dcbTra .servicePointId(pickup.getServicePointId()) .servicePointName(pickup.getServicePointName()) .pickupLibraryCode(pickup.getLibraryCode()) - .pickupLibraryName(pickup.getLibraryName()) .patronBarcode(patron.getBarcode()) .patronId(patron.getId()) .patronGroup(patron.getGroup()) - .borrowingLibraryCode(patron.getBorrowingLibraryCode()) .role(dcbTransaction.getRole()) .build(); diff --git a/src/main/java/org/folio/dcb/service/LibraryService.java b/src/main/java/org/folio/dcb/service/LibraryService.java index 07b4c335..391c1e9b 100644 --- a/src/main/java/org/folio/dcb/service/LibraryService.java +++ b/src/main/java/org/folio/dcb/service/LibraryService.java @@ -12,7 +12,7 @@ public interface LibraryService { * @param dcbTransaction - dcbTransaction Entity * @return TransactionStatusResponse */ - TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction, String pickupServicePointId); + TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction); /** * Update transaction status based on transactionEntity diff --git a/src/main/java/org/folio/dcb/service/impl/BorrowingLibraryServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/BorrowingLibraryServiceImpl.java index a08540d5..87e2e85e 100644 --- a/src/main/java/org/folio/dcb/service/impl/BorrowingLibraryServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/BorrowingLibraryServiceImpl.java @@ -3,12 +3,14 @@ import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.folio.dcb.domain.dto.DcbTransaction; +import org.folio.dcb.domain.dto.ServicePointRequest; import org.folio.dcb.domain.dto.TransactionStatus; import org.folio.dcb.domain.dto.TransactionStatusResponse; import org.folio.dcb.domain.entity.TransactionEntity; import org.folio.dcb.repository.TransactionRepository; import org.folio.dcb.service.CirculationService; import org.folio.dcb.service.LibraryService; +import org.folio.dcb.service.ServicePointService; import org.springframework.stereotype.Service; import java.util.UUID; @@ -28,10 +30,11 @@ public class BorrowingLibraryServiceImpl implements LibraryService { private final CirculationService circulationService; private final TransactionRepository transactionRepository; private final BaseLibraryService libraryService; - + private final ServicePointService servicePointService; @Override - public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction, String pickupServicePointId) { - return libraryService.createBorrowingLibraryTransaction(dcbTransactionId, dcbTransaction, pickupServicePointId); + public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction) { + ServicePointRequest pickupServicePoint = servicePointService.createServicePoint(dcbTransaction.getPickup()); + return libraryService.createBorrowingLibraryTransaction(dcbTransactionId, dcbTransaction, pickupServicePoint.getId()); } @Override diff --git a/src/main/java/org/folio/dcb/service/impl/BorrowingPickupLibraryServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/BorrowingPickupLibraryServiceImpl.java index 5f13e543..422e996f 100644 --- a/src/main/java/org/folio/dcb/service/impl/BorrowingPickupLibraryServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/BorrowingPickupLibraryServiceImpl.java @@ -18,8 +18,8 @@ public class BorrowingPickupLibraryServiceImpl implements LibraryService { private final BaseLibraryService baseLibraryService; @Override - public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction, String pickupServicePointId) { - return baseLibraryService.createBorrowingLibraryTransaction(dcbTransactionId, dcbTransaction, pickupServicePointId); + public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction) { + return baseLibraryService.createBorrowingLibraryTransaction(dcbTransactionId, dcbTransaction, dcbTransaction.getPickup().getServicePointId()); } @Override diff --git a/src/main/java/org/folio/dcb/service/impl/LendingLibraryServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/LendingLibraryServiceImpl.java index 86984692..915dbdfa 100644 --- a/src/main/java/org/folio/dcb/service/impl/LendingLibraryServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/LendingLibraryServiceImpl.java @@ -4,6 +4,7 @@ import lombok.extern.log4j.Log4j2; import org.folio.dcb.domain.dto.CirculationRequest; import org.folio.dcb.domain.dto.DcbTransaction; +import org.folio.dcb.domain.dto.ServicePointRequest; import org.folio.dcb.domain.dto.TransactionStatus; import org.folio.dcb.domain.dto.TransactionStatusResponse; import org.folio.dcb.domain.entity.TransactionEntity; @@ -11,6 +12,7 @@ import org.folio.dcb.service.CirculationService; import org.folio.dcb.service.LibraryService; import org.folio.dcb.service.RequestService; +import org.folio.dcb.service.ServicePointService; import org.folio.dcb.service.UserService; import org.springframework.stereotype.Service; @@ -32,8 +34,10 @@ public class LendingLibraryServiceImpl implements LibraryService { private final TransactionRepository transactionRepository; private final CirculationService circulationService; private final BaseLibraryService baseLibraryService; + private final ServicePointService servicePointService; + @Override - public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction, String pickupServicePointId) { + public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction) { log.debug("createTransaction:: creating a new transaction with dcbTransactionId {} , dcbTransaction {}", dcbTransactionId, dcbTransaction); @@ -42,7 +46,8 @@ public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbT var user = userService.fetchOrCreateUser(patron); baseLibraryService.checkUserTypeAndThrowIfMismatch(user.getType()); - CirculationRequest pageRequest = requestService.createPageItemRequest(user, item, pickupServicePointId); + ServicePointRequest pickupServicePoint = servicePointService.createServicePoint(dcbTransaction.getPickup()); + CirculationRequest pageRequest = requestService.createPageItemRequest(user, item, pickupServicePoint.getId()); baseLibraryService.saveDcbTransaction(dcbTransactionId, dcbTransaction, pageRequest.getId()); return TransactionStatusResponse.builder() diff --git a/src/main/java/org/folio/dcb/service/impl/PickupLibraryServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/PickupLibraryServiceImpl.java index 14e4418c..04466ed6 100644 --- a/src/main/java/org/folio/dcb/service/impl/PickupLibraryServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/PickupLibraryServiceImpl.java @@ -24,16 +24,16 @@ public class PickupLibraryServiceImpl implements LibraryService { private final BaseLibraryService baseLibraryService; @Override - public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction, String pickupServicePointId) { + public TransactionStatusResponse createCirculation(String dcbTransactionId, DcbTransaction dcbTransaction) { var itemVirtual = dcbTransaction.getItem(); var patron = dcbTransaction.getPatron(); var user = userService.fetchOrCreateUser(patron); baseLibraryService.checkUserTypeAndThrowIfMismatch(user.getType()); baseLibraryService.checkItemExistsInInventoryAndThrow(itemVirtual.getBarcode()); - circulationItemService.checkIfItemExistsAndCreate(itemVirtual, pickupServicePointId); + circulationItemService.checkIfItemExistsAndCreate(itemVirtual, dcbTransaction.getPickup().getServicePointId()); - CirculationRequest holdRequest = requestService.createHoldItemRequest(user, itemVirtual, pickupServicePointId); + CirculationRequest holdRequest = requestService.createHoldItemRequest(user, itemVirtual, dcbTransaction.getPickup().getServicePointId()); baseLibraryService.saveDcbTransaction(dcbTransactionId, dcbTransaction, holdRequest.getId()); return TransactionStatusResponse.builder() diff --git a/src/main/java/org/folio/dcb/service/impl/ServicePointServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/ServicePointServiceImpl.java index 1972752f..d849fcc2 100644 --- a/src/main/java/org/folio/dcb/service/impl/ServicePointServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/ServicePointServiceImpl.java @@ -24,8 +24,8 @@ public ServicePointRequest createServicePoint(DcbPickup pickupServicePoint) { ServicePointRequest servicePointRequest = createServicePointRequest( pickupServicePoint.getServicePointId(), - getServicePointName(pickupServicePoint.getLibraryName(), pickupServicePoint.getServicePointName()), - getServicePointCode(pickupServicePoint.getLibraryName(), pickupServicePoint.getServicePointName()) + getServicePointName(pickupServicePoint.getLibraryCode(), pickupServicePoint.getServicePointName()), + getServicePointCode(pickupServicePoint.getLibraryCode(), pickupServicePoint.getServicePointName()) ); try{ @@ -52,11 +52,11 @@ private ServicePointRequest createServicePointRequest(String id, String name, St .build(); } - private String getServicePointName(String libraryName, String servicePointName){ - return String.format("DCB_%s_%s", libraryName, servicePointName); + private String getServicePointName(String libraryCode, String servicePointName){ + return String.format("DCB_%s_%s", libraryCode, servicePointName); } - private String getServicePointCode(String libraryName, String servicePointName){ - return String.format("DCB_%s_%s", libraryName, servicePointName).replaceAll("\\s+","").toUpperCase(); + private String getServicePointCode(String libraryCode, String servicePointName){ + return String.format("DCB_%s_%s", libraryCode, servicePointName).replaceAll("\\s+","").toUpperCase(); } } diff --git a/src/main/java/org/folio/dcb/service/impl/TransactionsServiceImpl.java b/src/main/java/org/folio/dcb/service/impl/TransactionsServiceImpl.java index 915cb4cd..8e7c46f0 100644 --- a/src/main/java/org/folio/dcb/service/impl/TransactionsServiceImpl.java +++ b/src/main/java/org/folio/dcb/service/impl/TransactionsServiceImpl.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.folio.dcb.domain.dto.ServicePointRequest; import org.folio.dcb.domain.dto.DcbTransaction; import org.folio.dcb.domain.dto.TransactionStatus; import org.folio.dcb.domain.dto.TransactionStatusResponse; @@ -10,7 +9,6 @@ import org.folio.dcb.exception.ResourceAlreadyExistException; import org.folio.dcb.repository.TransactionRepository; import org.folio.dcb.service.LibraryService; -import org.folio.dcb.service.ServicePointService; import org.folio.dcb.service.TransactionsService; import org.folio.spring.exception.NotFoundException; import org.springframework.beans.factory.annotation.Qualifier; @@ -30,19 +28,17 @@ public class TransactionsServiceImpl implements TransactionsService { @Qualifier("borrowingLibraryService") private final LibraryService borrowingLibraryService; private final TransactionRepository transactionRepository; - private final ServicePointService servicePointService; @Override public TransactionStatusResponse createCirculationRequest(String dcbTransactionId, DcbTransaction dcbTransaction) { log.debug("createCirculationRequest:: creating new transaction request for role {} ", dcbTransaction.getRole()); checkTransactionExistsAndThrow(dcbTransactionId); - ServicePointRequest pickupServicePoint = servicePointService.createServicePoint(dcbTransaction.getPickup()); return switch (dcbTransaction.getRole()) { - case LENDER -> lendingLibraryService.createCirculation(dcbTransactionId, dcbTransaction, pickupServicePoint.getId()); - case BORROWING_PICKUP -> borrowingPickupLibraryService.createCirculation(dcbTransactionId, dcbTransaction, pickupServicePoint.getId()); - case PICKUP -> pickupLibraryService.createCirculation(dcbTransactionId, dcbTransaction, pickupServicePoint.getId()); - case BORROWER -> borrowingLibraryService.createCirculation(dcbTransactionId, dcbTransaction, pickupServicePoint.getId()); + case LENDER -> lendingLibraryService.createCirculation(dcbTransactionId, dcbTransaction); + case BORROWING_PICKUP -> borrowingPickupLibraryService.createCirculation(dcbTransactionId, dcbTransaction); + case PICKUP -> pickupLibraryService.createCirculation(dcbTransactionId, dcbTransaction); + case BORROWER -> borrowingLibraryService.createCirculation(dcbTransactionId, dcbTransaction); }; } diff --git a/src/main/resources/db/changelog/changelog-master.xml b/src/main/resources/db/changelog/changelog-master.xml index 26ffbe85..1b6f6abc 100644 --- a/src/main/resources/db/changelog/changelog-master.xml +++ b/src/main/resources/db/changelog/changelog-master.xml @@ -7,4 +7,6 @@ + + diff --git a/src/main/resources/db/changelog/changes/create-transaction-table.xml b/src/main/resources/db/changelog/changes/create-transaction-table.xml index 0919ce79..16301393 100644 --- a/src/main/resources/db/changelog/changes/create-transaction-table.xml +++ b/src/main/resources/db/changelog/changes/create-transaction-table.xml @@ -7,8 +7,8 @@ + CREATE TYPE StatusEnum as ENUM ('CREATED', 'OPEN', 'AWAITING_PICKUP', 'ITEM_CHECKED_OUT', 'ITEM_CHECKED_IN', 'CLOSED'); + ]]> @@ -16,8 +16,8 @@ + CREATE CAST (character varying as StatusEnum) WITH INOUT AS IMPLICIT; + ]]> @@ -25,8 +25,8 @@ + CREATE TYPE RoleEnum as ENUM ('BORROWER', 'LENDER', 'PICKUP', 'BORROWING_PICKUP'); + ]]> @@ -34,8 +34,8 @@ + CREATE CAST (character varying as RoleEnum) WITH INOUT AS IMPLICIT; + ]]> diff --git a/src/main/resources/db/changelog/changes/set-optional-fields-nullable.xml b/src/main/resources/db/changelog/changes/set-optional-fields-nullable.xml new file mode 100644 index 00000000..2cdc6a0d --- /dev/null +++ b/src/main/resources/db/changelog/changes/set-optional-fields-nullable.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/swagger.api/schemas/dcbPatron.yaml b/src/main/resources/swagger.api/schemas/dcbPatron.yaml index 42d36067..64e9bbbf 100644 --- a/src/main/resources/swagger.api/schemas/dcbPatron.yaml +++ b/src/main/resources/swagger.api/schemas/dcbPatron.yaml @@ -11,6 +11,3 @@ DcbPatron: barcode: description: The barcode of the patron type: string - borrowingLibraryCode: - description: The code which identifies the borrowing library - type: string diff --git a/src/main/resources/swagger.api/schemas/dcbPickup.yaml b/src/main/resources/swagger.api/schemas/dcbPickup.yaml index 8180e883..13fa3d2f 100644 --- a/src/main/resources/swagger.api/schemas/dcbPickup.yaml +++ b/src/main/resources/swagger.api/schemas/dcbPickup.yaml @@ -2,9 +2,6 @@ DcbPickup: description: Pickup Location metadata required for the pickup service point type: object properties: - libraryName: - description: The name of the pickup library - type: string libraryCode: description: The code which identifies the pickup library type: string diff --git a/src/test/java/org/folio/dcb/service/BorrowingLibraryServiceTest.java b/src/test/java/org/folio/dcb/service/BorrowingLibraryServiceTest.java index 2b48e18a..ae4ca6c5 100644 --- a/src/test/java/org/folio/dcb/service/BorrowingLibraryServiceTest.java +++ b/src/test/java/org/folio/dcb/service/BorrowingLibraryServiceTest.java @@ -20,12 +20,15 @@ import static org.folio.dcb.domain.dto.TransactionStatus.StatusEnum.OPEN; import static org.folio.dcb.utils.EntityUtils.DCB_TRANSACTION_ID; import static org.folio.dcb.utils.EntityUtils.PICKUP_SERVICE_POINT_ID; +import static org.folio.dcb.utils.EntityUtils.createDcbPickup; import static org.folio.dcb.utils.EntityUtils.createDcbTransactionByRole; +import static org.folio.dcb.utils.EntityUtils.createServicePointRequest; import static org.folio.dcb.utils.EntityUtils.createTransactionEntity; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @@ -39,6 +42,10 @@ class BorrowingLibraryServiceTest { @Mock private BaseLibraryService baseLibraryService; + @Mock + private ServicePointService servicePointService; + + @Test void testTransactionStatusUpdateFromOpenToAwaitingPickup() { var transactionEntity = createTransactionEntity(); @@ -72,7 +79,8 @@ void testTransactionStatusUpdateWithIncorrectStatus() { @Test void createTransactionTest() { - borrowingLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(BORROWER), PICKUP_SERVICE_POINT_ID); + when(servicePointService.createServicePoint(createDcbPickup())).thenReturn(createServicePointRequest()); + borrowingLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(BORROWER)); verify(baseLibraryService).createBorrowingLibraryTransaction(DCB_TRANSACTION_ID, createDcbTransactionByRole(BORROWER), PICKUP_SERVICE_POINT_ID); } diff --git a/src/test/java/org/folio/dcb/service/LendingLibraryServiceTest.java b/src/test/java/org/folio/dcb/service/LendingLibraryServiceTest.java index 7b5dbcc2..de6ee2df 100644 --- a/src/test/java/org/folio/dcb/service/LendingLibraryServiceTest.java +++ b/src/test/java/org/folio/dcb/service/LendingLibraryServiceTest.java @@ -23,8 +23,10 @@ import static org.folio.dcb.utils.EntityUtils.PICKUP_SERVICE_POINT_ID; import static org.folio.dcb.utils.EntityUtils.createCirculationRequest; import static org.folio.dcb.utils.EntityUtils.createDcbItem; +import static org.folio.dcb.utils.EntityUtils.createDcbPickup; import static org.folio.dcb.utils.EntityUtils.createDefaultDcbPatron; import static org.folio.dcb.utils.EntityUtils.createDcbTransactionByRole; +import static org.folio.dcb.utils.EntityUtils.createServicePointRequest; import static org.folio.dcb.utils.EntityUtils.createTransactionEntity; import static org.folio.dcb.utils.EntityUtils.createTransactionStatus; import static org.folio.dcb.utils.EntityUtils.createUser; @@ -53,6 +55,8 @@ class LendingLibraryServiceTest { private CirculationServiceImpl circulationService; @Mock private BaseLibraryService baseLibraryService; + @Mock + private ServicePointService servicePointService; @Test void createTransactionTest() { @@ -62,10 +66,11 @@ void createTransactionTest() { when(userService.fetchOrCreateUser(any())) .thenReturn(user); + when(servicePointService.createServicePoint(createDcbPickup())).thenReturn(createServicePointRequest()); when(requestService.createPageItemRequest(any(), any(), anyString())).thenReturn(createCirculationRequest()); doNothing().when(baseLibraryService).saveDcbTransaction(any(), any(), any()); - var response = lendingLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER), PICKUP_SERVICE_POINT_ID); + var response = lendingLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER)); verify(userService).fetchOrCreateUser(patron); verify(requestService).createPageItemRequest(user, item, PICKUP_SERVICE_POINT_ID); verify(baseLibraryService).saveDcbTransaction(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER), CIRCULATION_REQUEST_ID); diff --git a/src/test/java/org/folio/dcb/service/PickupLibraryServiceTest.java b/src/test/java/org/folio/dcb/service/PickupLibraryServiceTest.java index ac81c371..ccc7830e 100644 --- a/src/test/java/org/folio/dcb/service/PickupLibraryServiceTest.java +++ b/src/test/java/org/folio/dcb/service/PickupLibraryServiceTest.java @@ -52,7 +52,7 @@ void createTransactionTest() { doNothing().when(circulationItemService).checkIfItemExistsAndCreate(any(), any()); doNothing().when(baseLibraryService).saveDcbTransaction(any(), any(), any()); - var response = pickupLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(PICKUP), PICKUP_SERVICE_POINT_ID); + var response = pickupLibraryService.createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(PICKUP)); verify(userService).fetchOrCreateUser(patron); verify(circulationItemService).checkIfItemExistsAndCreate(item, PICKUP_SERVICE_POINT_ID); verify(requestService).createHoldItemRequest(user, item, PICKUP_SERVICE_POINT_ID); diff --git a/src/test/java/org/folio/dcb/service/TransactionServiceTest.java b/src/test/java/org/folio/dcb/service/TransactionServiceTest.java index 31edca2d..87fe9b0f 100644 --- a/src/test/java/org/folio/dcb/service/TransactionServiceTest.java +++ b/src/test/java/org/folio/dcb/service/TransactionServiceTest.java @@ -20,10 +20,7 @@ import static org.folio.dcb.domain.dto.DcbTransaction.RoleEnum.LENDER; import static org.folio.dcb.utils.EntityUtils.DCB_TRANSACTION_ID; -import static org.folio.dcb.utils.EntityUtils.PICKUP_SERVICE_POINT_ID; -import static org.folio.dcb.utils.EntityUtils.createDcbPickup; import static org.folio.dcb.utils.EntityUtils.createDcbTransactionByRole; -import static org.folio.dcb.utils.EntityUtils.createServicePointRequest; import static org.folio.dcb.utils.EntityUtils.createTransactionResponse; import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,17 +38,13 @@ class TransactionServiceTest { private LendingLibraryServiceImpl lendingLibraryService; @Mock private TransactionRepository transactionRepository; - @Mock - private ServicePointService servicePointService; @Test void createLendingCirculationRequestTest() { - when(servicePointService.createServicePoint(createDcbPickup())).thenReturn(createServicePointRequest()); - - when(lendingLibraryService.createCirculation(any(), any(), any())) + when(lendingLibraryService.createCirculation(any(), any())) .thenReturn(createTransactionResponse()); transactionsService.createCirculationRequest(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER)); - verify(lendingLibraryService).createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER), PICKUP_SERVICE_POINT_ID); + verify(lendingLibraryService).createCirculation(DCB_TRANSACTION_ID, createDcbTransactionByRole(LENDER)); } @Test diff --git a/src/test/java/org/folio/dcb/utils/EntityUtils.java b/src/test/java/org/folio/dcb/utils/EntityUtils.java index 0c4ac366..a106ef48 100644 --- a/src/test/java/org/folio/dcb/utils/EntityUtils.java +++ b/src/test/java/org/folio/dcb/utils/EntityUtils.java @@ -73,9 +73,9 @@ public static DcbTransaction createDcbTransactionByRole(DcbTransaction.RoleEnum public static org.folio.dcb.domain.dto.ServicePointRequest createServicePointRequest() { return org.folio.dcb.domain.dto.ServicePointRequest.builder() .id(PICKUP_SERVICE_POINT_ID) - .name("DCB_TestLibraryName_TestServicePointCode") - .code("DCB_TESTLIBRARYNAME_TESTSERVICEPOINTCODE") - .discoveryDisplayName("DCB_TestLibraryName_TestServicePointCode") + .name("DCB_TestLibraryCode_TestServicePointCode") + .code("DCB_TESTLIBRARYCODE_TESTSERVICEPOINTCODE") + .discoveryDisplayName("DCB_TestLibraryCode_TestServicePointCode") .pickupLocation(true) .holdShelfExpiryPeriod(org.folio.dcb.domain.dto.HoldShelfExpiryPeriod.builder().duration(3).intervalId(org.folio.dcb.domain.dto.HoldShelfExpiryPeriod.IntervalIdEnum.DAYS).build()) .holdShelfClosedLibraryDateManagement(HOLD_SHELF_CLOSED_LIBRARY_DATE_MANAGEMENT) @@ -113,7 +113,6 @@ public static DcbPatron createDcbPatronWithExactPatronId(String patronId) { .id(patronId) .barcode("DCB_PATRON") .group("staff") - .borrowingLibraryCode("E") .build(); } public static DcbPatron createDefaultDcbPatron() { @@ -125,7 +124,6 @@ public static org.folio.dcb.domain.dto.DcbPickup createDcbPickup() { .servicePointId(PICKUP_SERVICE_POINT_ID) .servicePointName("TestServicePointCode") .libraryCode("TestLibraryCode") - .libraryName("TestLibraryName") .build(); } @@ -164,10 +162,8 @@ public static TransactionEntity createTransactionEntity() { .servicePointId(PICKUP_SERVICE_POINT_ID) .servicePointName("TestServicePointCode") .pickupLibraryCode("TestLibraryCode") - .pickupLibraryName("TestLibraryName") .materialType("book") .lendingLibraryCode("LEN") - .borrowingLibraryCode("BOR") .requestId(UUID.fromString(CIRCULATION_REQUEST_ID)) .build(); }