Merge pull request #40 from indexdata/MODNCIP-68

MODNCIP-68 Send field only if not null
indexdata · Sep 12, 2024 · f4ea723 · f4ea723
2 parents 09add9a + afebb0a
commit f4ea723
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java b/src/main/java/org/folio/ncip/FolioRemoteServiceManager.java
@@ -547,7 +547,12 @@ public JsonObject acceptItem(AcceptItemInitiationData initData, UserId userId, S
 			item.put(Constants.ID, itemUuid.toString());
 			item.put("holdingsRecordId", holdingsUuid.toString());
 			item.put("discoverySuppress", true);
-			item.put("itemLevelCallNumber", itemId.getItemIdentifierValue());
+			if (initData.getItemOptionalFields() != null && initData.getItemOptionalFields().getItemDescription() != null &&
+					initData.getItemOptionalFields().getItemDescription().getCallNumber() != null) {
+				item.put("itemLevelCallNumber", initData.getItemOptionalFields().getItemDescription().getCallNumber());
+			} else {
+				item.put("itemLevelCallNumber", itemId.getItemIdentifierValue());
+			}
 			// PLACE HOLD DOES NOT WORK UNLESS THE ITEM HAS A PERM LOCATION
 			JsonObject permLocation = new JsonObject();
 			permLocation.put(Constants.ID, itemLocation);

diff --git a/src/test/resources/mockdata/ncip-acceptItem-blocked.xml b/src/test/resources/mockdata/ncip-acceptItem-blocked.xml
@@ -26,10 +26,7 @@
 			<BibliographicDescription>
 			<Author>Author</Author>
 			<Title>TEST ONE</Title>
-		</BibliographicDescription>
-		<ItemDescription>
-			<CallNumber>Call Number</CallNumber>
-		</ItemDescription>
+			</BibliographicDescription>
 		</ItemOptionalFields>
 		<PickupLocation>DELIVERY</PickupLocation>
 		<FiscalTransactionInformation>