test gha

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/test-and-deploy.yml

@@ -15,13 +15,33 @@ jobs:
         run: npm ci
       - name: Unit Tests
         run: npm test
-  deploy-qa:
+  integration-test-qa:
     permissions:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
     needs: tests
     if: github.ref == 'refs/heads/qa'
+    steps: 
+      - uses: actions/checkout@v4
+      - name: Set Node version
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install dependencies
+        run: npm ci
+      - name: Start service
+        run: ENV=qa npm start &
+      - name: Run tests
+        run: npm run test-integration
+  deploy-qa:
+    permissions:
+      id-token: write
+      contents: read
+    runs-on: ubuntu-latest
+    needs: 
+      - tests
+    if: github.ref == 'refs/heads/qa'
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -31,7 +51,6 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
           aws-region: us-east-1
-
       - name: Log in to ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v1
@@ -60,7 +79,9 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: tests
+    needs: 
+      - tests
+      - inte
     if: github.ref == 'refs/heads/qa2'
     steps:
       - name: Checkout repo

app.js

@@ -33,6 +33,7 @@ app.init = async () => {
 
   require('./lib/resources')(app)
   require('./lib/subjects')(app)
+  require('./lib/contributors')(app)
   require('./lib/vocabularies')(app)
 
   // routes

config/qa.env

@@ -1,6 +1,7 @@
 ENCRYPTED_ELASTICSEARCH_URI=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAJYwgZMGCSqGSIb3DQEHBqCBhTCBggIBADB9BgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMIkDoQ9C/cCDCAq1wIBEIBQ+L3OgUGeOW9rs1CWkhpBjwM4LbbVRFIWedqew4UXIeSNMJ8cO9SNe4YGCUIoKwCDYt7W7ip3VtDRRRMVvz6QJw+Eg8ugTMVs2pbNFGNvaAQ=
-RESOURCES_INDEX=resources-2025-07-07
-SUBJECTS_INDEX=browse-qa-2025-10-27
+
+ENCRYPTED_RESOURCES_INDEX=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAHIwcAYJKoZIhvcNAQcGoGMwYQIBADBcBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDPMBVNbSFDq16QAs4AIBEIAvHrJZjGewR7g4oT5oifQUDGTj2SgYibnrhU05uBatHEVYz/mOawAVrjt/1oxPqv4=
+BROWSE_INDEX=browse-qa-2026-01-15
 ENCRYPTED_ELASTICSEARCH_API_KEY=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAJ4wgZsGCSqGSIb3DQEHBqCBjTCBigIBADCBhAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAx+kryf2KUmGdBYD9sCARCAV3ygz3eXIdq8JX/wpG9JRWlTNMRcpNE1qT0zNlN4t+ZvXEoedLQa/3p1YjgHw06GIAdA9xtkMV4eH9a1K8uCvjP8XxxNKekcMj59TlResnu9QF3r7pGXuQ==
 
 ENCRYPTED_SCSB_URL=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAH8wfQYJKoZIhvcNAQcGoHAwbgIBADBpBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDBKllElmWYLxGOGopQIBEIA8JJyKde/8m8iCJGKR5D8HoTJhXHeyvw9eIDeuUNKiXLfJwoVz+PDAZSxkCQtM9O91zGhXbe3l6Bk1RlYJ

config/test.env

@@ -1,6 +1,6 @@
 ELASTICSEARCH_URI=encrypted-elasticsearch-uri
 RESOURCES_INDEX=test-resources-index
-SUBJECTS_INDEX=test-subjects-index
+BROWSE_INDEX=test-browse-index
 
 SCSB_URL=encrypted-scsb-url
 SCSB_API_KEY=encrypted-scsb-api-key
@@ -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.35
+NYPL_CORE_VERSION=v2.37
 
 LOG_LEVEL=error
 FEATURES=on-site-edd

data/marc-rules.json

@@ -0,0 +1,62 @@
+[
+  {
+    "marcIndicatorRegExp": "3610 ",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "365..",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "5410.",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "541 .",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "5420 ",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "5610.",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "561 .",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "5830.",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "583 .",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  },
+  {
+    "marcIndicatorRegExp": "5900.",
+    "subfieldSpec": { "subfields": [], "directive": "include" },
+    "label": "",
+    "directive": "exclude"
+  }
+]

data/onsite-edd-criteria.json

@@ -74,9 +74,6 @@
     "par",
     "pat",
     "pat22",
-    "pat32",
-    "scf",
-    "scff2",
-    "scff3"
+    "pat32"
   ]
 }

