Change supplier header to app-supplier-id

Author: francisco-videira-nhs

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

@@ -17,7 +17,7 @@ describe('API Lambda handler', () => {
     const mockedGetLetterIds = letterService.getLetterIdsForSupplier as jest.Mock;
     mockedGetLetterIds.mockResolvedValue(['l1', 'l2', 'l3']);
 
-    const event = makeApiGwEvent({path: '/letters'});
+    const event = makeApiGwEvent({path: '/letters', headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();
     const callback = jest.fn();
     const result = await getLetters(event, context, callback);
@@ -54,4 +54,16 @@ describe('API Lambda handler', () => {
       body: 'Not Found',
     });
   });
+
+  it('returns 400 Bad Request: Missing supplier ID if header app-supplier-id ', async () => {
+    const event = makeApiGwEvent({path: '/letters'});
+    const context = mockDeep<Context>();
+    const callback = jest.fn();
+    const result = await getLetters(event, context, callback);
+
+    expect(result).toEqual({
+      statusCode: 400,
+      body: 'Bad Request: Missing supplier ID',
+    });
+  });
 });

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

@@ -33,7 +33,8 @@ describe('patchLetters API Handler', () => {
     const event = makeApiGwEvent({
       path: '/letters/id1',
       body: requestBody,
-      pathParameters: {id: "id1"}});
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();
     const callback = jest.fn();
 
@@ -51,7 +52,8 @@ describe('patchLetters API Handler', () => {
   it('returns 400 Bad Request as there is no body', async () => {
     const event = makeApiGwEvent({
       path: '/letters/id1',
-      pathParameters: {id: "id1"}});
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();
     const callback = jest.fn();
     const result = await patchLetters(event, context, callback);
@@ -66,7 +68,8 @@ describe('patchLetters API Handler', () => {
     const event = makeApiGwEvent({
       path: '/unknown',
       body: requestBody,
-      pathParameters: {id: "id1"}});
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();
     const callback = jest.fn();
     const result = await patchLetters(event, context, callback);
@@ -80,7 +83,8 @@ describe('patchLetters API Handler', () => {
   it('returns 404 Not Found as path parameter is not found', async () => {
     const event = makeApiGwEvent({
       path: '/letters',
-      body: requestBody});
+      body: requestBody,
+      headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();
     const callback = jest.fn();
     const result = await patchLetters(event, context, callback);
@@ -98,7 +102,8 @@ describe('patchLetters API Handler', () => {
     const event = makeApiGwEvent({
       path: '/letters/id1',
       body: requestBody,
-      pathParameters: { id: "id1" }
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}
     });
     const context = mockDeep<Context>();
     const callback = jest.fn();
@@ -118,7 +123,8 @@ describe('patchLetters API Handler', () => {
     const event = makeApiGwEvent({
       path: '/letters/id1',
       body: requestBody,
-      pathParameters: { id: "id1" }
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}
     });
     const context = mockDeep<Context>();
     const callback = jest.fn();
@@ -138,11 +144,27 @@ describe('patchLetters API Handler', () => {
     const event = makeApiGwEvent({
       path: '/letters/id1',
       body: requestBody,
-      pathParameters: { id: "id1" }
+      pathParameters: {id: "id1"},
+      headers: {'app-supplier-id': 'supplier1'}
     });
     const context = mockDeep<Context>();
     const callback = jest.fn();
 
     await expect(patchLetters(event, context, callback)).rejects.toThrow('Unexpected error');
   });
+
+  it('returns 400 Bad Request: Missing supplier ID if header app-supplier-id ', async () => {
+    const event = makeApiGwEvent({
+      path: '/letters/id1',
+      body: requestBody,
+      pathParameters: {id: "id1"}});
+    const context = mockDeep<Context>();
+    const callback = jest.fn();
+    const result = await patchLetters(event, context, callback);
+
+    expect(result).toEqual({
+      statusCode: 400,
+      body: 'Bad Request: Missing supplier ID',
+    });
+  });
 });

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

@@ -8,8 +8,14 @@ export const getLetters: APIGatewayProxyHandler = async (event) => {
 
   if (event.path === '/letters') {
 
-    // default to supplier1 for now
-    const supplierId = event.headers['nhsd-apim-apikey'] ?? "supplier1";
+    const supplierId = event.headers['app-supplier-id'];
+
+    if (!supplierId) {
+      return {
+        statusCode: 400,
+        body: "Bad Request: Missing supplier ID"
+      };
+    }
 
     const letterIds = await getLetterIdsForSupplier(supplierId, letterRepo);
 

lambdas/api-handler/src/handlers/patch-letters.ts

@@ -7,8 +7,14 @@ import { NotFoundError, ValidationError } from '../errors';
 const letterRepo = createLetterRepository();
 export const patchLetters: APIGatewayProxyHandler = async (event) => {
 
-    // TODO CCM-11188: default to supplier1 for now
-  const supplierId = event.headers['nhsd-apim-apikey'] ?? "supplier1";
+  const supplierId = event.headers['app-supplier-id'];
+
+  if (!supplierId) {
+    return {
+      statusCode: 400,
+      body: "Bad Request: Missing supplier ID"
+    };
+  }
 
   const pathParameters = event.pathParameters || {};
   const letterId = pathParameters["id"];