From 631d8399b0c7f4e4fad2fa2225b0244a0dde1c5d Mon Sep 17 00:00:00 2001 From: BKadirkhodjaev Date: Wed, 18 Dec 2024 17:49:33 +0500 Subject: [PATCH] [MODORDERS-1209-2]. Update Send Claims and Piece Batch Update models with new properties --- ramls/acq-models | 2 +- .../pieces/PieceBatchStatusUpdateHolder.java | 6 +++++ .../java/org/folio/rest/impl/PiecesAPI.java | 5 +++- .../org/folio/service/pieces/PieceUtil.java | 13 ++++++++++ .../service/pieces/PiecesClaimingService.java | 21 ++++++++-------- .../flows/update/PieceUpdateFlowManager.java | 7 +++--- .../rest/impl/PiecesClaimingApiTest.java | 2 ++ .../pieces/PiecesClaimingServiceTest.java | 24 +++++++++---------- .../update/PieceUpdateFlowManagerTest.java | 2 +- .../send-claims-1-piece-1-vendor-1-job.json | 5 +++- 10 files changed, 58 insertions(+), 29 deletions(-) diff --git a/ramls/acq-models b/ramls/acq-models index c0c72775d..a8f2fef0b 160000 --- a/ramls/acq-models +++ b/ramls/acq-models @@ -1 +1 @@ -Subproject commit c0c72775d08c28a77d1475df435497e8b0020667 +Subproject commit a8f2fef0b41fbe99f917a39857821b93c417b1a9 diff --git a/src/main/java/org/folio/models/pieces/PieceBatchStatusUpdateHolder.java b/src/main/java/org/folio/models/pieces/PieceBatchStatusUpdateHolder.java index b65c1663f..23570a86d 100644 --- a/src/main/java/org/folio/models/pieces/PieceBatchStatusUpdateHolder.java +++ b/src/main/java/org/folio/models/pieces/PieceBatchStatusUpdateHolder.java @@ -12,6 +12,12 @@ public class PieceBatchStatusUpdateHolder extends BasePieceFlowHolder { @Getter private Piece.ReceivingStatus receivingStatus; @Getter + private Integer claimingInterval; + @Getter + private String internalNote; + @Getter + private String externalNote; + @Getter private List pieces; private String poLineId; diff --git a/src/main/java/org/folio/rest/impl/PiecesAPI.java b/src/main/java/org/folio/rest/impl/PiecesAPI.java index d79527686..91a9028fe 100644 --- a/src/main/java/org/folio/rest/impl/PiecesAPI.java +++ b/src/main/java/org/folio/rest/impl/PiecesAPI.java @@ -114,7 +114,10 @@ public void getOrdersPiecesRequests(List pieceIds, String status, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { - pieceUpdateFlowManager.updatePiecesStatuses(pieceBatchStatusCollection.getPieceIds(), pieceBatchStatusCollection.getReceivingStatus(), new RequestContext(vertxContext, okapiHeaders)) + var pieceIds = pieceBatchStatusCollection.getPieceIds(); + var receivingStatus = pieceBatchStatusCollection.getReceivingStatus(); + var claimingInterval = pieceBatchStatusCollection.getClaimingInterval(); + pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, receivingStatus, claimingInterval, null, null, new RequestContext(vertxContext, okapiHeaders)) .onSuccess(v -> asyncResultHandler.handle(succeededFuture(buildNoContentResponse()))) .onFailure(t -> handleErrorResponse(asyncResultHandler, t)); } diff --git a/src/main/java/org/folio/service/pieces/PieceUtil.java b/src/main/java/org/folio/service/pieces/PieceUtil.java index e97d67103..5ab3fe20f 100644 --- a/src/main/java/org/folio/service/pieces/PieceUtil.java +++ b/src/main/java/org/folio/service/pieces/PieceUtil.java @@ -10,6 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; +import org.folio.models.pieces.PieceBatchStatusUpdateHolder; import org.folio.orders.utils.PoLineCommonUtil; import org.folio.rest.jaxrs.model.CompositePoLine; import org.folio.rest.jaxrs.model.Eresource; @@ -82,4 +83,16 @@ public static boolean updatePieceStatus(Piece piece, Piece.ReceivingStatus oldSt return isStatusChanged; } + public static boolean updatePieceStatus(Piece piece, PieceBatchStatusUpdateHolder holder) { + var isStatusChanged = !piece.getReceivingStatus().equals(holder.getReceivingStatus()); + if (isStatusChanged) { + piece.setStatusUpdatedDate(new Date()); + } + piece.setReceivingStatus(holder.getReceivingStatus()); + piece.setClaimingInterval(holder.getClaimingInterval()); + piece.setInternalNote(holder.getInternalNote()); + piece.setExternalNote(holder.getExternalNote()); + return isStatusChanged; + } + } diff --git a/src/main/java/org/folio/service/pieces/PiecesClaimingService.java b/src/main/java/org/folio/service/pieces/PiecesClaimingService.java index a2fdcf561..46771689b 100644 --- a/src/main/java/org/folio/service/pieces/PiecesClaimingService.java +++ b/src/main/java/org/folio/service/pieces/PiecesClaimingService.java @@ -90,7 +90,7 @@ public Future sendClaims(ClaimingCollection claimingCollection, return Future.succeededFuture(createEmptyClaimingResults(CANNOT_FIND_PIECES_WITH_LATE_STATUS_TO_PROCESS.getValue())); } log.info("sendClaims:: Using pieces by vendor id map, map: {}", pieceIdsByVendorIds); - return createJobsByVendor(config, pieceIdsByVendorIds, requestContext); + return createJobsByVendor(claimingCollection, config, pieceIdsByVendorIds, requestContext); }); }) .onFailure(t -> log.error("sendClaims:: Failed send claims: {}", JsonObject.mapFrom(claimingCollection).encodePrettily(), t)); @@ -151,15 +151,15 @@ private static Map> transformAndGroupPieceIdsByVendorId(Lis .groupingBy(Pair::getKey, mapping(Pair::getValue, toList())); } - private Future createJobsByVendor(JsonObject config, Map> pieceIdsByVendorId, - RequestContext requestContext) { + private Future createJobsByVendor(ClaimingCollection claimingCollection, JsonObject config, + Map> pieceIdsByVendorId, RequestContext requestContext) { log.info("createJobsByVendor:: Creating jobs by vendor, vendors by pieces count: {}", pieceIdsByVendorId.size()); if (CollectionUtils.isEmpty(pieceIdsByVendorId)) { log.info("createJobsByVendor:: No jobs are created, pieceIdsByVendorId is empty"); return Future.succeededFuture(new ClaimingResults() .withClaimingPieceResults(createErrorClaimingResults(pieceIdsByVendorId, CANNOT_GROUP_PIECES_BY_VENDOR_MESSAGE.getValue()))); } - return collectResultsOnSuccess(createUpdatePiecesAndJobFutures(config, pieceIdsByVendorId, requestContext)) + return collectResultsOnSuccess(createUpdatePiecesAndJobFutures(claimingCollection, config, pieceIdsByVendorId, requestContext)) .map(updatedPieceLists -> { if (CollectionUtils.isEmpty(updatedPieceLists)) { log.info("createJobsByVendor:: No pieces were processed for claiming"); @@ -173,8 +173,8 @@ private Future createJobsByVendor(JsonObject config, Map>> createUpdatePiecesAndJobFutures(JsonObject config, Map> pieceIdsByVendorId, - RequestContext requestContext) { + private List>> createUpdatePiecesAndJobFutures(ClaimingCollection claimingCollection, JsonObject config, + Map> pieceIdsByVendorId, RequestContext requestContext) { var updatePiecesAndJobFutures = new ArrayList>>(); pieceIdsByVendorId.forEach((vendorId, pieceIds) -> config.stream() .filter(pieceIdsByVendorIdEntry -> isExportTypeClaimsAndCorrectVendorId(vendorId, pieceIdsByVendorIdEntry) @@ -182,7 +182,7 @@ private List>> createUpdatePiecesAndJobFutures(JsonObject co .forEach(pieceIdsByVendorIdEntry -> { log.info("createJobsByVendor:: Preparing job integration detail for vendor, vendor id: {}, pieces: {}, job key: {}", vendorId, pieceIds.size(), pieceIdsByVendorIdEntry.getKey()); - updatePiecesAndJobFutures.add(updatePiecesAndCreateJob(pieceIds, pieceIdsByVendorIdEntry, requestContext)); + updatePiecesAndJobFutures.add(updatePiecesAndCreateJob(claimingCollection, pieceIds, pieceIdsByVendorIdEntry, requestContext)); })); return updatePiecesAndJobFutures; } @@ -208,10 +208,11 @@ private static boolean isExportTypeClaimsAndCorrectVendorId(String vendorId, Map return pieceIdsByVendorIdEntry.getKey().startsWith(String.format("%s_%s", EXPORT_TYPE_CLAIMS, vendorId)); } - private Future> updatePiecesAndCreateJob(List pieceIds, Map.Entry pieceIdsByVendorIdEntry, - RequestContext requestContext) { + private Future> updatePiecesAndCreateJob(ClaimingCollection claimingCollection, List pieceIds, + Map.Entry pieceIdsByVendorIdEntry, RequestContext requestContext) { log.info("updatePiecesAndCreateJob:: Updating pieces and creating a job, job key: {}, count: {}", pieceIdsByVendorIdEntry.getKey(), pieceIds.size()); - return pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, PieceBatchStatusCollection.ReceivingStatus.CLAIM_SENT, requestContext) + return pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, PieceBatchStatusCollection.ReceivingStatus.CLAIM_SENT, + claimingCollection.getClaimingInterval(), claimingCollection.getInternalNote(), claimingCollection.getExternalNote(), requestContext) .compose(v -> createJob(pieceIdsByVendorIdEntry.getKey(), pieceIdsByVendorIdEntry.getValue(), pieceIds, requestContext).map(pieceIds)); } diff --git a/src/main/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManager.java b/src/main/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManager.java index 5eed324f9..ec1298fc2 100644 --- a/src/main/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManager.java +++ b/src/main/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManager.java @@ -97,14 +97,15 @@ public Future updatePiece(Piece pieceToUpdate, boolean createItem, boolean .mapEmpty(); } - public Future updatePiecesStatuses(List pieceIds, PieceBatchStatusCollection.ReceivingStatus receivingStatus, RequestContext requestContext) { + public Future updatePiecesStatuses(List pieceIds, PieceBatchStatusCollection.ReceivingStatus receivingStatus, + Integer claimingInterval, String internalNote, String externalNote, RequestContext requestContext) { var newStatus = Piece.ReceivingStatus.fromValue(receivingStatus.value()); return isOperationRestricted(pieceIds, requestContext) .compose(v -> pieceStorageService.getPiecesByIds(pieceIds, requestContext)) .compose(pieces -> validateFetchedPiecesQuantity(pieces, pieceIds)) .map(pieces -> pieces.stream().collect(Collectors.groupingBy(Piece::getPoLineId))) .map(piecesByPoLineId -> piecesByPoLineId.entrySet().stream() - .map(entry -> new PieceBatchStatusUpdateHolder(newStatus, entry.getValue(), entry.getKey())) + .map(entry -> new PieceBatchStatusUpdateHolder(newStatus, claimingInterval, internalNote, externalNote, entry.getValue(), entry.getKey())) .map(holder -> basePieceFlowHolderBuilder.updateHolderWithOrderInformation(holder, requestContext) .compose(v -> updatePoLine(holder, requestContext)) .compose(v -> updatePiecesStatusesByPoLine(holder, requestContext))) @@ -171,7 +172,7 @@ private Future> validateFetchedPiecesQuantity(List pieces, Li private Future updatePiecesStatusesByPoLine(PieceBatchStatusUpdateHolder holder, RequestContext requestContext) { var isAnyPiecesUpdated = holder.getPieces().stream() - .map(piece -> updatePieceStatus(piece, piece.getReceivingStatus(), holder.getReceivingStatus())) + .map(piece -> updatePieceStatus(piece, holder)) .reduce(Boolean.FALSE, Boolean::logicalOr); // Don't replace .map() with .anyMatch(), as it needs to iterate over all elements if (!Boolean.TRUE.equals(isAnyPiecesUpdated)) { return Future.succeededFuture(); diff --git a/src/test/java/org/folio/rest/impl/PiecesClaimingApiTest.java b/src/test/java/org/folio/rest/impl/PiecesClaimingApiTest.java index c72ef5d9b..89bec2300 100644 --- a/src/test/java/org/folio/rest/impl/PiecesClaimingApiTest.java +++ b/src/test/java/org/folio/rest/impl/PiecesClaimingApiTest.java @@ -204,6 +204,8 @@ void testPostPiecesClaim(String name, int vendorIdx, int poLineIdx, int pieceIdx assertThat(jobCreations, hasSize(dto.jobCreations)); assertThat(jobExecutions, hasSize(dto.jobExecutions)); assertThat(response.getClaimingPieceResults().size(), equalTo(dto.claimingResults)); + pieceUpdates.forEach(pieceUpdate -> logger.info("Updated piece: {}", pieceUpdate.encodePrettily())); + var claimedPieceIds = jobCreations.stream() .peek(job -> logger.info("Created job: {}", JsonObject.mapFrom(job).encodePrettily())) .map(job -> job.getJsonObject(EXPORT_TYPE_SPECIFIC_PARAMETERS.getValue()) diff --git a/src/test/java/org/folio/service/pieces/PiecesClaimingServiceTest.java b/src/test/java/org/folio/service/pieces/PiecesClaimingServiceTest.java index d74651a3c..81475bbd3 100644 --- a/src/test/java/org/folio/service/pieces/PiecesClaimingServiceTest.java +++ b/src/test/java/org/folio/service/pieces/PiecesClaimingServiceTest.java @@ -82,7 +82,7 @@ void testSendClaims_emptyClaimingPieceIds(VertxTestContext testContext) { @Test void testSendClaims_noConfigEntries(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject())); @@ -97,7 +97,7 @@ void testSendClaims_noConfigEntries(VertxTestContext testContext) { @Test void testSendClaims_noPiecesFound(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("key", "value"))); @@ -113,7 +113,7 @@ void testSendClaims_noPiecesFound(VertxTestContext testContext) { @Test void testSendClaims_pieceStatusNotLate(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("CLAIMS_vendorId", createIntegrationDetail()))); @@ -121,7 +121,7 @@ void testSendClaims_pieceStatusNotLate(VertxTestContext testContext) { when(purchaseOrderLineService.getOrderLineById(any(), any())).thenReturn(Future.succeededFuture(new PoLine().withPurchaseOrderId("orderId1"))); when(purchaseOrderStorageService.getPurchaseOrderById(any(), any())).thenReturn(Future.succeededFuture(new PurchaseOrder().withVendor("vendorId"))); when(organizationService.getVendorById(any(), any())).thenReturn(Future.succeededFuture(new Organization().withId("vendorId").withIsVendor(true))); - when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any())).thenReturn(Future.succeededFuture()); + when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any(), any(), any(), any())).thenReturn(Future.succeededFuture()); when(restClient.post(eq(resourcesPath(DATA_EXPORT_SPRING_CREATE_JOB)), any(), any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("status", "CREATED"))); when(restClient.postEmptyResponse(any(), any(), any())).thenReturn(Future.succeededFuture()); @@ -135,7 +135,7 @@ void testSendClaims_pieceStatusNotLate(VertxTestContext testContext) { @Test void testSendClaims_success(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("CLAIMS_vendorId", createIntegrationDetail()))); @@ -143,7 +143,7 @@ void testSendClaims_success(VertxTestContext testContext) { when(purchaseOrderLineService.getOrderLineById(any(), any())).thenReturn(Future.succeededFuture(new PoLine().withPurchaseOrderId("orderId1"))); when(purchaseOrderStorageService.getPurchaseOrderById(any(), any())).thenReturn(Future.succeededFuture(new PurchaseOrder().withVendor("vendorId"))); when(organizationService.getVendorById(any(), any())).thenReturn(Future.succeededFuture(new Organization().withId("vendorId").withIsVendor(true))); - when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any())).thenReturn(Future.succeededFuture()); + when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any(), any(), any(), any())).thenReturn(Future.succeededFuture()); when(restClient.post(eq(resourcesPath(DATA_EXPORT_SPRING_CREATE_JOB)), any(), any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("status", "CREATED"))); when(restClient.postEmptyResponse(any(), any(), any())).thenReturn(Future.succeededFuture()); @@ -158,7 +158,7 @@ void testSendClaims_success(VertxTestContext testContext) { @Test void testSendClaims_successWithTwoPieces(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("CLAIMS_vendorId", createIntegrationDetail()))); @@ -169,7 +169,7 @@ void testSendClaims_successWithTwoPieces(VertxTestContext testContext) { when(purchaseOrderLineService.getOrderLineById(any(), any())).thenReturn(Future.succeededFuture(new PoLine().withPurchaseOrderId("orderId1"))); when(purchaseOrderStorageService.getPurchaseOrderById(any(), any())).thenReturn(Future.succeededFuture(new PurchaseOrder().withVendor("vendorId"))); when(organizationService.getVendorById(any(), any())).thenReturn(Future.succeededFuture(new Organization().withId("vendorId").withIsVendor(true))); - when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any())).thenReturn(Future.succeededFuture()); + when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any(), any(), any(), any())).thenReturn(Future.succeededFuture()); when(restClient.post(eq(resourcesPath(DATA_EXPORT_SPRING_CREATE_JOB)), any(), any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("status", "CREATED"))); when(restClient.postEmptyResponse(any(), any(), any())).thenReturn(Future.succeededFuture()); @@ -186,7 +186,7 @@ void testSendClaims_successWithTwoPieces(VertxTestContext testContext) { @Test void testSendClaims_successWithMultipleOrganizations(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2", "pieceId3", "pieceId4", "pieceId5")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2", "pieceId3", "pieceId4", "pieceId5")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject() @@ -216,7 +216,7 @@ void testSendClaims_successWithMultipleOrganizations(VertxTestContext testContex return Future.succeededFuture(new Organization().withId(vendorId).withIsVendor(true)); }); - when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any())).thenReturn(Future.succeededFuture()); + when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any(), any(), any(), any())).thenReturn(Future.succeededFuture()); when(restClient.post(eq(resourcesPath(DATA_EXPORT_SPRING_CREATE_JOB)), any(), any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("status", "CREATED"))); when(restClient.postEmptyResponse(any(), any(), any())).thenReturn(Future.succeededFuture()); @@ -241,7 +241,7 @@ void testSendClaims_successWithMultipleOrganizations(VertxTestContext testContex @Test void testSendClaims_successWithMultipleOrganizationsAndOneIntegrationDetail(VertxTestContext testContext) { - var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2", "pieceId3", "pieceId4", "pieceId5")); + var claimingCollection = new ClaimingCollection().withClaimingPieceIds(List.of("pieceId1", "pieceId2", "pieceId3", "pieceId4", "pieceId5")).withClaimingInterval(1); var requestContext = mock(RequestContext.class); when(configurationEntriesCache.loadConfiguration(any(), any())).thenReturn(Future.succeededFuture(new JsonObject() @@ -270,7 +270,7 @@ void testSendClaims_successWithMultipleOrganizationsAndOneIntegrationDetail(Vert return Future.succeededFuture(new Organization().withId(vendorId).withIsVendor(true)); }); - when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any())).thenReturn(Future.succeededFuture()); + when(pieceUpdateFlowManager.updatePiecesStatuses(any(), any(), any(), any(), any(), any())).thenReturn(Future.succeededFuture()); when(restClient.post(eq(resourcesPath(DATA_EXPORT_SPRING_CREATE_JOB)), any(), any(), any())).thenReturn(Future.succeededFuture(new JsonObject().put("status", "CREATED"))); when(restClient.postEmptyResponse(any(), any(), any())).thenReturn(Future.succeededFuture()); diff --git a/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManagerTest.java b/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManagerTest.java index 1fbb37eeb..96331a062 100644 --- a/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManagerTest.java +++ b/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManagerTest.java @@ -350,7 +350,7 @@ void shouldUpdatePiecesStatusesSuccessfully() { doReturn(succeededFuture()).when(pieceStorageService).updatePiece(any(), eq(requestContext)); doNothing().when(pieceService).receiptConsistencyPiecePoLine(anyString(), eq(requestContext)); - Future result = pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, receivingStatus, requestContext); + Future result = pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, receivingStatus, null, null, null, requestContext); assertTrue(result.succeeded()); } diff --git a/src/test/resources/mockdata/claiming/send-claims-1-piece-1-vendor-1-job.json b/src/test/resources/mockdata/claiming/send-claims-1-piece-1-vendor-1-job.json index 090aad6b5..a9685606a 100644 --- a/src/test/resources/mockdata/claiming/send-claims-1-piece-1-vendor-1-job.json +++ b/src/test/resources/mockdata/claiming/send-claims-1-piece-1-vendor-1-job.json @@ -1,5 +1,8 @@ { "claimingPieceIds": [ "dcd0ba36-b660-4751-b9fe-c8ac61ff6f99" - ] + ], + "claimingInterval": 1, + "internalNote": "internal", + "externalNote": "external" }