From fd684d9c6cfdbf581d0c48e53a8aa24ff98f990c Mon Sep 17 00:00:00 2001 From: Irakli Merabishvili Date: Thu, 25 Jan 2024 16:25:55 +0400 Subject: [PATCH 1/2] [MODORDERS-1010] - Change "caption" to "Display summary" for checkin and receiving collections --- descriptors/ModuleDescriptor-template.json | 2 +- ramls/acq-models | 2 +- .../java/org/folio/helper/CheckinHelper.java | 2 +- .../org/folio/helper/ReceivingHelper.java | 2 +- .../org/folio/helper/CheckinHelperTest.java | 14 +++--- .../PieceUpdateFlowInventoryManagerTest.java | 2 +- ...checkin-pe-mix-2-electronic-resources.json | 4 +- .../checkin-pe-mix-2-physical-resources.json | 4 +- ...-af372ac8-5ffb-4560-8b96-3945a12e121b.json | 2 +- ...-fccaca78-ee0b-4579-930d-670bf5102ab0.json | 2 +- ...-5dbe5481-e5c1-4119-95bc-58e52ffd8374.json | 2 +- ...-fe47e95d-24e9-4a9a-9dc0-bcba64b51f56.json | 2 +- ...-5b454292-6aaa-474f-9510-b59a564e0c8d.json | 2 +- ...5b454292-6aaa-474f-9510-b59a564e0c8d2.json | 2 +- .../mockdata/pieces/pieceRecord.json | 2 +- ...-d471d766-8dbb-4609-999a-02681dea6c22.json | 4 +- .../pieces/pieceRecordsCollection.json | 8 +-- ...electronic-5-of-10-resources-no-items.json | 10 ++-- .../receive-physical-all-resources.json | 50 +++++++++---------- .../receiving/receive-physical-cancelled.json | 2 +- .../receiving/receive-physical-ongoing.json | 2 +- ...hysical-resources-6-of-10-with-errors.json | 20 ++++---- .../receivingHistory/receivingHistory.json | 2 +- 23 files changed, 72 insertions(+), 72 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index d88b53873..04204bc26 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -366,7 +366,7 @@ }, { "id": "receiving", - "version": "1.2", + "version": "2.2", "handlers": [ { "methods": [ diff --git a/ramls/acq-models b/ramls/acq-models index 49e5e16ca..d3cfe3c19 160000 --- a/ramls/acq-models +++ b/ramls/acq-models @@ -1 +1 @@ -Subproject commit 49e5e16cafc41db6fc65cf644fd742843d3c5287 +Subproject commit d3cfe3c19baf07a03465bb6a51161a40ed294877 diff --git a/src/main/java/org/folio/helper/CheckinHelper.java b/src/main/java/org/folio/helper/CheckinHelper.java index 5219d71ea..996f0bece 100644 --- a/src/main/java/org/folio/helper/CheckinHelper.java +++ b/src/main/java/org/folio/helper/CheckinHelper.java @@ -237,7 +237,7 @@ private void updatePieceWithCheckinInfo(Piece piece) { CheckInPiece checkinPiece = piecesByLineId.get(piece.getPoLineId()) .get(piece.getId()); - piece.setCaption(checkinPiece.getCaption()); + piece.setDisplaySummary(checkinPiece.getDisplaySummary()); piece.setComment(checkinPiece.getComment()); if (StringUtils.isNotEmpty(checkinPiece.getLocationId())) { diff --git a/src/main/java/org/folio/helper/ReceivingHelper.java b/src/main/java/org/folio/helper/ReceivingHelper.java index af99f40fe..234c8375d 100644 --- a/src/main/java/org/folio/helper/ReceivingHelper.java +++ b/src/main/java/org/folio/helper/ReceivingHelper.java @@ -256,7 +256,7 @@ private void updatePieceWithReceivingInfo(Piece piece) { ReceivedItem receivedItem = piecesByLineId.get(piece.getPoLineId()) .get(piece.getId()); - piece.setCaption(receivedItem.getCaption()); + piece.setDisplaySummary(receivedItem.getDisplaySummary()); piece.setComment(receivedItem.getComment()); if (StringUtils.isNotEmpty(receivedItem.getLocationId())) { piece.setLocationId(receivedItem.getLocationId()); diff --git a/src/test/java/org/folio/helper/CheckinHelperTest.java b/src/test/java/org/folio/helper/CheckinHelperTest.java index 98b2b3417..6c834e9f4 100644 --- a/src/test/java/org/folio/helper/CheckinHelperTest.java +++ b/src/test/java/org/folio/helper/CheckinHelperTest.java @@ -95,17 +95,17 @@ void shouldTestGetItemCreateNeededCheckinPieces() { String poLine2 = UUID.randomUUID().toString(); CheckinCollection checkinCollection = new CheckinCollection(); ToBeCheckedIn toBeCheckedIn1 = new ToBeCheckedIn().withPoLineId(poLine1); - CheckInPiece checkInPiece1 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withCaption("1"); - CheckInPiece checkInPiece2 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(false).withCaption("2"); + CheckInPiece checkInPiece1 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withDisplaySummary("1"); + CheckInPiece checkInPiece2 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(false).withDisplaySummary("2"); toBeCheckedIn1.withCheckInPieces(List.of(checkInPiece1, checkInPiece2)); ToBeCheckedIn toBeCheckedIn2 = new ToBeCheckedIn().withPoLineId(poLine1); - CheckInPiece checkInPiece3 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withCaption("3") + CheckInPiece checkInPiece3 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withDisplaySummary("3") .withEnumeration("Enum1").withCopyNumber("CN1").withChronology("Ch1").withDiscoverySuppress(true).withDisplayOnHolding(true); toBeCheckedIn2.withCheckInPieces(List.of(checkInPiece3)); ToBeCheckedIn toBeCheckedIn3 = new ToBeCheckedIn().withPoLineId(poLine2); - CheckInPiece checkInPiece4 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withCaption("4") + CheckInPiece checkInPiece4 = new CheckInPiece().withId(UUID.randomUUID().toString()).withCreateItem(true).withDisplaySummary("4") .withEnumeration("Enum2").withCopyNumber("CN2").withChronology("Ch2").withDiscoverySuppress(false).withDisplayOnHolding(false); toBeCheckedIn3.withCheckInPieces(List.of(checkInPiece4)); @@ -120,16 +120,16 @@ void shouldTestGetItemCreateNeededCheckinPieces() { assertEquals(1, map.get(poLine2).size()); CheckInPiece actCheckInPiece1 = map.get(poLine1).stream() - .filter(checkInPiece -> "3".equals(checkInPiece.getCaption())) + .filter(checkInPiece -> "3".equals(checkInPiece.getDisplaySummary())) .findFirst().get(); - assertEquals("3", actCheckInPiece1.getCaption()); + assertEquals("3", actCheckInPiece1.getDisplaySummary()); assertEquals("Enum1", actCheckInPiece1.getEnumeration()); assertEquals("CN1", actCheckInPiece1.getCopyNumber()); assertEquals("Ch1", actCheckInPiece1.getChronology()); assertEquals(true, actCheckInPiece1.getDiscoverySuppress()); assertEquals(true, actCheckInPiece1.getDisplayOnHolding()); CheckInPiece actCheckInPiece2 = map.get(poLine2).get(0); - assertEquals("4", actCheckInPiece2.getCaption()); + assertEquals("4", actCheckInPiece2.getDisplaySummary()); assertEquals("Enum2", actCheckInPiece2.getEnumeration()); assertEquals("CN2", actCheckInPiece2.getCopyNumber()); assertEquals("Ch2", actCheckInPiece2.getChronology()); diff --git a/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowInventoryManagerTest.java b/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowInventoryManagerTest.java index 54860e8e3..f2461d741 100644 --- a/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowInventoryManagerTest.java +++ b/src/test/java/org/folio/service/pieces/flows/update/PieceUpdateFlowInventoryManagerTest.java @@ -523,7 +523,7 @@ void shouldNotTryToUpdateItemWhenUpdatingPieceThatDoesNotHaveItem() JsonObject holding = new JsonObject().put(ID, holdingId); holding.put(HOLDING_PERMANENT_LOCATION_ID, UUID.randomUUID().toString()); Piece pieceFromStorage = new Piece().withId(pieceId).withTitleId(titleId).withPoLineId(lineId).withHoldingId(holdingId).withFormat(Piece.Format.PHYSICAL); - Piece pieceToUpdate = new Piece().withId(pieceId).withTitleId(titleId).withPoLineId(lineId).withHoldingId(holdingId).withFormat(Piece.Format.PHYSICAL).withCaption(caption); + Piece pieceToUpdate = new Piece().withId(pieceId).withTitleId(titleId).withPoLineId(lineId).withHoldingId(holdingId).withFormat(Piece.Format.PHYSICAL).withDisplaySummary(caption); Location loc = new Location().withHoldingId(holdingId).withQuantityElectronic(1).withQuantity(1); Cost cost = new Cost().withQuantityElectronic(1); diff --git a/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-electronic-resources.json b/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-electronic-resources.json index 0f7f8ee1b..cba57ac17 100644 --- a/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-electronic-resources.json +++ b/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-electronic-resources.json @@ -9,7 +9,7 @@ "barcode": "", "callNumber": "PR 8923 W6 L36 1990 c.3", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "createItem": false, "supplement": false, "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", @@ -26,7 +26,7 @@ "barcode": "", "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 2", + "displaySummary": "Vol. 2", "createItem": false, "supplement": true, "locationId": "f34d27c6-a8eb-461b-acd6-5dea81771e70", diff --git a/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-physical-resources.json b/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-physical-resources.json index a14083001..d8865dd0b 100644 --- a/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-physical-resources.json +++ b/src/test/resources/mockdata/checkIn/checkin-pe-mix-2-physical-resources.json @@ -9,7 +9,7 @@ "barcode": "6015021", "callNumber": "PR 8923 W6 L36 1990 c.3", "comment": "Checkin Physical", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "createItem": false, "supplement": false, "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", @@ -25,7 +25,7 @@ "barcode": "6015022", "callNumber": "BF2050 .M335 1999", "comment": "Checkin Physical", - "caption": "Vol. 2", + "displaySummary": "Vol. 2", "createItem": false, "supplement": true, "locationId": "f34d27c6-a8eb-461b-acd6-5dea81771e70", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-af372ac8-5ffb-4560-8b96-3945a12e121b.json b/src/test/resources/mockdata/pieces/pieceRecord-af372ac8-5ffb-4560-8b96-3945a12e121b.json index c29e1d0ee..0cf713727 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-af372ac8-5ffb-4560-8b96-3945a12e121b.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-af372ac8-5ffb-4560-8b96-3945a12e121b.json @@ -1,6 +1,6 @@ { "id": "af372ac8-5ffb-4560-8b96-3945a12e121b", - "caption": "Tutorial Volume 5", + "displaySummary": "Tutorial Volume 5", "comment": "Special Edition", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-fccaca78-ee0b-4579-930d-670bf5102ab0.json b/src/test/resources/mockdata/pieces/pieceRecord-fccaca78-ee0b-4579-930d-670bf5102ab0.json index a33cea2f6..83dacb335 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-fccaca78-ee0b-4579-930d-670bf5102ab0.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-fccaca78-ee0b-4579-930d-670bf5102ab0.json @@ -1,6 +1,6 @@ { "id": "fccaca78-ee0b-4579-930d-670bf5102ab0", - "caption": "Tutorial Volume 5", + "displaySummary": "Tutorial Volume 5", "comment": "Special Edition", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-fullyreceived-5dbe5481-e5c1-4119-95bc-58e52ffd8374.json b/src/test/resources/mockdata/pieces/pieceRecord-fullyreceived-5dbe5481-e5c1-4119-95bc-58e52ffd8374.json index 807b2b5fc..5f5668b1d 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-fullyreceived-5dbe5481-e5c1-4119-95bc-58e52ffd8374.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-fullyreceived-5dbe5481-e5c1-4119-95bc-58e52ffd8374.json @@ -1,6 +1,6 @@ { "id": "5dbe5481-e5c1-4119-95bc-58e52ffd8374", - "caption": "Tutorial Volume 13", + "displaySummary": "Tutorial Volume 13", "comment": "Standard Edition", "format": "Electronic", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-poLineId-fe47e95d-24e9-4a9a-9dc0-bcba64b51f56.json b/src/test/resources/mockdata/pieces/pieceRecord-poLineId-fe47e95d-24e9-4a9a-9dc0-bcba64b51f56.json index 82ed4afbd..3eb3c509b 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-poLineId-fe47e95d-24e9-4a9a-9dc0-bcba64b51f56.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-poLineId-fe47e95d-24e9-4a9a-9dc0-bcba64b51f56.json @@ -1,6 +1,6 @@ { "id": "4e717549-f915-47d6-b300-3672a7d7970f", - "caption": "Tutorial Volume 12", + "displaySummary": "Tutorial Volume 12", "comment": "Special Edition 3", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-poline-not-exists-5b454292-6aaa-474f-9510-b59a564e0c8d.json b/src/test/resources/mockdata/pieces/pieceRecord-poline-not-exists-5b454292-6aaa-474f-9510-b59a564e0c8d.json index 001f9b834..411d1c81b 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-poline-not-exists-5b454292-6aaa-474f-9510-b59a564e0c8d.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-poline-not-exists-5b454292-6aaa-474f-9510-b59a564e0c8d.json @@ -1,6 +1,6 @@ { "id": "5b454292-6aaa-474f-9510-b59a564e0c8d", - "caption": "Tutorial Volume 9", + "displaySummary": "Tutorial Volume 9", "comment": "Special Edition 9", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord-received-consistent-receipt-status-5b454292-6aaa-474f-9510-b59a564e0c8d2.json b/src/test/resources/mockdata/pieces/pieceRecord-received-consistent-receipt-status-5b454292-6aaa-474f-9510-b59a564e0c8d2.json index 92133b4d3..f18cec280 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord-received-consistent-receipt-status-5b454292-6aaa-474f-9510-b59a564e0c8d2.json +++ b/src/test/resources/mockdata/pieces/pieceRecord-received-consistent-receipt-status-5b454292-6aaa-474f-9510-b59a564e0c8d2.json @@ -1,6 +1,6 @@ { "id": "7d0aa803-a659-49f0-8a95-968f277c87d7", - "caption": "Tutorial Volume 9", + "displaySummary": "Tutorial Volume 9", "comment": "Special Edition 9", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecord.json b/src/test/resources/mockdata/pieces/pieceRecord.json index a1998412b..0e31ec8f6 100644 --- a/src/test/resources/mockdata/pieces/pieceRecord.json +++ b/src/test/resources/mockdata/pieces/pieceRecord.json @@ -1,5 +1,5 @@ { - "caption": "Tutorial Volume 5", + "displaySummary": "Tutorial Volume 5", "comment": "Special Edition", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", diff --git a/src/test/resources/mockdata/pieces/pieceRecords-d471d766-8dbb-4609-999a-02681dea6c22.json b/src/test/resources/mockdata/pieces/pieceRecords-d471d766-8dbb-4609-999a-02681dea6c22.json index b79b6bad1..573d6d74b 100644 --- a/src/test/resources/mockdata/pieces/pieceRecords-d471d766-8dbb-4609-999a-02681dea6c22.json +++ b/src/test/resources/mockdata/pieces/pieceRecords-d471d766-8dbb-4609-999a-02681dea6c22.json @@ -2,7 +2,7 @@ "pieces": [ { "id": "526bfa1a-5371-415f-998a-ac8ce4425b18", - "caption": "Tutorial Volume 6", + "displaySummary": "Tutorial Volume 6", "comment": "Standard Edition", "format": "Physical", "itemId": "522a501a-56b5-48d9-b28a-3a8f02482d97", @@ -16,7 +16,7 @@ }, { "id": "7802b94d-68b4-41e5-91ff-0cee8cd8f029", - "caption": "Tutorial Volume 7", + "displaySummary": "Tutorial Volume 7", "comment": "Standard Edition II", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "poLineId": "d471d766-8dbb-4609-999a-02681dea6c22", diff --git a/src/test/resources/mockdata/pieces/pieceRecordsCollection.json b/src/test/resources/mockdata/pieces/pieceRecordsCollection.json index 0464909ac..b1e8750f1 100644 --- a/src/test/resources/mockdata/pieces/pieceRecordsCollection.json +++ b/src/test/resources/mockdata/pieces/pieceRecordsCollection.json @@ -361,7 +361,7 @@ }, { "id": "7802b94d-68b4-41e5-91ff-0cee8cd8f029", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "comment": "Very important note", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "poLineId": "fe47e95d-24e9-4a9a-9dc0-bcba64b51f56", @@ -372,7 +372,7 @@ }, { "id": "4d19a3ff-986f-4150-95a2-2f2da797591c", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "comment": "Very important note", "itemId": "a940a524-ec08-42a4-8e63-2b7f8194371e", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", @@ -384,7 +384,7 @@ }, { "id": "6a53eb3c-f9dd-46f5-bbf8-5768cf97ec6d", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "comment": "Very important note", "itemId": "fbd41843-569b-4a15-95da-6d543fe489ad", "titleId": "9a665b22-9fe5-4c95-b4ee-837a5433c95d", @@ -396,7 +396,7 @@ }, { "id": "61437764-03e4-4c75-a743-d40f71ff9161", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "comment": "Very important note", "itemId": "821559ef-4ee7-4b19-a835-a6787c2bafb9", "titleId": "9a665b22-9fe5-4c95-b4ee-837a5433c95d", diff --git a/src/test/resources/mockdata/receiving/receive-electronic-5-of-10-resources-no-items.json b/src/test/resources/mockdata/receiving/receive-electronic-5-of-10-resources-no-items.json index fb1528f72..b6e2a2d1e 100644 --- a/src/test/resources/mockdata/receiving/receive-electronic-5-of-10-resources-no-items.json +++ b/src/test/resources/mockdata/receiving/receive-electronic-5-of-10-resources-no-items.json @@ -7,7 +7,7 @@ { "barcode": 21111111112, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "36840b87-b4b4-48dd-b2fc-a5370df4034a" @@ -15,7 +15,7 @@ { "barcode": 21111111113, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "2d10cd5a-8325-4873-a940-2fcf838a54af" @@ -23,7 +23,7 @@ { "barcode": 21111111114, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "f8bb5de0-fa1c-49b7-82b3-c2c2dfd0925d" @@ -31,7 +31,7 @@ { "barcode": 21111111115, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "73d7c872-ce17-4b6c-9729-309e844fef9b" @@ -39,7 +39,7 @@ { "barcode": 21111111116, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "2beff851-d9df-4a8d-a65b-762c9d78340d" diff --git a/src/test/resources/mockdata/receiving/receive-physical-all-resources.json b/src/test/resources/mockdata/receiving/receive-physical-all-resources.json index ceb797af7..62d92e9a2 100644 --- a/src/test/resources/mockdata/receiving/receive-physical-all-resources.json +++ b/src/test/resources/mockdata/receiving/receive-physical-all-resources.json @@ -8,7 +8,7 @@ "barcode": 21111111122, "callNumber": "PR 8923 W6 L36 1990 c.3", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "eaeb6ddf-38e8-4221-ac9e-b3c0df0ea99d" @@ -17,7 +17,7 @@ "barcode": 21111111123, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "43d51a47-d867-4c08-be11-25c925016854" @@ -26,7 +26,7 @@ "barcode": 21111111124, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "51686715-5c81-400e-b219-30bb7e9c6139" @@ -35,7 +35,7 @@ "barcode": 21111111125, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "6a1a71c9-e53a-4213-b2df-25f35e5a772f" @@ -44,7 +44,7 @@ "barcode": 21111111126, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "e1746e80-ac75-4183-a89b-dc764afea8c9" @@ -53,7 +53,7 @@ "barcode": 21111111127, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "cd341e06-4579-4a0d-ae73-31475ebc4551" @@ -62,7 +62,7 @@ "barcode": 21111111128, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "35a7d8d4-6847-4699-8f76-464c7cecaf47" @@ -71,7 +71,7 @@ "barcode": 21111111129, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "8c7c3b2a-dd60-4dd7-bf0b-84844628f2ba" @@ -80,7 +80,7 @@ "barcode": 21111111130, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "55c9587a-60fe-424b-8dd0-642ff71e9201" @@ -89,7 +89,7 @@ "barcode": 21111111131, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "bb3af75f-cb01-46b6-a84c-8b7d1a470254" @@ -98,7 +98,7 @@ "barcode": 21111111132, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "b70bcd05-f63d-43ed-8e05-6b70b53abdd4" @@ -107,7 +107,7 @@ "barcode": 21111111133, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "a16b54a3-b6bc-4edb-ad43-113f090eb3f8" @@ -116,7 +116,7 @@ "barcode": 21111111134, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "17f1c5d4-77dc-4f73-8484-e20c5cc11499" @@ -125,7 +125,7 @@ "barcode": 21111111135, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "57e41ac9-3d59-4380-8be9-c41385f7d646" @@ -134,7 +134,7 @@ "barcode": 21111111136, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "23e0c592-1c3c-4b50-a6fd-7c1826ea5b81" @@ -143,7 +143,7 @@ "barcode": 21111111137, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "ef29ae20-d9bb-41f6-a10d-148b4784573d" @@ -152,7 +152,7 @@ "barcode": 21111111138, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "46992f8a-bcdc-4c05-b002-25b3a2ab819c" @@ -161,7 +161,7 @@ "barcode": 21111111139, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "4819f32b-1aed-43a7-814a-1994c3434360" @@ -170,7 +170,7 @@ "barcode": 21111111140, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "963a058b-5171-4869-8f8b-4d102ae4dff4" @@ -179,7 +179,7 @@ "barcode": 21111111141, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "30972298-8f03-4674-8758-a5ed6ce313b9" @@ -188,7 +188,7 @@ "barcode": 21111111142, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "0065b764-c522-4a88-957c-9ecce226515c" @@ -197,7 +197,7 @@ "barcode": 21111111143, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "13b79316-58c4-4d4f-bbec-5870c8088021" @@ -206,7 +206,7 @@ "barcode": 21111111144, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "a2d37678-3f68-42c2-a997-0f3c81f1948c" @@ -215,7 +215,7 @@ "barcode": 21111111145, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "84a6597e-0895-4756-ba32-170a3aac8fae" @@ -224,7 +224,7 @@ "barcode": 21111111146, "callNumber": "BF2050 .M335 1999", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "cb8dcb28-5631-49e7-9f26-b7f9df0e840e" diff --git a/src/test/resources/mockdata/receiving/receive-physical-cancelled.json b/src/test/resources/mockdata/receiving/receive-physical-cancelled.json index 1f280bf44..6f3f438a7 100644 --- a/src/test/resources/mockdata/receiving/receive-physical-cancelled.json +++ b/src/test/resources/mockdata/receiving/receive-physical-cancelled.json @@ -8,7 +8,7 @@ "barcode": 21111111122, "callNumber": "PR 8923 W6 L36 1990 c.3", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "06a95f03-eb00-4248-9f2e-2bd05957ff05" diff --git a/src/test/resources/mockdata/receiving/receive-physical-ongoing.json b/src/test/resources/mockdata/receiving/receive-physical-ongoing.json index 0a0ce90ca..099aada6a 100644 --- a/src/test/resources/mockdata/receiving/receive-physical-ongoing.json +++ b/src/test/resources/mockdata/receiving/receive-physical-ongoing.json @@ -8,7 +8,7 @@ "barcode": 21111111122, "callNumber": "PR 8923 W6 L36 1990 c.3", "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "itemStatus": "In process", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "05a95f03-eb00-4248-9f2e-2bd05957ff04" diff --git a/src/test/resources/mockdata/receiving/receive-physical-resources-6-of-10-with-errors.json b/src/test/resources/mockdata/receiving/receive-physical-resources-6-of-10-with-errors.json index 14d05cb57..480da21aa 100644 --- a/src/test/resources/mockdata/receiving/receive-physical-resources-6-of-10-with-errors.json +++ b/src/test/resources/mockdata/receiving/receive-physical-resources-6-of-10-with-errors.json @@ -7,70 +7,70 @@ { "barcode": 11111111112, "comment": "Expected error pieceAlreadyReceived", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "8c057872-9c75-4fb1-879d-de3b089b0388" }, { "barcode": 11111111113, "comment": "Expected error itemNotFound", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "6f495150-9a7c-4104-84fa-16f3ec9ab005" }, { "barcode": 11111111114, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "2884f2cd-ccab-47e1-a021-9b22a05230d9" }, { "barcode": 11111111115, "comment": "Expected error piecePolMismatch", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "2f6056bd-e7f1-4e51-add2-b0c803066c74" }, { "barcode": 11111111116, "comment": "Expected error pieceNotFound", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "99e04f91-6985-48df-997d-289773fd8c44" }, { "barcode": 11111111117, "comment": "500500500500 Expected error pieceUpdateFailed", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "168f8a86-d26c-406e-813f-c7527f241ac3", "pieceId": "de647d4a-cc53-440d-be2b-da12559ba51c" }, { "barcode": 11111111118, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "f7272eb2-499f-4c29-985e-7ffc468d2360" }, { "barcode": 11111111119, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "70502e16-f07a-4156-a6b9-492862f1f8f3" }, { "barcode": 11111111120, "comment": "Very important note", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "5e8e29c4-801d-4e5b-a07c-3a975861db1c" }, { "barcode": 500500500500, "comment": "Expected error itemUpdateFailed", - "caption": "Vol. 1", + "displaySummary": "Vol. 1", "locationId": "fcd64ce1-6995-48f0-840e-89ffa2288371", "pieceId": "5062d4d7-2164-4cc0-bbb1-aa755324b95c" } diff --git a/src/test/resources/mockdata/receivingHistory/receivingHistory.json b/src/test/resources/mockdata/receivingHistory/receivingHistory.json index cfe991d2c..82623e328 100644 --- a/src/test/resources/mockdata/receivingHistory/receivingHistory.json +++ b/src/test/resources/mockdata/receivingHistory/receivingHistory.json @@ -3,7 +3,7 @@ [ { "id": "5e317dc2-deeb-4429-b2a1-91e5cd0fd5f7", - "caption": "Tutorial Volume 10", + "displaySummary": "Tutorial Volume 10", "comment": "Special Edition", "checkin": true, "instanceId": "7fbd5d84-62d1-44c6-9c45-6cb173998bbd", From 6ff6fbec75435e3bbc023e3d7055c0cbda74b13e Mon Sep 17 00:00:00 2001 From: Irakli Merabishvili Date: Thu, 25 Jan 2024 18:42:39 +0400 Subject: [PATCH 2/2] review --- descriptors/ModuleDescriptor-template.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 04204bc26..e3bc2d709 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -366,7 +366,7 @@ }, { "id": "receiving", - "version": "2.2", + "version": "2.0", "handlers": [ { "methods": [ @@ -475,7 +475,7 @@ }, { "id": "pieces", - "version": "2.1", + "version": "3.0", "handlers": [ { "methods": ["GET"], @@ -1062,11 +1062,11 @@ }, { "id": "orders-storage.pieces", - "version": "4.0" + "version": "5.0" }, { "id": "orders-storage.receiving-history", - "version": "3.2" + "version": "4.0" }, { "id": "orders-storage.reporting-codes",