MMT-3408: Better test URLs, throw error when required field is missin…

…g, add util to check for draft concept ids
nasa · Oct 23, 2023 · 33b3e90 · 33b3e90
1 parent 5b9e432
commit 33b3e90
Show file tree

Hide file tree

Showing 40 changed files with 379 additions and 308 deletions.
diff --git a/src/cmr/concepts/__tests__/concept.test.js b/src/cmr/concepts/__tests__/concept.test.js
@@ -1,20 +1,10 @@
 import Concept from '../concept'
 
 describe('collection', () => {
-  const OLD_ENV = process.env
-
   beforeEach(() => {
     jest.resetAllMocks()
 
     jest.restoreAllMocks()
-
-    process.env = { ...OLD_ENV }
-
-    process.env.cmrRootUrl = 'http://example.com'
-  })
-
-  afterEach(() => {
-    process.env = OLD_ENV
   })
 
   describe('concept', () => {

diff --git a/src/cmr/concepts/__tests__/draft.test.js b/src/cmr/concepts/__tests__/draft.test.js
@@ -1,20 +1,10 @@
 import Draft from '../draft'
 
 describe('Draft concept', () => {
-  const OLD_ENV = process.env
-
   beforeEach(() => {
     jest.resetAllMocks()
 
     jest.restoreAllMocks()
-
-    process.env = { ...OLD_ENV }
-
-    process.env.cmrRootUrl = 'http://example.com'
-  })
-
-  afterEach(() => {
-    process.env = OLD_ENV
   })
 
   describe('Draft concept', () => {

diff --git a/src/cmr/concepts/__tests__/service.test.js b/src/cmr/concepts/__tests__/service.test.js
@@ -1,20 +1,10 @@
 import Service from '../service'
 
 describe('Service concept', () => {
-  const OLD_ENV = process.env
-
   beforeEach(() => {
     jest.resetAllMocks()
 
     jest.restoreAllMocks()
-
-    process.env = { ...OLD_ENV }
-
-    process.env.cmrRootUrl = 'http://example.com'
-  })
-
-  afterEach(() => {
-    process.env = OLD_ENV
   })
 
   describe('Service concept', () => {

diff --git a/src/cmr/concepts/draft.js b/src/cmr/concepts/draft.js
@@ -107,6 +107,11 @@ export default class Draft extends Concept {
    */
   ingest(data, requestedKeys, providedHeaders) {
     const { ummVersion } = data
+
+    if (!ummVersion) {
+      throw new Error('`ummVersion` is required when ingesting drafts.')
+    }
+
     // Default headers
     const defaultHeaders = {
       Accept: 'application/json',

diff --git a/src/constants/index.js b/src/constants/index.js
@@ -22,3 +22,13 @@ export const CONCEPT_TYPES = [
 export const PSEUDO_FIELDS = [
   'maxItemsPerOrder'
 ]
+
+/**
+ * Draft concept ID prefixes
+ */
+export const DRAFT_CONCEPT_ID_PREFIXES = {
+  collection: 'CD',
+  service: 'SD',
+  tool: 'TD',
+  variable: 'VD'
+}
diff --git a/src/datasources/__tests__/collection.test.js b/src/datasources/__tests__/collection.test.js
@@ -14,7 +14,7 @@ describe('collection', () => {
 
     process.env = { ...OLD_ENV }
 
-    process.env.cmrRootUrl = 'http://example.com'
+    process.env.cmrRootUrl = 'http://example-cmr.com'
 
     // Default requestInfo
     requestInfo = {
@@ -101,7 +101,7 @@ describe('collection', () => {
     })
 
     test('returns a cursor', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -118,7 +118,7 @@ describe('collection', () => {
           }
         })
 
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -165,7 +165,7 @@ describe('collection', () => {
 
     describe('when a cursor is requested', () => {
       test('requests a cursor', async () => {
-        nock(/example/)
+        nock(/example-cmr/)
           .defaultReplyHeaders({
             'CMR-Hits': 84,
             'CMR-Took': 7,
@@ -182,7 +182,7 @@ describe('collection', () => {
             }
           })
 
-        nock(/example/)
+        nock(/example-cmr/)
           .defaultReplyHeaders({
             'CMR-Hits': 84,
             'CMR-Took': 7,
@@ -227,7 +227,7 @@ describe('collection', () => {
 
   describe('without params', () => {
     test('returns the parsed collection results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -261,7 +261,7 @@ describe('collection', () => {
 
   describe('with params', () => {
     test('returns the parsed collection results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -359,7 +359,7 @@ describe('collection', () => {
     })
 
     test('returns the parsed collection results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -375,7 +375,7 @@ describe('collection', () => {
           }
         })
 
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -468,7 +468,7 @@ describe('collection', () => {
     })
 
     test('returns the parsed collection results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -485,7 +485,7 @@ describe('collection', () => {
           }
         })
 
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -567,7 +567,7 @@ describe('collection', () => {
     })
 
     test('returns the parsed collection results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -619,7 +619,7 @@ describe('collection', () => {
   })
 
   test('catches errors received from queryCmrCollections', async () => {
-    nock(/example/)
+    nock(/example-cmr/)
       .post(/collections/)
       .reply(500, {
         errors: ['HTTP Error']

diff --git a/src/datasources/__tests__/collectionDraftProposal.test.js b/src/datasources/__tests__/collectionDraftProposal.test.js
@@ -14,7 +14,7 @@ describe('collectionDraftProposal', () => {
 
     process.env = { ...OLD_ENV }
 
-    process.env.draftMmtRootUrl = 'http://example.com'
+    process.env.draftMmtRootUrl = 'http://example-dmmt.com'
     process.env.dmmtSslCert = '-----BEGIN CERTIFICATE-----\nmock-certificate\n-----END CERTIFICATE-----'
 
     // Default requestInfo
@@ -46,7 +46,7 @@ describe('collectionDraftProposal', () => {
   })
 
   test('returns the collection draft proposal results', async () => {
-    nock(/example/)
+    nock(/example-dmmt/)
       .defaultReplyHeaders({
         'X-Request-Id': 'abcd-1234-efgh-5678'
       })
@@ -74,7 +74,7 @@ describe('collectionDraftProposal', () => {
   })
 
   test('catches errors received from draftMmtQuery', async () => {
-    nock(/example/)
+    nock(/example-dmmt/)
       .get(/api\/collection_draft_proposals/)
       .reply(500, {
         errors: ['HTTP Error']

diff --git a/src/datasources/__tests__/dataQualitySummary.test.js b/src/datasources/__tests__/dataQualitySummary.test.js
@@ -14,7 +14,7 @@ describe('dataQualitySummary', () => {
 
     process.env = { ...OLD_ENV }
 
-    process.env.cmrRootUrl = 'http://example.com'
+    process.env.cmrRootUrl = 'http://example-cmr.com'
 
     // Default requestInfo
     requestInfo = {
@@ -89,7 +89,7 @@ describe('dataQualitySummary', () => {
     })
 
     test('returns a cursor', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -127,7 +127,7 @@ describe('dataQualitySummary', () => {
 
     describe('when a cursor is requested', () => {
       test('requests a cursor', async () => {
-        nock(/example/)
+        nock(/example-cmr/)
           .defaultReplyHeaders({
             'CMR-Hits': 84,
             'CMR-Took': 7,
@@ -167,7 +167,7 @@ describe('dataQualitySummary', () => {
 
   describe('without params', () => {
     test('returns the parsed data-quality-summary results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -199,7 +199,7 @@ describe('dataQualitySummary', () => {
 
   describe('with params', () => {
     test('returns the parsed dataQuality summary results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -263,7 +263,7 @@ describe('dataQualitySummary', () => {
     })
 
     test('returns the parsed dataQualitySummary results', async () => {
-      nock(/example/)
+      nock(/example-cmr/)
         .defaultReplyHeaders({
           'CMR-Hits': 84,
           'CMR-Took': 7,
@@ -303,7 +303,7 @@ describe('dataQualitySummary', () => {
   })
 
   test('catches errors received from querying CMR for dataQualitySummaries', async () => {
-    nock(/example/)
+    nock(/example-cmr/)
       .post(/data-quality-summaries/)
       .reply(500, {
         errors: ['HTTP Error']