Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MODORDSTOR-435] Use batch piece update endpoint for batch status update #1072

Merged
merged 7 commits into from
Dec 23, 2024
Merged

[MODORDSTOR-435] Use batch piece update endpoint for batch status update #1072

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5583b9
[MODORDSTOR-435] Use batch piece update endpoint for batch status update
Saba-Zedginidze-EPAM Dec 19, 2024
91e4e32
[MODORDSTOR-435] Update unit tests
Saba-Zedginidze-EPAM Dec 19, 2024
6b11cc9
Merge branch 'master' into MODORDSTOR-435
azizbekxm Dec 23, 2024
6d14329
[MODORDERS-1224] - Invoice encumbrance link not removed because of ac…
azizbekxm Dec 23, 2024
0aa9582
[MODORDERS-1224] - Invoice encumbrance link not removed because of ac…
azizbekxm Dec 23, 2024
b85683e
Fix test
azizbekxm Dec 23, 2024
2a7a6bd
Fix module descriptor
azizbekxm Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ramls/acq-models
Open in desktop
Submodule acq-models updated 8 files
+0 −25 mod-finance/examples/fy_finance_data.sample
+0 −2 mod-finance/examples/fy_finance_data_collection_get.sample
+63 −0 mod-finance/examples/fy_finance_data_collection_put.sample
+11 −2 mod-finance/schemas/fy_finance_data.json
+4 −1 mod-orders/examples/claimingCollection.sample
+2 −1 mod-orders/examples/pieceStatusBatchCollection.sample
+14 −1 mod-orders/schemas/claimingCollection.json
+4 −0 mod-orders/schemas/pieceStatusBatchCollection.json
2 changes: 2 additions & 0 deletions src/main/java/org/folio/orders/utils/ResourcePathResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private ResourcePathResolver() {
public static final String REPORTING_CODES = "reportingCodes";
public static final String PURCHASE_ORDER_STORAGE = "purchaseOrder";
public static final String PIECES_STORAGE = "pieces";
public static final String PIECES_STORAGE_BATCH = "pieces-batch";
public static final String ORGANIZATION_STORAGE = "organizations";
public static final String RECEIVING_HISTORY = "receiving-history";
public static final String RECEIPT_STATUS = "receiptStatus";
Expand Down Expand Up @@ -79,6 +80,7 @@ private ResourcePathResolver() {
apis.put(PO_NUMBER, "/orders-storage/po-number");
apis.put(PURCHASE_ORDER_STORAGE, "/orders-storage/purchase-orders");
apis.put(PIECES_STORAGE, "/orders-storage/pieces");
apis.put(PIECES_STORAGE_BATCH, "/orders-storage/pieces-batch");
SerhiiNosko marked this conversation as resolved.
Show resolved Hide resolved
apis.put(ORGANIZATION_STORAGE, "/organizations-storage/organizations");
apis.put(RECEIVING_HISTORY, "/orders-storage/receiving-history");
apis.put(PO_LINE_NUMBER, "/orders-storage/po-line-number");
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/folio/service/pieces/PieceStorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static org.folio.orders.utils.QueryUtils.convertIdsToCqlQuery;
import static org.folio.orders.utils.QueryUtils.getCqlExpressionForFieldNullValue;
import static org.folio.orders.utils.ResourcePathResolver.PIECES_STORAGE;
import static org.folio.orders.utils.ResourcePathResolver.PIECES_STORAGE_BATCH;
import static org.folio.orders.utils.ResourcePathResolver.resourcesPath;
import static org.folio.rest.RestConstants.MAX_IDS_FOR_GET_RQ_15;

Expand Down Expand Up @@ -40,6 +41,7 @@ public class PieceStorageService {
private static final String PIECES_BY_HOLDING_ID_QUERY = "holdingId==%s";
private static final String PIECE_STORAGE_ENDPOINT = resourcesPath(PIECES_STORAGE);
private static final String PIECE_STORAGE_BY_ID_ENDPOINT = PIECE_STORAGE_ENDPOINT + "/{id}";
private static final String PIECES_STORAGE_BATCH_ENDPOINT = resourcesPath(PIECES_STORAGE_BATCH);

private final ConsortiumConfigurationService consortiumConfigurationService;
private final ConsortiumUserTenantsRetriever consortiumUserTenantsRetriever;
Expand Down Expand Up @@ -82,6 +84,11 @@ public Future<Void> updatePiece(Piece piece, RequestContext requestContext) {
return restClient.put(requestEntry, piece, requestContext);
}

public Future<Void> updatePiecesBatch(PieceCollection pieceCollection, RequestContext requestContext) {
RequestEntry requestEntry = new RequestEntry(PIECES_STORAGE_BATCH_ENDPOINT);
return restClient.put(requestEntry, pieceCollection, requestContext);
}

public Future<Piece> insertPiece(Piece piece, RequestContext requestContext) {
RequestEntry requestEntry = new RequestEntry(PIECE_STORAGE_ENDPOINT);
return restClient.post(requestEntry, piece, Piece.class, requestContext);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.folio.rest.jaxrs.model.Parameter;
import org.folio.rest.jaxrs.model.Piece;
import org.folio.rest.jaxrs.model.PieceBatchStatusCollection;
import org.folio.rest.jaxrs.model.PieceCollection;
import org.folio.service.ProtectionService;
import org.folio.service.orders.PurchaseOrderLineService;
import org.folio.service.pieces.PieceService;
Expand Down Expand Up @@ -176,8 +177,7 @@ private Future<Void> updatePiecesStatusesByPoLine(PieceBatchStatusUpdateHolder h
if (!Boolean.TRUE.equals(isAnyPiecesUpdated)) {
return Future.succeededFuture();
}
var updates = holder.getPieces().stream().map(piece -> pieceStorageService.updatePiece(piece, requestContext)).toList();
return HelperUtils.collectResultsOnSuccess(updates)
return pieceStorageService.updatePiecesBatch(new PieceCollection().withPieces(holder.getPieces()), requestContext)
.compose(v -> asFuture(() -> pieceService.receiptConsistencyPiecePoLine(holder.getOrderLineId(), requestContext)));
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ void shouldUpdatePiecesStatusesSuccessfully() {
doReturn(succeededFuture(poLine2)).when(purchaseOrderLineService).getOrderLineById(poLine2.getId(), requestContext);
doReturn(succeededFuture(purchaseOrder)).when(purchaseOrderStorageService).getPurchaseOrderById(purchaseOrder.getId(), requestContext);
doReturn(succeededFuture()).when(pieceUpdateFlowPoLineService).updatePoLine(any(), eq(requestContext));
doReturn(succeededFuture()).when(pieceStorageService).updatePiece(any(), eq(requestContext));
doReturn(succeededFuture()).when(pieceStorageService).updatePiecesBatch(any(), eq(requestContext));
doNothing().when(pieceService).receiptConsistencyPiecePoLine(anyString(), eq(requestContext));

Future<Void> result = pieceUpdateFlowManager.updatePiecesStatuses(pieceIds, receivingStatus, requestContext);
Expand Down
Loading