Merge pull request #212 from ResearchCollectionsAndPreservation/stage…

…3-dev Stage3 dev to UAT
ResearchCollectionsAndPreservation · Aug 28, 2021 · 7ae877c · 7ae877c
2 parents 20311d4 + 7e29ac3
commit 7ae877c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/recap/service/deaccession/DeAccessionService.java b/src/main/java/org/recap/service/deaccession/DeAccessionService.java
@@ -367,9 +367,10 @@ private void checkGfaItemStatus(List<DeAccessionItem> deAccessionItems, List<DeA
                                 if ((StringUtils.isNotBlank(gfaItemStatus) && commonUtil.checkIfImsItemStatusIsRequestableNotRetrievable(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus))) {
                                     deAccessionDBResponseEntities.add(prepareFailureResponse(itemBarcode, deAccessionItem.getDeliveryLocation(), "Cannot Deaccession as Item is awaiting for Refile.Please try again later or contact ReCAP staff for further assistance.", itemEntity));
                                 }
-                                else if (StringUtils.isNotBlank(gfaItemStatus)
+                                else if ((StringUtils.isNotBlank(gfaItemStatus) && !commonUtil.checkIfImsItemIsNotOnFile(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus))
                                         && ((ScsbCommonConstants.AVAILABLE.equals(scsbItemStatus) && commonUtil.checkIfImsItemStatusIsAvailableOrNotAvailable(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus, true))
-                                        || (ScsbCommonConstants.NOT_AVAILABLE.equals(scsbItemStatus) && commonUtil.checkIfImsItemStatusIsAvailableOrNotAvailable(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus, false)))) {
+                                        || (ScsbCommonConstants.NOT_AVAILABLE.equals(scsbItemStatus) && commonUtil.checkIfImsItemStatusIsAvailableOrNotAvailable(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus, false))
+                                        || commonUtil.checkIfImsItemStatusIsRequestableNotRetrievable(itemEntity.getImsLocationEntity().getImsLocationCode(), gfaItemStatus))) {
                                     barcodeAndStopCodeMap.put(itemBarcode.trim(), deAccessionItem.getDeliveryLocation());
                                 } else {
                                     deAccessionDBResponseEntities.add(prepareFailureResponse(itemBarcode, deAccessionItem.getDeliveryLocation(), MessageFormat.format(ScsbConstants.GFA_ITEM_STATUS_MISMATCH, recapAssistanceEmailTo, recapAssistanceEmailTo), itemEntity));

diff --git a/src/main/java/org/recap/util/CommonUtil.java b/src/main/java/org/recap/util/CommonUtil.java
@@ -304,6 +304,17 @@ public boolean checkIfImsItemStatusIsRequestableNotRetrievable(String imsLocatio
         return StringUtils.isNotBlank(imsItemStatusCodes) && StringUtils.startsWithAny(imsItemStatus, imsItemStatusCodes.split(","));
     }
 
+    /**
+     * Checks if the IMS item status is Not on file (Item does not exist)
+     * @param imsLocationCode IMS Location Code
+     * @param imsItemStatus IMS Item Status
+     * @return boolean
+     */
+    public boolean checkIfImsItemIsNotOnFile(String imsLocationCode, String imsItemStatus) {
+        String imsItemStatusCodes = propertyUtil.getPropertyByImsLocationAndKey(imsLocationCode, PropertyKeyConstants.IMS.IMS_NOT_ON_FILE_ITEM_STATUS_CODES);
+        return StringUtils.isNotBlank(imsItemStatusCodes) && StringUtils.startsWithAny(imsItemStatus, imsItemStatusCodes.split(","));
+    }
+
     public ItemRequestInformation getItemRequestInformation(ItemEntity itemEntity) {
         ItemRequestInformation itemRequestInformation = new ItemRequestInformation();
         itemRequestInformation.setItemBarcodes(Collections.singletonList(itemEntity.getBarcode()));