Revert "Merge branch 'main' into scc-5050-2"

This reverts commit bd098d5, reversing
changes made to 5990165.

Author: danamansana

.github/dependabot.yml

@@ -15,32 +15,12 @@ jobs:
         run: npm ci
       - name: Unit Tests
         run: npm test
-  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
+    needs: tests
     if: github.ref == 'refs/heads/qa'
     steps:
       - name: Checkout repo
@@ -51,6 +31,7 @@ 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
@@ -79,8 +60,7 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs:
-      - tests
+    needs: tests
     if: github.ref == 'refs/heads/qa2'
     steps:
       - name: Checkout repo

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

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

app.js

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

config/qa.env

@@ -1,6 +1,6 @@
 ELASTICSEARCH_URI=encrypted-elasticsearch-uri
 RESOURCES_INDEX=test-resources-index
-BROWSE_INDEX=test-browse-index
+SUBJECTS_INDEX=test-subjects-index
 
 SCSB_URL=encrypted-scsb-url
 SCSB_API_KEY=encrypted-scsb-api-key

config/test.env

@@ -73,10 +73,6 @@ class ApiRequest {
     return this.params.subject_prefix
   }
 
-  hasContributorRole () {
-    return this.params.role && this.params.filters.contributorLiteral
-  }
-
   static fromParams (params) {
     return new ApiRequest(params)
   }

lib/api-request.js

@@ -124,6 +124,8 @@ 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' } }
 }
 

lib/contributors.js

@@ -92,10 +92,6 @@ class ElasticQueryBuilder {
     if (this.request.hasSubjectPrefix()) {
       this.applySubjectPrefix()
     }
-
-    if (this.request.hasContributorRole()) {
-      this.applyContributorRole()
-    }
   }
 
   /**
@@ -179,13 +175,6 @@ class ElasticQueryBuilder {
     ])
   }
 
-  /**
-   * Concat contributor + role if role param is provided
-   */
-  applyContributorRole () {
-    this.query.addMust(termMatch('contributorRoleLiteral', this.request.params.filters.contributorLiteral + '||' + this.request.params.role))
-  }
-
   /**
   * Build ES query for standard_number searches
   */