fix tests

lib/resources.js

@@ -245,10 +245,12 @@ module.exports = function (app, _private = null) {
             }
           }
         }
-        if (params.all_items) {
+        const paramsIncludesItemLevelFiltering = Object.keys(params)
+          .filter((param) => param.startsWith('item_')).length > 0
+        const returnAllItems = params.all_items && !paramsIncludesItemLevelFiltering
+        if (returnAllItems) {
           body._source.excludes = EXCLUDE_FIELDS.filter((field) => field !== '*_sort')
-        }
-        if (!params.all_items) {
+        } else {
           // No specific item requested, so add pagination and matching params:
           const itemsOptions = {
             size: params.items_size,
@@ -276,6 +278,9 @@ module.exports = function (app, _private = null) {
         return app.esClient.search(body)
           .then((resp) => {
             resp = resp.body
+            const fs = require('fs')
+            fs.writeFileSync('spaghetti.txt', JSON.stringify(resp))
+
             // Mindfully throw errors for known issues:
             if (!resp || !resp.hits) {
               throw new Error('Error connecting to index')
@@ -1218,9 +1223,9 @@ const buildElasticQueryForFilters = function (params) {
 const buildElasticQuery = function (params) {
   // Build ES query:
   const query = {}
-
-    // clean up params
-    ;['q'].forEach(function (param) {
+  const paramsArray = ['q']
+  // clean up params
+  paramsArray.forEach(function (param) {
     if (params[param]) {
       params[param] = params[param].replace(/date:/g, 'dateStartYear:')
       params[param] = params[param].replace(/location:/g, 'locations:')

lib/response_massager.js

@@ -61,10 +61,14 @@ class ResponseMassager {
 
   massagedResponse (request, options = {}) {
     let response = this.elasticSearchResponse
-    const allItemsBibQuery = request?.query?.all_items
+    const queryKeys = Object.keys(request?.params || {})
+    const itemFilterQuery = queryKeys
+      .filter((param) => param.startsWith('item_')).length > 0
+    const returnAllItems = queryKeys?.includes('all_items') &&
+      !itemFilterQuery
     // Inspect response inner_hits queries and move properties around to ease
     // serialization:
-    response = this.processInnerHitsProperties(response, allItemsBibQuery)
+    response = this.processInnerHitsProperties(response, returnAllItems)
 
     // Rename parallel fields:
     response = parallelFieldsExtractor(response)