GQL-80: Adds content-type header to subscription ingest requests. Fix…

…es undefined request id in error message
nasa · Oct 4, 2024 · d2f9e08 · d2f9e08
1 parent b9548fe
commit d2f9e08
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/cmr/concepts/subscription.js b/src/cmr/concepts/subscription.js
@@ -116,7 +116,12 @@ export default class Subscription extends Concept {
     // Use the provided native id and provider id
     const { nativeId = uuidv4() } = params
 
-    super.ingest(data, requestedKeys, providedHeaders, {
+    const headers = {
+      ...providedHeaders,
+      'Content-Type': 'application/vnd.nasa.cmr.umm+json'
+    }
+
+    super.ingest(data, requestedKeys, headers, {
       path: `ingest/subscriptions/${encodeURIComponent(nativeId)}`
     })
   }

diff --git a/src/datasources/__tests__/subscription.test.js b/src/datasources/__tests__/subscription.test.js
@@ -384,6 +384,7 @@ describe('subscription#ingest', () => {
         .defaultReplyHeaders({
           'CMR-Request-Id': 'abcd-1234-efgh-5678'
         })
+        .matchHeader('Content-Type', 'application/vnd.nasa.cmr.umm+json')
         .put(/ingest\/subscriptions\/1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed/, JSON.stringify({
           CollectionConceptId: 'C100000-EDSC',
           EmailAddress: 'test@example.com',
@@ -429,6 +430,7 @@ describe('subscription#ingest', () => {
         .defaultReplyHeaders({
           'CMR-Request-Id': 'abcd-1234-efgh-5678'
         })
+        .matchHeader('Content-Type', 'application/vnd.nasa.cmr.umm+json')
         .put(/ingest\/subscriptions\/test-guid/, JSON.stringify({
           CollectionConceptId: 'C100000-EDSC',
           EmailAddress: 'test@example.com',
@@ -516,6 +518,7 @@ describe('subscription#ingest', () => {
   test('catches errors received from ingestCmr', async () => {
     nock(/example-cmr/)
       .put(/ingest\/subscriptions\/1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed/)
+      .matchHeader('Content-Type', 'application/vnd.nasa.cmr.umm+json')
       .reply(500, {
         errors: ['HTTP Error']
       }, {

diff --git a/src/graphql/handler.js b/src/graphql/handler.js
@@ -269,7 +269,8 @@ export default startServerAndCreateLambdaHandler(
         collectionLoader: new DataLoader(getCollectionsById, {
           cacheKeyFn: (obj) => obj.conceptId
         }),
-        headers: requestHeaders
+        headers: requestHeaders,
+        requestId: newRequestId
       }
     },
     middleware: [

diff --git a/src/types/subscription.graphql b/src/types/subscription.graphql
@@ -175,4 +175,6 @@ type SubscriptionMutationResponse {
   conceptId: String
   "The revision of the subscription."
   revisionId: String
+  "The native id of the subscription."
+  nativeId: String
 }