Use common header code

Author: stevebux

lambdas/api-handler/src/handlers/__tests__/get-letter-data.test.ts

@@ -20,7 +20,7 @@ import * as errors from '../../contracts/errors';
 import { createGetLetterDataHandler } from '../get-letter-data';
 import { S3Client } from '@aws-sdk/client-s3';
 import pino from 'pino';
-import { LetterRepository, MIRepository } from '../../../../../internal/datastore/src';
+import { LetterRepository } from '../../../../../internal/datastore/src';
 import { EnvVars } from '../../config/env';
 import { Deps } from "../../config/deps";
 

lambdas/api-handler/src/handlers/__tests__/get-letters.test.ts

@@ -20,7 +20,7 @@ import { ValidationError } from '../../errors';
 import * as errors from '../../contracts/errors';
 import { S3Client } from '@aws-sdk/client-s3';
 import pino from 'pino';
-import { LetterRepository, MIRepository } from '../../../../../internal/datastore/src';
+import { LetterRepository } from '../../../../../internal/datastore/src';
 import { createGetLettersHandler } from "../get-letters";
 import { Deps } from "../../config/deps";
 import { EnvVars } from '../../config/env';

lambdas/api-handler/src/handlers/__tests__/patch-letter.test.ts

@@ -21,7 +21,7 @@ import { ValidationError } from '../../errors';
 import * as errors from '../../contracts/errors';
 import { S3Client } from '@aws-sdk/client-s3';
 import pino from 'pino';
-import { LetterRepository, MIRepository } from '../../../../../internal/datastore/src';
+import { LetterRepository } from '../../../../../internal/datastore/src';
 import { EnvVars } from '../../config/env';
 import { createPatchLetterHandler } from '../patch-letter';
 import { Deps } from "../../config/deps";

lambdas/api-handler/src/handlers/__tests__/post-mi.test.ts

@@ -4,7 +4,7 @@ import { makeApiGwEvent } from "./utils/test-utils";
 import { PostMIRequest, PostMIResponse } from "../../contracts/mi";
 import * as miService from '../../services/mi-operations';
 import pino from 'pino';
-import { LetterRepository, MIRepository } from "../../../../../internal/datastore/src";
+import { MIRepository } from "../../../../../internal/datastore/src";
 import { Deps } from "../../config/deps";
 import { EnvVars } from "../../config/env";
 import { createPostMIHandler } from "../post-mi";

lambdas/api-handler/src/handlers/post-mi.ts

@@ -3,7 +3,7 @@ import { postMI as postMIOperation } from '../services/mi-operations';
 import { ApiErrorDetail } from "../contracts/errors";
 import { ValidationError } from "../errors";
 import { mapErrorToResponse } from "../mappers/error-mapper";
-import { assertNotEmpty, lowerCaseKeys } from "../utils/validation";
+import { assertNotEmpty, validateCommonHeaders } from "../utils/validation";
 import { PostMIRequest, PostMIRequestSchema } from "../contracts/mi";
 import { mapToMI } from "../mappers/mi-mapper";
 import { Deps } from "../config/deps";
@@ -12,13 +12,13 @@ export function createPostMIHandler(deps: Deps): APIGatewayProxyHandler {
 
   return async (event) => {
 
-    let correlationId;
+    const commonHeadersResult = validateCommonHeaders(event.headers, deps);
+
+    if (!commonHeadersResult.ok) {
+      return mapErrorToResponse(commonHeadersResult.error, commonHeadersResult.correlationId, deps.logger);
+    }
 
     try {
-      assertNotEmpty(event.headers, new Error('The request headers are empty'));
-      const lowerCasedHeaders = lowerCaseKeys(event.headers);
-      correlationId = assertNotEmpty(lowerCasedHeaders[deps.env.APIM_CORRELATION_HEADER], new Error("The request headers don't contain the APIM correlation id"));
-      const supplierId = assertNotEmpty(lowerCasedHeaders[deps.env.SUPPLIER_ID_HEADER], new ValidationError(ApiErrorDetail.InvalidRequestMissingSupplierId));
       const body = assertNotEmpty(event.body, new ValidationError(ApiErrorDetail.InvalidRequestMissingBody));
 
       let postMIRequest: PostMIRequest;
@@ -33,15 +33,15 @@ export function createPostMIHandler(deps: Deps): APIGatewayProxyHandler {
       }
       validateIso8601Timestamp(postMIRequest.data.attributes.timestamp);
 
-      const result = await postMIOperation(mapToMI(postMIRequest, supplierId), deps.miRepo);
+      const result = await postMIOperation(mapToMI(postMIRequest, commonHeadersResult.value.supplierId), deps.miRepo);
 
       return {
         statusCode: 201,
         body: JSON.stringify(result, null, 2)
       };
 
     } catch (error) {
-      return mapErrorToResponse(error, correlationId, deps.logger);
+      return mapErrorToResponse(error, commonHeadersResult.value.correlationId, deps.logger);
     }
   }