GQL-118: Add support for retrieving a collection revision (#182)

* GQL-118a: Add support for retrieving a collection revision

* GQL-118: Update json key list, fix issue with non empty jsonKeys when revisionId

* GQL-118: Remove debug logs

* GQL-118: Fix issue with 'provider'

* GQL-118: Add test for revisionId

* GQL-118: Remove String conversion, remove error for not matching revision

* GQL-118: Refactoring

* GQL-118: Remove throwing errors for list of json fields

* GQL-118: Remove error messages for list of fields

* GQL-118: Rorder revvisionId in list of CollectionInput

* GQL-118: Add comment

* GQL-118: Add test for case of retrieving collection by revisionId

* GQL-118: Add tests

* GQL-118: Get revisionId from requestInfo, empty out jsonKeys

* GQL-118: Update test for revisionId

* GQL-118: Add test for json only field

* GQL-118: Add allRvisions to parameter list before calling cmrQuery

* GQL-118: Add Notes to json only fields

* GQL-118: Add comment

* GQL-118: Remove 'providerId' as requested

* GQL-118: Fix vulnerabilities

Author: htranho

package-lock.json

@@ -86,7 +86,7 @@
     "graphql-type-json": "^0.3.2",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.1.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "qs": "^6.12.0",
     "snakecase-keys": "^6.0.0",
     "stellate": "^2.11.1",

package.json

@@ -643,10 +643,19 @@ export default class Concept {
   fetchUmm(searchParams, requestedKeys, providedHeaders) {
     this.logKeyRequest(requestedKeys, 'umm')
 
+    const { revisionId } = this.requestInfo
+
+    const params = pick(snakeCaseKeys(searchParams), this.getPermittedUmmSearchParams())
+
+    // Add all_revisions to params if revisionId is present and all_revisions is not set
+    if (revisionId && !params.all_revisions) {
+      params.all_revisions = true
+    }
+
     // Construct the promise that will request data from the umm endpoint
     return cmrQuery({
       conceptType: this.getConceptType(),
-      params: pick(snakeCaseKeys(searchParams), this.getPermittedUmmSearchParams()),
+      params,
       nonIndexedKeys: this.getNonIndexedKeys(),
       headers: providedHeaders,
       options: {
@@ -943,6 +952,7 @@ export default class Concept {
    * @param {Array} ummKeys Array of the keys requested in the query
    */
   async parseUmm(ummResponse, ummKeys) {
+    const { revisionId } = this.requestInfo
     // Pull out the key mappings so we can retrieve the values below
     const { ummKeyMappings } = this.requestInfo
 
@@ -961,14 +971,26 @@ export default class Concept {
     items.forEach((item, itemIndex) => {
       const normalizedItem = this.normalizeUmmItem(item)
 
+      // Filter out items that don't match the requested revisionId
+      // This is necessary because the umm endpoint returns multiple revisions
+      if (revisionId && normalizedItem.meta['revision-id'].toString() !== revisionId.toString()) {
+        return
+      }
+
       // Creates unique item keys regardless of whether or not
       // a user calls for data with similar conceptIds (as is the case with revisions)
       const itemKey = this.generateUmmItemKey(itemIndex, normalizedItem)
 
       this.setEssentialUmmValues(itemKey, normalizedItem)
 
-      this.setUmmItems(item, itemKey, ummKeys, ummKeyMappings,)
+      this.setUmmItems(item, itemKey, ummKeys, ummKeyMappings)
     })
+
+    // Update the item count if we filtered out items
+    if (revisionId) {
+      const filteredItemCount = Object.keys(this.items).length
+      this.setUmmItemCount(filteredItemCount)
+    }
   }
 
   /**