[MODORDERS-1209]. Fix handleGetPieceById method

folio-org · Dec 4, 2024 · da0fe05 · da0fe05
1 parent 244d795
commit da0fe05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/test/java/org/folio/rest/impl/ClaimingApiTest.java b/src/test/java/org/folio/rest/impl/ClaimingApiTest.java
@@ -11,7 +11,6 @@
 import org.folio.rest.jaxrs.model.ClaimingPieceResult;
 import org.folio.rest.jaxrs.model.ClaimingResults;
 import org.folio.rest.jaxrs.model.CompositePoLine;
-import org.folio.rest.jaxrs.model.Piece;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -37,12 +36,10 @@
 import static org.folio.TestUtils.getMinimalOrder;
 import static org.folio.TestUtils.getMockAsJson;
 import static org.folio.orders.utils.ResourcePathResolver.ORGANIZATION_STORAGE;
-import static org.folio.orders.utils.ResourcePathResolver.PIECES_STORAGE;
 import static org.folio.orders.utils.ResourcePathResolver.PO_LINES_STORAGE;
 import static org.folio.orders.utils.ResourcePathResolver.PURCHASE_ORDER_STORAGE;
 import static org.folio.rest.impl.MockServer.BASE_MOCK_DATA_PATH;
 import static org.folio.rest.impl.MockServer.ORGANIZATION_COLLECTION;
-import static org.folio.rest.impl.MockServer.PIECES_COLLECTION;
 import static org.folio.rest.impl.MockServer.PO_LINES_COLLECTION;
 import static org.folio.rest.impl.MockServer.addMockEntry;
 import static org.folio.rest.impl.MockServer.getDataExportSpringJobCreations;
@@ -140,15 +137,10 @@ void testPostOrdersClaim(String name, int vendorIdx, int polIdx, int pieceIdx, M
       .mapTo(CompositePoLine.class);
     var purchaseOrder = getMinimalOrder(poLine)
       .withVendor(organization.getId());
-    var piece = getMockAsJson(PIECES_COLLECTION)
-      .getJsonArray(PIECES_KEY)
-      .getJsonObject(pieceIdx)
-      .mapTo(Piece.class);
 
     addMockEntry(ORGANIZATION_STORAGE, organization);
     addMockEntry(PURCHASE_ORDER_STORAGE, purchaseOrder);
     addMockEntry(PO_LINES_STORAGE, poLine);
-    addMockEntry(PIECES_STORAGE, piece);
 
     var headers = prepareHeaders(header);
     var mockDataPath = BASE_MOCK_DATA_PATH + CLAIMING_MOCK_DATA_FOLDER + payloadFile;

diff --git a/src/test/java/org/folio/rest/impl/MockServer.java b/src/test/java/org/folio/rest/impl/MockServer.java
@@ -1922,7 +1922,7 @@ private void handleGetPieceById(RoutingContext ctx) {
           } else if (PIECE_POLINE_CONSISTENT_RECEIPT_STATUS_ID.equals(pieceId)) {
             body = new JsonObject(getMockData(PIECE_RECORDS_MOCK_DATA_PATH + "pieceRecord-received-consistent-receipt-status-5b454292-6aaa-474f-9510-b59a564e0c8d2.json"));
           } else {
-            body = new JsonObject(getMockData(PIECE_RECORDS_MOCK_DATA_PATH + "pieceRecord-А.json"));
+            body = new JsonObject(getMockData(PIECE_RECORDS_MOCK_DATA_PATH + String.format("pieceRecord-%s.json", pieceId)));
           }
         }
         serverResponse(ctx, HttpStatus.HTTP_OK.toInt(), APPLICATION_JSON, body.encodePrettily());