Merge branch 'main' into SC-5164/delivery-inegration-test

Author: charmingduchess

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

@@ -26,7 +26,7 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: integration-test
+    needs: test
     # Only run if it's one of our three deployment branches
     if: contains(fromJSON('["qa", "qa2", "production"]'), github.ref_name)
     steps:

lib/elasticsearch/config.js

@@ -125,8 +125,6 @@ const AGGREGATIONS_SPEC = {
   buildingLocation: { terms: { field: 'buildingLocationIds' } },
   subjectLiteral: { terms: { field: 'subjectLiteral.raw' } },
   language: { terms: { field: 'language_packed' } },
-  contributorLiteral: { terms: { field: 'contributorLiteral.raw' } },
-  creatorLiteral: { terms: { field: 'creatorLiteral.raw' } },
   collection: { terms: { field: 'collectionIds' } }
 }
 

test/resources.test.js

@@ -250,7 +250,7 @@ describe('Resources query', function () {
         q: 'toast',
         filters: {
           subjectLiteral: ['S1'],
-          contributorLiteral: ['C1', 'C2']
+          collection: ['C1', 'C2']
         }
       })
       const queries = resourcesPrivMethods.aggregationQueriesForParams(params)
@@ -260,27 +260,27 @@ describe('Resources query', function () {
       expect(Object.keys(queries[0].aggregations)).to.have.lengthOf(numAggregations - 2)
       expect(queries[0].query.bool.filter).to.be.a('array')
       // Expect the subjectLiteral filter:
-      expect(queries[0].query.bool.filter[0].term['subjectLiteral.raw'] === 'S1')
-      // .. And the contributorLiteral filters:
-      expect(queries[0]).to.nested.include({ 'query.bool.filter[1].bool.should[0].bool.should[0].term.contributorLiteral\\.keywordLowercased': 'C1' })
-      expect(queries[0]).to.nested.include({ 'query.bool.filter[1].bool.should[1].bool.should[0].term.contributorLiteral\\.keywordLowercased': 'C2' })
+      expect(queries[0].query.bool.filter[1].term['subjectLiteral.raw'] === 'S1')
+      // .. And the collection filters:
+      expect(queries[0]).to.nested.include({ 'query.bool.filter[0].bool.should[0].term.collectionIds': 'C1' })
+      expect(queries[0]).to.nested.include({ 'query.bool.filter[0].bool.should[1].term.collectionIds': 'C2' })
 
-      // Expect second aggregation for subjectLiteral:
+      // Expect second aggregation for collection:
       expect(Object.keys(queries[1].aggregations)).to.have.lengthOf(1)
-      expect(queries[1]).to.nested.include({ 'aggregations.subjectLiteral.terms.field': 'subjectLiteral.raw' })
-      // Expect this agg to filter on the other active filter, contributorLiteral:
-      expect(queries[1]).to.nested.include({ 'query.bool.filter[0].bool.should[0].bool.should[0].term.contributorLiteral\\.keywordLowercased': 'C1' })
-      expect(queries[1]).to.nested.include({ 'query.bool.filter[0].bool.should[1].bool.should[0].term.contributorLiteral\\.keywordLowercased': 'C2' })
+      expect(queries[1]).to.nested.include({ 'aggregations.collection.terms.field': 'collectionIds' })
+      // Expect this agg to filter on the other active filter, subjectLiteral:
       expect(queries[1].query.bool.filter).to.have.lengthOf(1)
-      expect(queries[1].query.bool.filter[0].bool.should).to.have.lengthOf(2)
 
-      // Expect last aggregation for contributorLiteral:
+      expect(queries[1].query.bool.filter[0].term['subjectLiteral.raw'] === 'S1')
+
+      // Expect last aggregation for subjectLiteral:
       expect(Object.keys(queries[2].aggregations)).to.have.lengthOf(1)
-      expect(queries[2]).to.nested.include({ 'aggregations.contributorLiteral.terms.field': 'contributorLiteral.raw' })
-      // Expect this agg to filter on the other active filter, subjectLiteral:
+      expect(queries[2]).to.nested.include({ 'aggregations.subjectLiteral.terms.field': 'subjectLiteral.raw' })
+      // Expect this agg to filter on the other active filter, collection:
+      expect(queries[2]).to.nested.include({ 'query.bool.filter[0].bool.should[0].term.collectionIds': 'C1' })
+      expect(queries[2]).to.nested.include({ 'query.bool.filter[0].bool.should[1].term.collectionIds': 'C2' })
       expect(queries[2].query.bool.filter).to.have.lengthOf(1)
-
-      expect(queries[2].query.bool.filter[0].term['subjectLiteral.raw'] === 'S1')
+      expect(queries[2].query.bool.filter[0].bool.should).to.have.lengthOf(2)
     })
   })