Merge branch 'main' into qa

Author: 7emansell

config/production.env

@@ -10,7 +10,7 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
 ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
 ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=
 
-NYPL_CORE_VERSION=v2.37
+NYPL_CORE_VERSION=v2.39
 
 LOG_LEVEL=info
 FEATURES=on-site-edd

config/qa.env

@@ -12,7 +12,7 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
 ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
 ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=
 
-NYPL_CORE_VERSION=v2.37
+NYPL_CORE_VERSION=v2.39
 
 LOG_LEVEL=debug
 FEATURES=on-site-edd

config/test.env

@@ -10,7 +10,7 @@ NYPL_OAUTH_URL=http://oauth.example.com
 NYPL_OAUTH_ID=encrypted-nypl-oauth-id
 NYPL_OAUTH_SECRET=encrypted-nypl-oauth-id
 
-NYPL_CORE_VERSION=v2.37
+NYPL_CORE_VERSION=v2.39
 
 LOG_LEVEL=error
 FEATURES=on-site-edd

lib/jsonld_serializers.js

@@ -301,12 +301,14 @@ ResourceSerializer.getFormattedFormat = function (formatId) {
 
 ResourceSerializer.formatCollection = function (collectionId) {
   const prefLabel = nyplCore.collections()[`nyplCollection:${collectionId}`]?.label
+  const locationsPath = nyplCore.collections()[`nyplCollection:${collectionId}`]?.locationsPath
   const buildingLocationLabel = buildingLocations.find((loc) => loc.value === collectionId.slice(0, 2))?.label
   if (!prefLabel) return null
   return {
     '@id': collectionId,
     prefLabel,
-    buildingLocationLabel
+    buildingLocationLabel,
+    locationsPath
   }
 }
 
@@ -374,10 +376,15 @@ class ItemResourceSerializer extends JsonLdItemSerializer {
         })
     }
 
+    if (this.body.holdingLocation) {
+      stmts.holdingLocation = ItemResourceSerializer.getFormattedHoldingLocation(this.body.holdingLocation)
+    }
+
     // Override default serialization of item.electronicLocator statements (full digital surrogates):
     if (this.body.electronicLocator) {
       stmts.electronicLocator = this.body.electronicLocator.map((link) => ResourceSerializer.formatElectronicResourceBlankNode(link, 'nypl:ElectronicLocation'))
     }
+
     return stmts
   }
 
@@ -386,6 +393,19 @@ class ItemResourceSerializer extends JsonLdItemSerializer {
     return (new ItemResourceSerializer(resp, options)).format()
   }
 
+  static getFormattedHoldingLocation (location) {
+    const loc = Array.isArray(location) ? location[0] : null
+    if (!loc) return []
+    const locationId = loc['@id']?.split(':')[1]
+    const sierraLocations = nyplCore.sierraLocations()
+    const collectionAccessType = sierraLocations?.[locationId]?.collectionAccessType
+    return [{
+      '@id': loc['@id'],
+      prefLabel: loc?.prefLabel,
+      collectionAccessType
+    }]
+  }
+
   // Given an item, returns item with an added `identifier`
   // of form 'urn:[sourceIdentifierPrefix]:[sourceIdentifier]'
   // e.g.

lib/vocabularies.js

@@ -17,7 +17,8 @@ module.exports = function (app, _private = null) {
       (val) => ({
         value: val.code,
         label: val.label,
-        holdingLocations: val.holdingLocations
+        holdingLocations: val.holdingLocations,
+        locationsPath: val.locationsPath
       })
     )
     return ({ formats, collections, languages: languages.values, buildingLocations })

package-lock.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "@aws-sdk/client-kms": "^3.948.0",
     "@elastic/elasticsearch": "~8.12.0",
-    "@nypl/nypl-core-objects": "3.0.4",
+    "@nypl/nypl-core-objects": "3.0.5",
     "@nypl/nypl-data-api-client": "^2.0.0",
     "@nypl/scsb-rest-client": "3.0.0",
     "dotenv": "^16.4.5",

package.json

@@ -60,7 +60,19 @@ describe('ItemResourceSerializer', () => {
       expect(doc.idNyplSourceId['@value']).to.eq('9876543210')
     })
   })
-
+  describe('getFormattedHoldingLocation', () => {
+    it('should return holding location with id, label, and collection access type', () => {
+      const locationEntity = ItemResourceSerializer.getFormattedHoldingLocation([
+        {
+          '@id': 'loc:maff1',
+          prefLabel: 'Schwarzman Building - Dorot Jewish Division Reference Room 111'
+        }
+      ])
+      expect(locationEntity[0].prefLabel).to.equal('Schwarzman Building - Dorot Jewish Division Reference Room 111')
+      expect(locationEntity[0]['@id']).to.equal('loc:maff1')
+      expect(locationEntity[0].collectionAccessType).to.equal('shelf')
+    })
+  })
   describe('addSourceIdentifier', () => {
     it('adds source identifier for NYPL', async () => {
       const item = { uri: 'i1234' }

test/item-resource-serializer.test.js

@@ -9,11 +9,13 @@ describe('Resource Serializer', () => {
         {
           '@id': 'mal',
           buildingLocationLabel: 'Stephen A. Schwarzman Building (SASB)',
+          locationsPath: 'locations/schwarzman/general-research-division',
           prefLabel: 'General Research Division'
         },
         {
           '@id': 'bur',
           buildingLocationLabel: 'Stavros Niarchos Foundation Library (SNFL)',
+          locationsPath: 'locations/snfl/yoseloff-business',
           prefLabel: 'Yoseloff Business Center'
         }
       ])
@@ -30,6 +32,7 @@ describe('Resource Serializer', () => {
       expect(collectionEntity.prefLabel).to.equal('Art & Architecture Collection')
       expect(collectionEntity['@id']).to.equal('mab')
       expect(collectionEntity.buildingLocationLabel).to.equal('Stephen A. Schwarzman Building (SASB)')
+      expect(collectionEntity.locationsPath).to.equal('locations/schwarzman/wallach-division/art-architecture-collection')
     })
   })
   describe('.formatItemFilterAggregations()', () => {

test/resource_serializer.test.js

@@ -57,6 +57,6 @@ describe('Vocabularies', function () {
 
     const results = await app.vocabularies({}, { baseUrl: app.baseUrl })
 
-    expect(results.collections[0]).to.have.keys(['value', 'label', 'holdingLocations'])
+    expect(results.collections[0]).to.have.keys(['value', 'label', 'holdingLocations', 'locationsPath'])
   })
 })