From 4b6a6312eae5e72a1aaad470536c9ddebf0b52fe Mon Sep 17 00:00:00 2001 From: danamansana Date: Tue, 14 May 2024 15:07:45 -0400 Subject: [PATCH 1/4] Add making eddRequestable false in case no recapCustomerCode and holding location not requestable --- lib/delivery-locations-resolver.js | 6 +++++- lib/requestability_resolver.js | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/delivery-locations-resolver.js b/lib/delivery-locations-resolver.js index 5a731fb4..864f1939 100644 --- a/lib/delivery-locations-resolver.js +++ b/lib/delivery-locations-resolver.js @@ -236,7 +236,11 @@ class DeliveryLocationsResolver { // location is not requestable: let deliveryLocation let eddRequestable - if (!isItemNyplOwned(item) || this.requestableBasedOnHoldingLocation(item)) { + const hasRecapCustomerCode = item.recapCustomerCode && item.recapCustomerCode[0] + if (!hasRecapCustomerCode) { + deliveryLocation = [''] + eddRequestable = this.requestableBasedOnHoldingLocation(item) + } else if (!isItemNyplOwned(item) || this.requestableBasedOnHoldingLocation(item)) { deliveryLocation = this.deliveryLocationsByRecapCustomerCode(item.recapCustomerCode[0]) eddRequestable = this.__eddRequestableByCustomerCode(item.recapCustomerCode[0]) } else { diff --git a/lib/requestability_resolver.js b/lib/requestability_resolver.js index 52b4d816..5e4cb0fa 100644 --- a/lib/requestability_resolver.js +++ b/lib/requestability_resolver.js @@ -12,15 +12,14 @@ class RequestabilityResolver { const itemIsInRecap = isInRecap(item) let physRequestableCriteria const hasRecapCustomerCode = item.recapCustomerCode && item.recapCustomerCode[0] - if (itemIsInRecap && !hasRecapCustomerCode) { + if (itemIsInRecap) { // recap items missing codes should default to true for phys and edd // requestable. - physRequestableCriteria = 'Missing customer code' - deliveryInfo = { eddRequestable: true, deliveryLocation: [''] } - } else if (itemIsInRecap && hasRecapCustomerCode) { deliveryInfo = DeliveryLocationsResolver.getRecapDeliveryInfo(item) - physRequestableCriteria = `${deliveryInfo.deliveryLocation && - deliveryInfo.deliveryLocation.length || 0} delivery locations.` + physRequestableCriteria = hasRecapCustomerCode ? + `${deliveryInfo.deliveryLocation && + deliveryInfo.deliveryLocation.length || 0} delivery locations.` + : 'Missing customer code' } else if (!itemIsInRecap) { deliveryInfo = DeliveryLocationsResolver.getOnsiteDeliveryInfo(item) physRequestableCriteria = `${deliveryInfo.deliveryLocation && From 8055d7efa40bae104353b693391c71518f4dbe41 Mon Sep 17 00:00:00 2001 From: danamansana Date: Tue, 14 May 2024 15:12:35 -0400 Subject: [PATCH 2/4] Fix linting --- lib/requestability_resolver.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/requestability_resolver.js b/lib/requestability_resolver.js index 5e4cb0fa..02044592 100644 --- a/lib/requestability_resolver.js +++ b/lib/requestability_resolver.js @@ -16,8 +16,8 @@ class RequestabilityResolver { // recap items missing codes should default to true for phys and edd // requestable. deliveryInfo = DeliveryLocationsResolver.getRecapDeliveryInfo(item) - physRequestableCriteria = hasRecapCustomerCode ? - `${deliveryInfo.deliveryLocation && + physRequestableCriteria = hasRecapCustomerCode + ? `${deliveryInfo.deliveryLocation && deliveryInfo.deliveryLocation.length || 0} delivery locations.` : 'Missing customer code' } else if (!itemIsInRecap) { From 958273b695016e4cdd2e0b388837add8c2126770 Mon Sep 17 00:00:00 2001 From: danamansana Date: Mon, 20 May 2024 14:31:07 -0400 Subject: [PATCH 3/4] Add logic and tests for non-requestable items based on customer code and holding location --- lib/delivery-locations-resolver.js | 8 +- lib/requestability_resolver.js | 2 +- test/delivery-locations-resolver.test.js | 22 +- test/fixtures/no_recap_response.js | 808 +++++++++++++++++++++++ test/requestability_resolver.test.js | 19 + 5 files changed, 854 insertions(+), 5 deletions(-) create mode 100644 test/fixtures/no_recap_response.js diff --git a/lib/delivery-locations-resolver.js b/lib/delivery-locations-resolver.js index 864f1939..a4bd279a 100644 --- a/lib/delivery-locations-resolver.js +++ b/lib/delivery-locations-resolver.js @@ -237,10 +237,12 @@ class DeliveryLocationsResolver { let deliveryLocation let eddRequestable const hasRecapCustomerCode = item.recapCustomerCode && item.recapCustomerCode[0] + const nyplItem = isItemNyplOwned(item) if (!hasRecapCustomerCode) { - deliveryLocation = [''] - eddRequestable = this.requestableBasedOnHoldingLocation(item) - } else if (!isItemNyplOwned(item) || this.requestableBasedOnHoldingLocation(item)) { + const requestableBasedOnHoldingLocation = nyplItem ? this.requestableBasedOnHoldingLocation(item) : true + deliveryLocation = requestableBasedOnHoldingLocation ? [''] : [] + eddRequestable = requestableBasedOnHoldingLocation + } else if (!nyplItem || this.requestableBasedOnHoldingLocation(item)) { deliveryLocation = this.deliveryLocationsByRecapCustomerCode(item.recapCustomerCode[0]) eddRequestable = this.__eddRequestableByCustomerCode(item.recapCustomerCode[0]) } else { diff --git a/lib/requestability_resolver.js b/lib/requestability_resolver.js index 02044592..8501036a 100644 --- a/lib/requestability_resolver.js +++ b/lib/requestability_resolver.js @@ -14,7 +14,7 @@ class RequestabilityResolver { const hasRecapCustomerCode = item.recapCustomerCode && item.recapCustomerCode[0] if (itemIsInRecap) { // recap items missing codes should default to true for phys and edd - // requestable. + // requestable, unless it has a non-requestable holding location deliveryInfo = DeliveryLocationsResolver.getRecapDeliveryInfo(item) physRequestableCriteria = hasRecapCustomerCode ? `${deliveryInfo.deliveryLocation && diff --git a/test/delivery-locations-resolver.test.js b/test/delivery-locations-resolver.test.js index e93b312c..e82c434a 100644 --- a/test/delivery-locations-resolver.test.js +++ b/test/delivery-locations-resolver.test.js @@ -9,7 +9,7 @@ var sampleItems = { ], 'holdingLocation': [ { - 'id': 'loc:scff3', + 'id': 'loc:scff2', 'prefLabel': 'Schomburg Center - Research & Reference - Desk' } ], @@ -502,4 +502,24 @@ describe('Delivery-locations-resolver', function () { ).to.equal(true) }) }) + describe('getRecapDeliveryInfo', function () { + it('returns empty deliveryLocation and eddRequestable false based on holding location when missing recapCustomerCode', function () { + const resolved = DeliveryLocationsResolver.getRecapDeliveryInfo({ + holdingLocation: [{ id: 'loc:rccd8' }], + uri: 'i14747243' + }) + expect(resolved.deliveryLocation.length).to.equal(0) + expect(resolved.eddRequestable).to.equal(false) + }) + + it('returns empty deliveryLocation and eddRequestable true based on holding location when missing recapCustomerCode', function () { + const resolved = DeliveryLocationsResolver.getRecapDeliveryInfo({ + holdingLocation: [{ id: 'loc:rcpm2' }], + uri: 'i14747243' + }) + expect(resolved.deliveryLocation.length).to.equal(1) + expect(resolved.deliveryLocation[0]).to.equal('') + expect(resolved.eddRequestable).to.equal(true) + }) + }) }) diff --git a/test/fixtures/no_recap_response.js b/test/fixtures/no_recap_response.js new file mode 100644 index 00000000..37c8dad1 --- /dev/null +++ b/test/fixtures/no_recap_response.js @@ -0,0 +1,808 @@ +exports.fakeElasticSearchResponseNyplItem = () => { + return { + '_shards': { + 'failed': 0, + 'successful': 1, + 'total': 1 + }, + 'took': 1, + 'hits': { + 'total': 1, + 'max_score': 1.3862944, + 'hits': [ + { + '_id': 'b10980129', + '_source': { + 'numItems': [ + 4 + ], + 'createdString': [ + '1989' + ], + 'issuance': [ + { + 'label': 'monograph/item', + 'id': 'urn:biblevel:m' + } + ], + 'creatorLiteral': [ + 'Maḥfūẓ, Najīb, 1911-2006.' + ], + 'creator_sort': [ + 'maḥfūẓ, najīb, 1911-2006.' + ], + 'level': 'debug', + 'items': [ + { + 'uri': 'i22566485', + 'identifier': [ + 'urn:barcode:33433058338470' + ], + 'status': [ + { + 'label': 'Available', + 'id': 'status:a' + } + ] + }, + { + 'uri': 'i22566489' + }, + { + 'holdingLocation_packed': [ + 'loc:scff2||Schomburg Center - Research & Reference' + ], + 'suppressed': [ + false + ], + 'shelfMark': [ + 'Sc D 90-863' + ], + 'accessMessage_packed': [ + 'accessMessage:1||USE IN LIBRARY' + ], + 'uri': 'i10283665', + 'accessMessage': [ + { + 'label': 'USE IN LIBRARY', + 'id': 'accessMessage:1' + } + ], + 'catalogItemType': [ + { + 'id': 'catalogItemType:2', + 'label': 'book non-circ' + } + ], + 'deliveryLocation_packed': [ + 'loc:sc||Schomburg Center' + ], + 'owner': [ + { + 'label': 'Schomburg Center for Research in Black Culture, Jean Blackwell Hutson Research and Reference Division', + 'id': 'orgs:1114' + } + ], + 'deliveryLocation': [ + { + 'label': 'Schomburg Center', + 'id': 'loc:sc' + } + ], + 'identifier': [ + 'urn:barcode:32101071572406' + ], + 'requestable': [ + true + ], + 'owner_packed': [ + 'orgs:1114||Schomburg Center for Research in Black Culture, Jean Blackwell Hutson Research and Reference Division' + ], + 'status': [ + { + 'label': 'Available', + 'id': 'status:a' + } + ], + 'holdingLocation': [ + { + 'label': 'Schomburg Center - Research & Reference', + 'id': 'loc:scff2' + } + ], + 'status_packed': [ + 'status:a||Available' + ] + }, + { + 'holdingLocation_packed': [ + 'loc:scff2||Schomburg Center - Research & Reference' + ], + 'suppressed': [ + false + ], + 'shelfMark': [ + 'Sc D 90-863' + ], + 'accessMessage_packed': [ + 'accessMessage:1||USE IN LIBRARY' + ], + 'uri': 'i10283665777', + 'accessMessage': [ + { + 'label': 'USE IN LIBRARY', + 'id': 'accessMessage:1' + } + ], + 'catalogItemType': [ + { + 'id': 'catalogItemType:2', + 'label': 'book non-circ' + } + ], + 'deliveryLocation_packed': [ + 'loc:sc||Schomburg Center' + ], + 'owner': [ + { + 'label': 'Schomburg Center for Research in Black Culture, Jean Blackwell Hutson Research and Reference Division', + 'id': 'orgs:1114' + } + ], + 'deliveryLocation': [ + { + 'label': 'Schomburg Center', + 'id': 'loc:sc' + } + ], + 'identifier': [ + 'urn:barcode:32101071572406777' + ], + 'requestable': [ + true + ], + 'owner_packed': [ + 'orgs:1114||Schomburg Center for Research in Black Culture, Jean Blackwell Hutson Research and Reference Division' + ], + 'status': [ + { + 'label': 'Not Available', + 'id': 'status:na' + } + ], + 'holdingLocation': [ + { + 'label': 'Schomburg Center - Research & Reference', + 'id': 'loc:scff2' + } + ], + 'status_packed': [ + 'status:na||Not Available' + ] + }, + { + 'holdingLocation': [ + { + 'label': 'OFFSITE - Request in Advance', + 'id': 'loc:rc2ma' + } + ], + 'status_packed': [ + 'status:na||Not Available' + ], + 'owner': [ + { + 'id': 'orgs:1000', + 'label': 'Stephen A. Schwarzman Building' + } + ], + 'deliveryLocation': [ + { + 'id': 'loc:mala', + 'label': 'SASB - Allen Scholar Room' + } + ], + 'deliveryLocation_packed': [ + 'loc:mala||SASB - Allen Scholar Room' + ], + 'uri': 'i10283664', + 'accessMessage_packed': [ + 'accessMessage:2||ADV REQUEST' + ], + 'accessMessage': [ + { + 'id': 'accessMessage:2', + 'label': 'ADV REQUEST' + } + ], + 'status': [ + { + 'id': 'status:na', + 'label': 'Not available' + } + ], + 'owner_packed': [ + 'orgs:1000||Stephen A. Schwarzman Building' + ], + 'requestable': [ + false + ], + 'identifier': [ + 'urn:barcode:1000546836' + ], + 'holdingLocation_packed': [ + 'loc:rc2ma||OFFSITE - Request in Advance' + ], + 'shelfMark': [ + '*OFC 90-2649' + ], + 'suppressed': [ + false + ] + }, + { + 'holdingLocation': [ + { + 'label': 'OFFSITE - Request in Advance', + 'id': 'loc:rc2ma' + } + ], + 'status_packed': [ + 'status:a||Available' + ], + 'owner': [ + { + 'id': 'orgs:1000', + 'label': 'Stephen A. Schwarzman Building' + } + ], + 'deliveryLocation': [ + { + 'id': 'loc:mala', + 'label': 'SASB - Allen Scholar Room' + } + ], + 'deliveryLocation_packed': [ + 'loc:mala||SASB - Allen Scholar Room' + ], + 'uri': 'i102836649', + 'recapCustomerCode': [], + 'accessMessage_packed': [ + 'accessMessage:2||ADV REQUEST' + ], + 'accessMessage': [ + { + 'id': 'accessMessage:2', + 'label': 'ADV REQUEST' + } + ], + 'status': [ + { + 'id': 'status:a', + 'label': 'Available' + } + ], + 'owner_packed': [ + 'orgs:1000||Stephen A. Schwarzman Building' + ], + 'requestable': [ + false + ], + 'identifier': [ + 'urn:barcode:10005468369' + ], + 'holdingLocation_packed': [ + 'loc:rc2ma||OFFSITE - Request in Advance' + ], + 'shelfMark': [ + '*OFC 90-2649 2' + ], + 'suppressed': [ + false + ] + }, + { + 'holdingLocation': [ + { + 'label': 'OFFSITE - Request in Advance', + 'id': 'loc:dya0f' + } + ], + 'status_packed': [ + 'status:a||Available' + ], + 'owner': [ + { + 'id': 'orgs:1000', + 'label': 'Stephen A. Schwarzman Building' + } + ], + 'deliveryLocation': [ + { + 'id': 'loc:mala', + 'label': 'SASB - Allen Scholar Room' + } + ], + 'deliveryLocation_packed': [ + 'loc:mala||SASB - Allen Scholar Room' + ], + 'uri': 'i102836659', + 'recapCustomerCode': [], + 'accessMessage_packed': [ + 'accessMessage:2||ADV REQUEST' + ], + 'accessMessage': [ + { + 'id': 'accessMessage:2', + 'label': 'ADV REQUEST' + } + ], + 'status': [ + { + 'id': 'status:a', + 'label': 'Available' + } + ], + 'owner_packed': [ + 'orgs:1000||Stephen A. Schwarzman Building' + ], + 'requestable': [ + false + ], + 'identifier': [ + 'urn:barcode:10005468369' + ], + 'holdingLocation_packed': [ + 'loc:dya0f||OFFSITE - Request in Advance' + ], + 'shelfMark': [ + '*OFC 90-2649 2' + ], + 'suppressed': [ + false + ] + }, + { + 'holdingLocation': [ + { + 'label': 'OFFSITE - Request in Advance (unrequestable location)', + 'id': 'loc:rcpd8' + } + ], + 'status_packed': [ + 'status:a||Available' + ], + 'owner': [ + { + 'id': 'orgs:1000', + 'label': 'Stephen A. Schwarzman Building' + } + ], + 'uri': 'i102836649-unrequestable', + 'accessMessage_packed': [ + 'accessMessage:2||ADV REQUEST' + ], + 'accessMessage': [ + { + 'id': 'accessMessage:2', + 'label': 'ADV REQUEST' + } + ], + 'status': [ + { + 'id': 'status:a', + 'label': 'Available' + } + ], + 'owner_packed': [ + 'orgs:1000||Stephen A. Schwarzman Building' + ], + 'requestable': [ + false + ], + 'identifier': [ + 'urn:barcode:10005468369' + ], + 'holdingLocation_packed': [ + 'loc:rcpd8||OFFSITE - Request in Advance' + ], + 'shelfMark': [ + '*OFC 90-2649 2' + ], + 'suppressed': [ + false + ] + } + ], + 'message': 'ResourceSerializer#serialize', + 'materialType_packed': [ + 'resourcetypes:txt||Text' + ], + 'suppressed': [ + 'false' + ], + 'placeOfPublication': [ + 'New York :' + ], + 'dateEndString': [ + '1984' + ], + 'title_sort': [ + 'the thief and the dogs' + ], + 'uris': [ + 'b11293188', + 'b11293188-i22566485', + 'b11293188-i22566489', + 'b11293188-i10283665', + 'b11293188-i10283664' + ], + 'language': [ + { + 'id': 'lang:eng', + 'label': 'English' + } + ], + 'dateString': [ + '1989' + ], + 'identifier': [ + 'urn:bnum:11293188', + 'urn:oclc:12248278', + 'urn:lcc:PJ7846.A46', + 'urn:lccCoarse:PJ7695.8-7976' + ], + 'publisher': [ + 'Doubleday,' + ], + 'type': [ + 'nypl:Item' + ], + 'createdYear': [ + 1989 + ], + 'contributor_sort': [ + 'badawī, muḥammad muṣṭafá.' + ], + 'materialType': [ + { + 'id': 'resourcetypes:txt', + 'label': 'Text' + } + ], + 'numAvailable': [ + 2 + ], + 'dimensions': [ + '22 cm.' + ], + 'carrierType_packed': [ + 'carriertypes:nc||volume' + ], + 'note': [ + 'Translation of: al-Liṣṣ wa-al-kilāb.' + ], + 'dateStartYear': [ + 1989 + ], + 'shelfMark': [ + '*OFC 90-2649' + ], + 'idOwi': [ + 'urn:owi:58201773' + ], + 'mediaType': [ + { + 'label': 'unmediated', + 'id': 'mediatypes:n' + } + ], + 'title': [ + 'The thief and the dogs', + 'The thief and the dogs /' + ], + 'titleAlt': [ + 'Liṣṣ wa-al-kilāb.' + ], + 'language_packed': [ + 'lang:eng||English' + ], + 'mediaType_packed': [ + 'mediatypes:n||unmediated' + ], + 'titleDisplay': [ + 'The thief and the dogs / Naguib Mahfouz ; translated by Trevor Le Gassick, M.M. Badawi ; revised by John Rodenbeck.' + ], + 'uri': 'b11293188', + 'extent': [ + '158 p. ;' + ], + 'carrierType': [ + { + 'id': 'carriertypes:nc', + 'label': 'volume' + } + ], + 'issuance_packed': [ + 'urn:biblevel:m||monograph/item' + ], + 'contributorLiteral': [ + 'Badawī, Muḥammad Muṣṭafá.', + 'Le Gassick, Trevor.', + 'Rodenbeck, John.' + ], + 'dateEndYear': [ + 1984 + ] + }, + '_type': 'resource', + '_index': 'resources-2017-06-13', + '_score': 154.93451 + } + ] + }, + 'timed_out': false + } +} + +exports.fakeElasticSearchResponseCulItem = () => { + return { + '_shards': { + 'failed': 0, + 'successful': 1, + 'total': 1 + }, + 'took': 1, + 'hits': { + 'total': 1, + 'max_score': 1.3862944, + 'hits': [ + { + '_type': 'resource', + '_id': 'cb1000077', + '_source': { + 'extent': [ + 'iii, 332 leaves, bound.' + ], + 'note': [ + { + 'noteType': 'Thesis', + 'label': 'Thesis (Ph. D.)--Columbia University, 1989.', + 'type': 'bf:Note' + }, + { + 'noteType': 'Bibliography', + 'label': 'Includes bibliographical references (leaves 314-332).', + 'type': 'bf:Note' + } + ], + 'language': [ + { + 'label': 'English', + 'id': 'lang:eng' + } + ], + 'createdYear': [ + 1989 + ], + 'title': [ + 'Urbanism as a way of writing : Chicago urban sociology and Chicago urban literature, 1915-1945 / Carla Sofia Cappetti.' + ], + 'type': [ + 'nypl:Item' + ], + 'createdString': [ + '1989' + ], + 'creatorLiteral': [ + 'Cappetti, Carla Sofia.' + ], + 'materialType_packed': [ + 'resourcetypes:txt||Text' + ], + 'language_packed': [ + 'lang:eng||English' + ], + 'dateStartYear': [ + 1989 + ], + 'identifierV2': [ + { + 'type': 'nypl:Bnumber', + 'value': '1000077' + } + ], + 'carrierType_packed': [ + 'carriertypes:nc||volume' + ], + 'creator_sort': [ + 'cappetti, carla sofia.' + ], + 'issuance_packed': [ + 'urn:biblevel:m||monograph/item' + ], + 'updatedAt': 1523471203726, + 'publicationStatement': [ + '1989.' + ], + 'mediaType_packed': [ + 'mediatypes:n||unmediated' + ], + 'identifier': [ + 'urn:bnum:1000077' + ], + 'materialType': [ + { + 'label': 'Text', + 'id': 'resourcetypes:txt' + } + ], + 'carrierType': [ + { + 'label': 'volume', + 'id': 'carriertypes:nc' + } + ], + 'dateString': [ + '1989' + ], + 'title_sort': [ + 'urbanism as a way of writing : chicago urban sociology and chicago urban literat' + ], + 'mediaType': [ + { + 'label': 'unmediated', + 'id': 'mediatypes:n' + } + ], + 'titleDisplay': [ + 'Urbanism as a way of writing : Chicago urban sociology and Chicago urban literature, 1915-1945 / Carla Sofia Cappetti.' + ], + 'uri': 'cb1000077', + 'numItems': [ + 1 + ], + 'numAvailable': [ + 1 + ], + 'uris': [ + 'cb1000077', + 'cb1000077-ci1455504' + ], + 'issuance': [ + { + 'label': 'monograph/item', + 'id': 'urn:biblevel:m' + } + ], + 'items': [ + { + 'owner': [ + { + 'label': 'Columbia University Libraries', + 'id': 'orgs:0002' + } + ], + 'accessMessage_packed': [ + 'accessMessage:1||Use in library' + ], + 'identifier': [ + 'urn:barcode:1000020117' + ], + 'catalogItemType_packed': [ + 'catalogItemType:1||non-circ' + ], + 'accessMessage': [ + { + 'label': 'Use in library', + 'id': 'accessMessage:1' + } + ], + 'status_packed': [ + 'status:a||Available ' + ], + 'shelfMark': [ + 'LD1237.5D 1989 .C166' + ], + 'uri': 'ci1455504', + 'recapCustomerCode': [], + 'identifierV2': [ + { + 'type': 'bf:ShelfMark', + 'value': 'LD1237.5D 1989 .C166' + }, + { + 'type': 'bf:Barcode', + 'value': '1000020117' + } + ], + 'idBarcode': [ + '1000020117' + ], + 'owner_packed': [ + 'orgs:0002||Columbia University Libraries' + ], + 'requestable': [ + true + ], + 'catalogItemType': [ + { + 'label': 'non-circ', + 'id': 'catalogItemType:1' + } + ], + 'status': [ + { + 'label': 'Available ', + 'id': 'status:a' + } + ] + }, + { + 'owner': [ + { + 'label': 'Columbia University Libraries', + 'id': 'orgs:0002' + } + ], + 'accessMessage_packed': [ + 'accessMessage:1||Use in library' + ], + 'identifier': [ + 'urn:barcode:10000201179999' + ], + 'catalogItemType_packed': [ + 'catalogItemType:1||non-circ' + ], + 'accessMessage': [ + { + 'label': 'Use in library', + 'id': 'accessMessage:1' + } + ], + 'status_packed': [ + 'status:a||Available ' + ], + 'shelfMark': [ + 'LD1237.5D 1989 .C166 9999' + ], + 'uri': 'ci14555049999', + 'identifierV2': [ + { + 'type': 'bf:ShelfMark', + 'value': 'LD1237.5D 1989 .C166 9999' + }, + { + 'type': 'bf:Barcode', + 'value': '10000201179999' + } + ], + 'idBarcode': [ + '10000201179999' + ], + 'owner_packed': [ + 'orgs:0002||Columbia University Libraries' + ], + 'requestable': [ + true + ], + 'catalogItemType': [ + { + 'label': 'non-circ', + 'id': 'catalogItemType:1' + } + ], + 'status': [ + { + 'label': 'Available ', + 'id': 'status:a' + } + ] + } + ] + } + } + ] + } + } +} diff --git a/test/requestability_resolver.test.js b/test/requestability_resolver.test.js index 164a2a45..47e40f6b 100644 --- a/test/requestability_resolver.test.js +++ b/test/requestability_resolver.test.js @@ -3,6 +3,7 @@ const elasticSearchResponse = require('./fixtures/elastic_search_response.js') const specRequestableElasticSearchResponse = require('./fixtures/specRequestable-es-response') const eddElasticSearchResponse = require('./fixtures/edd_elastic_search_response') const noBarcodeResponse = require('./fixtures/no_barcode_es_response') +const noRecapResponse = require('./fixtures/no_recap_response') describe('RequestabilityResolver', () => { describe('fixItemRequestability', function () { @@ -203,4 +204,22 @@ describe('RequestabilityResolver', () => { expect(nonEddItem.eddRequestable).to.equal(false) }) }) + + describe('Missing recapCustomerCode', function () { + const response = noRecapResponse.fakeElasticSearchResponseNyplItem() + const resolved = RequestabilityResolver.fixItemRequestability(response) + it('marks edd and physical requestability correctly', function () { + const items = resolved.hits.hits[0]._source.items + const firstItem = items.find((item) => { + return item.uri === 'i102836649' + }) + const secondItem = 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) + }) + }) }) From 985f5930fa890f5f9ff856ed99c7f8f74cc5238f Mon Sep 17 00:00:00 2001 From: danamansana Date: Tue, 28 May 2024 13:26:18 -0400 Subject: [PATCH 4/4] Add explanatory comments --- lib/delivery-locations-resolver.js | 3 +++ test/delivery-locations-resolver.test.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/delivery-locations-resolver.js b/lib/delivery-locations-resolver.js index a4bd279a..60539bbb 100644 --- a/lib/delivery-locations-resolver.js +++ b/lib/delivery-locations-resolver.js @@ -240,6 +240,9 @@ class DeliveryLocationsResolver { const nyplItem = isItemNyplOwned(item) if (!hasRecapCustomerCode) { const requestableBasedOnHoldingLocation = nyplItem ? this.requestableBasedOnHoldingLocation(item) : true + // the length of the list of delivery locations is checked later to determine physical requestability + // In case of an offsite item with no recap customer code, we want this to be based on holding location + // so we put a placeholder '' in case it is requestable based on holding location deliveryLocation = requestableBasedOnHoldingLocation ? [''] : [] eddRequestable = requestableBasedOnHoldingLocation } else if (!nyplItem || this.requestableBasedOnHoldingLocation(item)) { diff --git a/test/delivery-locations-resolver.test.js b/test/delivery-locations-resolver.test.js index e82c434a..dca24d2c 100644 --- a/test/delivery-locations-resolver.test.js +++ b/test/delivery-locations-resolver.test.js @@ -512,7 +512,7 @@ describe('Delivery-locations-resolver', function () { expect(resolved.eddRequestable).to.equal(false) }) - it('returns empty deliveryLocation and eddRequestable true based on holding location when missing recapCustomerCode', function () { + it('returns empty string delivery location and eddRequestable true based on holding location when missing recapCustomerCode', function () { const resolved = DeliveryLocationsResolver.getRecapDeliveryInfo({ holdingLocation: [{ id: 'loc:rcpm2' }], uri: 'i14747243'