lib/annotated-marc-serializer.js

@@ -37,6 +37,7 @@
 
 const arrayUnique = require('./util').arrayUnique
 const relatorMappings = require('../data/relator-mappings.json')
+const { varFieldMatches, buildSourceWithMasking } = require('./marc-util')
 
 class AnnotatedMarcSerializer {
 }
@@ -133,32 +134,13 @@ AnnotatedMarcSerializer.matchingMarcFields = function (bib, rule) {
  *
  * @return {boolean}
  */
-AnnotatedMarcSerializer.varFieldMatches = function (field, rule) {
-  const fieldMarcIndicator = `${field.marcTag}${field.ind1 || ' '}${field.ind2 || ' '}`
-  return rule.marcIndicatorRegExp.test(fieldMarcIndicator) &&
-    rule.fieldTag === field.fieldTag
-}
+AnnotatedMarcSerializer.varFieldMatches = varFieldMatches
 
 /**
  *  Given a varField, returns a copy with any hidden subfield content replaced
  *  with "[redacted]" based on given rule
  */
-AnnotatedMarcSerializer.buildSourceWithMasking = function (field, rule) {
-  return Object.assign({}, field, {
-    subfields: (field.subfields || [])
-      .map((subfield) => {
-        let subfieldContent = subfield.content
-        // If directive is 'include' and subfield not included
-        // .. or directive is 'exclude', but subfield included,
-        // [redact] it:
-        if ((rule.subfieldSpec.directive === 'include' && rule.subfieldSpec.subfields.indexOf(subfield.tag) < 0) ||
-          (rule.subfieldSpec.directive === 'exclude' && rule.subfieldSpec.subfields.indexOf(subfield.tag) >= 0)) {
-          subfieldContent = '[redacted]'
-        }
-        return Object.assign({}, subfield, { content: subfieldContent })
-      })
-  })
-}
+AnnotatedMarcSerializer.buildSourceWithMasking = buildSourceWithMasking
 
 /**
  *  Get prefix for a marctag & subfield, given a previous subfield (if avail.)
@@ -322,7 +304,7 @@ AnnotatedMarcSerializer.addStatementsForVarFieldForRule = function (doc, bib, va
             .pop()
         }
       })
-      .filter((parallel) => parallelNumbers.some((parallelNumber) => parallel.linkingValue.indexOf(parallelNumber) === 4))
+      .filter((parallel) => parallelNumbers.some((parallelNumber) => parallel.linkingValue?.indexOf(parallelNumber) === 4))
       .map((parallel) => parallel.field)
 
     if (matchingParallels.length > 0) {

lib/availability_resolver.js

@@ -3,7 +3,7 @@ const logger = require('./logger')
 const ResourceSerializer = require('./jsonld_serializers').ResourceSerializer
 const NyplSourceMapper = require('research-catalog-indexer/lib/utils/nypl-source-mapper')
 const { nonRecapItemStatusAggregation } = require('./elasticsearch/client')
-const { deepValue, isInRecap } = require('./util')
+const { deepValue, isInRecap, barcodeFromItem } = require('./util')
 
 const ITEM_STATUSES = {
   available: {
@@ -264,7 +264,7 @@ class AvailabilityResolver {
     const item = this.elasticSearchResponse.hits.hits[0]._source.items[0]
     // If it's an electronic item or a non-recap item, skip it
     if (item.electronicLocator || !isInRecap(item)) return Promise.resolve()
-    const barcode = this._getItemBarcode(item)
+    const barcode = barcodeFromItem(item)
     if (!barcode) return Promise.resolve()
 
     return scsbClient.recapCustomerCodeByBarcode(barcode)
@@ -292,7 +292,7 @@ class AvailabilityResolver {
         // Only need to calculate recap item availability because nypl-owned records
         // status is updated elsewhere.
         if (_isInRecap) {
-          const barcode = this._getItemBarcode(item)
+          const barcode = barcodeFromItem(item)
           const recapAvailabilityStatus = barcodesAndAvailability[barcode]
           if (recapAvailabilityStatus === 'Available') {
             item.status[0].id = ITEM_STATUSES.available.id
@@ -310,19 +310,6 @@ class AvailabilityResolver {
       })
     }
   }
-
-  _getItemBarcode (item) {
-    // TODO: This is an awkward use of .reduce. Should prob use .find
-    return (item.identifier || []).reduce((_, identifier) => {
-      // Rolling forward, some identifiers will be serialized as entities.
-      // For now, let's convert them back to urn-style:
-      identifier = ResourceSerializer.prototype._ensureIdentifierIsUrnStyle(identifier)
-      if (identifier.split(':').length === 3 && identifier.split(':')[1] === 'barcode') {
-        return identifier.split(':')[2]
-      }
-      return null
-    }, null)
-  }
 } // end class
 
 module.exports = AvailabilityResolver

lib/contributors.js

@@ -0,0 +1,121 @@
+const { parseBrowseParams } = require('./elasticsearch/browse-utils')
+
+const ApiRequest = require('./api-request')
+const ElasticQueryBrowseBuilder = require('./elasticsearch/elastic-query-browse-builder')
+
+const BROWSE_INDEX = process.env.BROWSE_INDEX
+
+const parseNameAndRole = (delimitedString) => {
+  if (!delimitedString.includes('|')) {
+    return { name: delimitedString, role: null }
+  }
+  const [name, role] = delimitedString.split('|')
+  return { name, role }
+}
+
+module.exports = function (app, _private = null) {
+  app.contributors = {}
+
+  app.contributors.browse = function (params, opts, request) {
+    app.logger.debug('Unparsed params: ', params)
+    params = parseBrowseParams(params)
+
+    app.logger.debug('Parsed params: ', params)
+
+    const body = buildElasticContributorsBody(params)
+
+    app.logger.debug('Contrbutors#browse', BROWSE_INDEX, body)
+
+    return app.esClient.search(body, process.env.BROWSE_INDEX)
+      .then((resp) => {
+        return {
+          '@type': 'contributorList',
+          page: params.page,
+          per_page: params.per_page,
+          totalResults: resp.hits?.total?.value,
+          contributors: resp.hits?.hits?.reduce((workingResponse, hit) => {
+            if (hit.matched_queries?.[0] === 'preferredTerm' || hit.matched_queries?.[0] === 'preferredTermPrefix') { // if match is on preferredTerm, use that regardless of variant matches
+              const { name, role } = parseNameAndRole(hit._source.preferredTerm)
+
+              let contributorData = workingResponse.find(item => item.termLabel === name)
+
+              if (!contributorData) {
+                contributorData = {
+                  '@type': 'preferredTerm',
+                  termLabel: name
+                }
+                workingResponse.push(contributorData)
+              }
+
+              if (role) {
+                // just add the role count to the top level response
+                const roleCount = { role, count: hit._source.count }
+                if (!contributorData.roleCounts) {
+                  contributorData.roleCounts = []
+                }
+                contributorData.roleCounts.push(roleCount)
+              } else {
+                // top-level contributor object
+                contributorData.count = hit._source.count
+                contributorData.broaderTerms = hit._source.broaderTerms?.map((term) => ({ termLabel: term }))
+                contributorData.narrowerTerms = hit._source.narrowerTerms?.map((term) => ({ termLabel: term }))
+                contributorData.seeAlso = hit._source.seeAlso?.map((term) => ({ termLabel: term }))
+                contributorData.uri = hit._source.uri
+              }
+            } else {
+              // Match was on a variant- use that in the response
+              const matchedVariantTerm = hit.inner_hits.variants.hits.hits[0]._source.variant
+
+              const variantData = {
+                '@type': 'variant',
+                termLabel: matchedVariantTerm,
+                preferredTerms: [
+                  {
+                    termLabel: hit._source.preferredTerm,
+                    count: hit._source.count
+                  }
+                ]
+              }
+
+              workingResponse.push(variantData)
+            }
+
+            return workingResponse
+          }, [])
+        }
+      })
+  }
+
+  // For unit testing
+  if (_private && typeof _private === 'object') {
+    _private.buildElasticContributorsBody = buildElasticContributorsBody
+    _private.parseBrowseParams = parseBrowseParams
+  }
+}
+
+/**
+ *  Given GET params, returns a plainobject with `from`, `size`, `query`,
+ *  `sort`, and any other params necessary to perform the ES query based
+ *  on the GET params.
+ *
+ *  @return {object} An object that can be posted directly to ES
+ */
+const buildElasticContributorsBody = function (params) {
+  const body = {
+    from: (params.per_page * (params.page - 1)),
+    size: params.per_page
+  }
+
+  const request = ApiRequest.fromParams(params)
+  const builder = ElasticQueryBrowseBuilder.forApiRequest(request)
+
+  body.query = builder.query.toJson()
+
+  // match only termType 'contributor'
+  body.query.bool.must.push({ term: { termType: { value: 'contributor' } } })
+
+  // Exclude items that have count == 0
+  body.query.bool.must.push({ range: { count: { gt: 0 } } })
+
+  return body
+}