Fix bug reading numItemsTotal from inner_hits

NYPL · Jun 10, 2024 · 1174576 · 1174576
1 parent 15a0881
commit 1174576
Show file tree

Hide file tree

Showing 66 changed files with 12,366 additions and 13,163 deletions.
diff --git a/lib/resources.js b/lib/resources.js
@@ -272,7 +272,7 @@ module.exports = function (app, _private = null) {
             // Mindfully throw errors for known issues:
             if (!resp || !resp.hits) {
               throw new Error('Error connecting to index')
-            } else if (resp && resp.hits && resp.hits.total === 0) {
+            } else if (resp?.hits?.total?.value === 0) {
               throw new errors.NotFoundError(`Record not found: ${params.uri}`)
             } else {
               const massagedResponse = new ResponseMassager(resp)

diff --git a/lib/response_massager.js b/lib/response_massager.js
@@ -27,14 +27,14 @@ class ResponseMassager {
         hit._source.items = hit.inner_hits.items.hits.hits.map((itemHit) => itemHit._source)
 
         // Grab the "items" inner_hits total as numItemsMatched:
-        hit._source.numItemsMatched = [hit.inner_hits.items.hits.total]
+        hit._source.numItemsMatched = [hit.inner_hits.items.hits.total.value]
 
         // If response includes an "allItems" inner_hits query, use the total
         // from that to get numItemsTotal. If "allItems inner_hits query
         // doesn't exist (because no item filters are in play) just use "items"
         // inner_hits query:
         const unfilteredItems = (hit.inner_hits.allItems || hit.inner_hits.items)
-        hit._source.numItemsTotal = [unfilteredItems.hits.total]
+        hit._source.numItemsTotal = [unfilteredItems.hits.total.value]
       }
       // Process "electronicResources" inner_hits
       if (hit.inner_hits && hit.inner_hits.electronicResources) {