GQL-34: Adds support for UMM-C v1.18.0

Author: abbottry

serverless-configs/env.yml

@@ -26,7 +26,7 @@ default_env: &default_env
     lambdaTimeout: ${env:LAMBDA_TIMEOUT, '30'}
 
     # Pinned UMM versions
-    ummCollectionVersion: '1.17.2'
+    ummCollectionVersion: '1.18.0'
     ummGranuleVersion: '1.6.5'
     ummOrderOptionVersion: '1.0.0'
     ummServiceVersion: '1.5.2'

src/resolvers/__tests__/collection.test.js

@@ -170,19 +170,43 @@ describe('Collection', () => {
               DataCenters: [],
               DataDates: [],
               DataLanguage: 'English',
+              DataMaturity: 'Validated',
               DirectDistributionInformation: {
                 region: 'us-east-2',
                 s3BucketAndObjectPrefixNames: ['TestBucketOrObjectPrefix'],
                 s3CredentialsApiEndpoint: 'https://DAACCredentialEndpoint.org',
                 s3CredentialsApiDocumentationUrl: 'https://DAACCredentialDocumentation.org'
               },
               DirectoryNames: [],
-              DOI: {},
+              DOI: {
+                DOI: '10.1234/NASA/Example.01',
+                PreviousVersion: {
+                  Version: 'A.1',
+                  Description: 'The version before this one',
+                  DOI: '10.1234/NASA/Example.02',
+                  Published: '2024-02-14T08:01:00Z'
+                }
+              },
+              FileNamingConvention: {
+                Convention: 'YYYY-MM-DD.Short-Name',
+                Description: 'ISO date followed by the short name'
+              },
               ISOTopicCategories: [],
               LocationKeywords: [],
               MetadataAssociations: [],
               MetadataDates: [],
               MetadataLanguage: 'English',
+              OtherIdentifiers: [
+                {
+                  Identifier: 'ECSE-1475-Internal',
+                  Type: 'Other',
+                  DescriptionOfOtherType: 'Jira number'
+                },
+                {
+                  Identifier: 'ECSE-1475-Internal',
+                  Type: 'ArchiveSetsNumber'
+                }
+              ],
               PaleoTemporalCoverages: [],
               Platforms: [{
                 Type: 'Not Specified',
@@ -210,10 +234,24 @@ describe('Collection', () => {
               Quality: 'Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.',
               RelatedUrls: [],
               ScienceKeywords: [],
-              SpatialExtent: {},
+              SpatialExtent: {
+                SpatialCoverageType: 'LUNAR',
+                GranuleSpatialRepresentation: 'CARTESIAN'
+              },
               SpatialInformation: {},
               StandardProduct: true,
-              TemporalExtents: [],
+              TemporalExtents: [
+                {
+                  EndsAtPresentFlag: false,
+                  SingleDateTimes: [
+                    '2024-02-14T13:14:15.000Z'
+                  ],
+                  TemporalResolution: {
+                    Unit: 'Year',
+                    Value: 42
+                  }
+                }
+              ],
               TemporalKeywords: [],
               TilingIdentificationSystems: {},
               UseConstraints: [],
@@ -238,8 +276,8 @@ describe('Collection', () => {
               ancillaryKeywords
               archiveAndDistributionInformation
               archiveCenter
-              associationDetails
               associatedDois
+              associationDetails
               boxes
               browseFlag
               cloudHosted
@@ -254,6 +292,7 @@ describe('Collection', () => {
               dataCenters
               dataDates
               dataLanguage
+              dataMaturity
               datasetId
               directDistributionInformation
               directoryNames
@@ -276,6 +315,7 @@ describe('Collection', () => {
               onlineAccessFlag
               organizations
               originalFormat
+              otherIdentifiers
               paleoTemporalCoverages
               platforms
               points
@@ -390,6 +430,7 @@ describe('Collection', () => {
             dataCenters: [],
             dataDates: [],
             dataLanguage: 'English',
+            dataMaturity: 'Validated',
             datasetId: 'Condimentum Quam Mattis Cursus Pharetra',
             directDistributionInformation: {
               region: 'us-east-2',
@@ -398,7 +439,15 @@ describe('Collection', () => {
               s3CredentialsApiDocumentationUrl: 'https://DAACCredentialDocumentation.org'
             },
             directoryNames: [],
-            doi: {},
+            doi: {
+              doi: '10.1234/NASA/Example.01',
+              previousVersion: {
+                description: 'The version before this one',
+                doi: '10.1234/NASA/Example.02',
+                published: '2024-02-14T08:01:00Z',
+                version: 'A.1'
+              }
+            },
             hasFormats: true,
             hasGranules: true,
             hasSpatialSubsetting: true,
@@ -415,6 +464,17 @@ describe('Collection', () => {
             nativeId: 'test-guid',
             nativeDataFormats: ['ASCII'],
             onlineAccessFlag: true,
+            otherIdentifiers: [
+              {
+                descriptionOfOtherType: 'Jira number',
+                identifier: 'ECSE-1475-Internal',
+                type: 'Other'
+              },
+              {
+                identifier: 'ECSE-1475-Internal',
+                type: 'ArchiveSetsNumber'
+              }
+            ],
             organizations: [],
             originalFormat: 'RISUS',
             paleoTemporalCoverages: [],
@@ -449,11 +509,25 @@ describe('Collection', () => {
             relatedUrls: [],
             scienceKeywords: [],
             shortName: 'LOREM-QUAM',
-            spatialExtent: {},
+            spatialExtent: {
+              granuleSpatialRepresentation: 'CARTESIAN',
+              spatialCoverageType: 'LUNAR'
+            },
             spatialInformation: {},
             standardProduct: true,
             tags: {},
-            temporalExtents: [],
+            temporalExtents: [
+              {
+                endsAtPresentFlag: false,
+                singleDateTimes: [
+                  '2024-02-14T13:14:15.000Z'
+                ],
+                temporalResolution: {
+                  unit: 'Year',
+                  value: 42
+                }
+              }
+            ],
             temporalKeywords: [],
             tilingIdentificationSystems: {},
             timeEnd: '2016-04-04T08:00:00.000Z',

src/types/collection.graphql

@@ -68,6 +68,9 @@ type Collection {
   "Describes the language used in the preparation, storage, and description of the collection. It is the language of the collection data themselves.   It does not refer to the language used in the metadata record (although this may be the same language)."
   dataLanguage: String
 
+  "The Data Maturity element is used to inform users on where the collection is in a collection's life cycle."
+  dataMaturity: String
+
   "This element allows end users to get direct access to data products that are stored in the Amazon Web Service (AWS) S3 buckets. The sub elements include S3 credentials end point and a documentation URL as well as bucket prefix names and an AWS region."
   directDistributionInformation: JSON
 
@@ -83,6 +86,9 @@ type Collection {
   "Entry Title"
   entryTitle: String @deprecated(reason: "Use `title`.")
 
+  "The File Naming Convention refers to the naming convention of the data set's (Collection's) data files along with a description of the granule file construction."
+  fileNamingConvention: JSON
+
   "An array containing all of the different formats of the underlying data of a collection."
   nativeDataFormats: [String]
 
@@ -131,6 +137,9 @@ type Collection {
   "Spatial coverage of the collection."
   lines: [String]
 
+  "Provides additional or provider defined identifiers of the collection."
+  otherIdentifiers: JSON
+
   "Controlled hierarchical keywords used to specify the spatial location of the collection.   The controlled vocabulary for spatial keywords is maintained in the Keyword Management System (KMS).  The Spatial Keyword hierarchy includes one or more of the following layers: Category (e.g., Continent), Type (e.g. Africa), Subregion1 (e.g., Central Africa), Subregion2 (e.g., Cameroon), and Subregion3. DetailedLocation exists outside the hierarchy."
   locationKeywords: JSON
 

src/utils/umm/collectionKeyMap.json

@@ -18,8 +18,8 @@
     "additionalAttributes": "umm.AdditionalAttributes",
     "ancillaryKeywords": "umm.AncillaryKeywords",
     "archiveAndDistributionInformation": "umm.ArchiveAndDistributionInformation",
-    "associationDetails": "meta.association-details",
     "associatedDois": "umm.AssociatedDOIs",
+    "associationDetails": "meta.association-details",
     "collectionCitations": "umm.CollectionCitations",
     "collectionProgress": "umm.CollectionProgress",
     "conceptId": "meta.concept-id",
@@ -28,10 +28,12 @@
     "dataCenters": "umm.DataCenters",
     "dataDates": "umm.DataDates",
     "dataLanguage": "umm.DataLanguage",
+    "dataMaturity": "umm.DataMaturity",
     "directDistributionInformation": "umm.DirectDistributionInformation",
     "directoryNames": "umm.DirectoryNames",
     "doi": "umm.DOI",
     "entryTitle": "umm.EntryTitle",
+    "fileNamingConvention": "umm.FileNamingConvention",
     "hasFormats": "meta.has-formats",
     "hasSpatialSubsetting": "meta.has-spatial-subsetting",
     "hasTemporalSubsetting": "meta.has-temporal-subsetting",
@@ -44,6 +46,7 @@
     "metadataLanguage": "umm.MetadataLanguage",
     "nativeDataFormats": "custom.NativeDataFormats",
     "nativeId": "meta.native-id",
+    "otherIdentifiers": "umm.OtherIdentifiers",
     "paleoTemporalCoverages": "umm.PaleoTemporalCoverages",
     "platforms": "umm.Platforms",
     "processingLevel": "umm.ProcessingLevel",