Validate path parameter only

Author: francisco-videira-nhs

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

@@ -64,25 +64,9 @@ describe('patchLetters API Handler', () => {
     });
   });
 
-  it('returns 404 Not Found as path is unknown', async () => {
-    const event = makeApiGwEvent({
-      path: '/unknown',
-      body: requestBody,
-      pathParameters: {id: "id1"},
-      headers: {'app-supplier-id': 'supplier1'}});
-    const context = mockDeep<Context>();
-    const callback = jest.fn();
-    const result = await patchLetters(event, context, callback);
-
-    expect(result).toEqual({
-      statusCode: 404,
-      body: 'Not Found: The requested resource does not exist',
-    });
-  });
-
   it('returns 404 Not Found as path parameter is not found', async () => {
     const event = makeApiGwEvent({
-      path: '/letters',
+      path: '/letters/',
       body: requestBody,
       headers: {'app-supplier-id': 'supplier1'}});
     const context = mockDeep<Context>();

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

@@ -16,50 +16,47 @@ export const patchLetters: APIGatewayProxyHandler = async (event) => {
     };
   }
 
-  const pathParameters = event.pathParameters || {};
-  const letterId = pathParameters["id"];
+  const letterId = event.pathParameters?.id;
 
-  if (event.path.includes('/letters/') && letterId) {
+  if (!letterId) {
+    return {
+      statusCode: 404,
+      body: "Not Found: The requested resource does not exist"
+    };
+  }
 
-    if (!event.body)
-    {
-      return {
-        statusCode: 400,
-        body: "Bad Request: Missing request body"
-      }
+  if (!event.body)
+  {
+    return {
+      statusCode: 400,
+      body: "Bad Request: Missing request body"
     }
+  }
 
-    const patchLetterRequest: LetterApiDocument = JSON.parse(event.body);
+  const patchLetterRequest: LetterApiDocument = JSON.parse(event.body);
 
-    try {
+  try {
 
-      // TODO CCM-11188: Is it worth retrieving the letter first to check if the status is different?
+    // TODO CCM-11188: Is it worth retrieving the letter first to check if the status is different?
 
-      const result = await patchLetterStatus(patchLetterRequest.data, letterId, supplierId, letterRepo);
+    const result = await patchLetterStatus(patchLetterRequest.data, letterId, supplierId, letterRepo);
 
+    return {
+      statusCode: 200,
+      body: JSON.stringify(result, null, 2)
+    };
+  } catch (error) {
+    if (error instanceof ValidationError) {
       return {
-        statusCode: 200,
-        body: JSON.stringify(result, null, 2)
+        statusCode: 400,
+        body: error.message
+      };
+    } else if (error instanceof NotFoundError) {
+      return {
+        statusCode: 404,
+        body: error.message
       };
-    } catch (error) {
-      if (error instanceof ValidationError) {
-        return {
-          statusCode: 400,
-          body: error.message
-        };
-      } else if (error instanceof NotFoundError) {
-        return {
-          statusCode: 404,
-          body: error.message
-        };
-      }
-      throw error;
     }
+    throw error;
   }
-
-  // TODO CCM-11188: Is this reachable with the API GW?
-  return {
-    statusCode: 404,
-    body: 'Not Found: The requested resource does not exist',
-  };
 };