fix physrequest logic and tests

Author: charmingduchess

lib/requestability_resolver.js

@@ -24,25 +24,29 @@ class RequestabilityResolver {
     return elasticSearchResponse
   }
 
-  static buildPhysRequestable (item, numDeliveryLocations) {
+  static buildPhysRequestable (item, numDeliveryLocations, requestableBasedOnHoldingLocation) {
     let physRequestableCriteria
     let physRequestable
     const hasRecapCustomerCode = item.recapCustomerCode?.[0]
     const itemIsInRecapMissingRecapCustomerCode = isInRecap(item) && !hasRecapCustomerCode
-    // recap items missing codes should default to true for phys and edd
-    // requestable, unless it has a non-requestable holding location
+    // The following cases are NOT mutually exclusive
     if (itemIsInRecapMissingRecapCustomerCode) {
+      // recap items missing codes should default to true for phys and edd
+      // requestable, unless it has a non-requestable holding location.
       physRequestable = true
       physRequestableCriteria = 'Missing customer code'
+    } else if (!DeliveryLocationsResolver.requestableBasedOnHoldingLocation(item)) {
+      physRequestableCriteria = 'Unrequestable holding location'
+      physRequestable = false
+    } else if (numDeliveryLocations === 0) {
+      physRequestableCriteria = 'No delivery locations.'
+      physRequestable = false
     }
+    // This case is mutually exclusive with the prior 3
     if (numDeliveryLocations > 0) {
       physRequestableCriteria = `${numDeliveryLocations} delivery locations.`
       physRequestable = true
     }
-    if (!numDeliveryLocations) {
-      physRequestableCriteria = 'No delivery locations.'
-      physRequestable = false
-    }
     // items without barcodes should not be requestable
     const hasBarcode = (item.identifier || []).some((identifier) => /^(urn|bf):[bB]arcode:\w+/.test(identifier))
     if (isItemNyplOwned(item) && !hasBarcode) {

test/fixtures/no_recap_response.js

@@ -305,7 +305,7 @@ exports.fakeElasticSearchResponseNyplItem = () => {
                 holdingLocation: [
                   {
                     label: 'OFFSITE - Request in Advance',
-                    id: 'loc:dya0f'
+                    id: 'loc:rcpt8'
                   }
                 ],
                 status_packed: [

test/requestability_resolver.test.js

@@ -2,7 +2,6 @@ const RequestabilityResolver = require('../lib/requestability_resolver')
 const elasticSearchResponse = require('./fixtures/elastic_search_response.js')
 const specRequestableElasticSearchResponse = require('./fixtures/specRequestable/specRequestable-es-response.js')
 const eddElasticSearchResponse = require('./fixtures/edd_elastic_search_response')
-const findingAidElasticSearchResponse = require('./fixtures/specRequestable/findingAid-es-response.js')
 const noBarcodeResponse = require('./fixtures/no_barcode_es_response')
 const noRecapResponse = require('./fixtures/no_recap_response')
 
@@ -228,16 +227,16 @@ describe('RequestabilityResolver', () => {
 
     it('marks edd and physical requestability correctly', function () {
       const items = resolved.hits.hits[0]._source.items
-      const firstItem = items.find((item) => {
+      const requestableLocationNoRecapCode = items.find((item) => {
         return item.uri === 'i102836649'
       })
-      const secondItem = items.find((item) => {
+      const nonRequestableLocationNoRecapCode = items.find((item) => {
         return item.uri === 'i102836659'
       })
-      expect(firstItem.physRequestable).to.equal(true)
-      expect(firstItem.eddRequestable).to.equal(true)
-      expect(secondItem.physRequestable).to.equal(false)
-      expect(secondItem.eddRequestable).to.equal(false)
+      expect(requestableLocationNoRecapCode.physRequestable).to.equal(true)
+      expect(requestableLocationNoRecapCode.eddRequestable).to.equal(true)
+      expect(nonRequestableLocationNoRecapCode.physRequestable).to.equal(false)
+      expect(nonRequestableLocationNoRecapCode.eddRequestable).to.equal(false)
     })
   })
 })