Fix patch tests

Author: francisco-videira-nhs

tests/component-tests/apiGateway-tests/update-letter-status.spec.ts

@@ -10,7 +10,6 @@ import {
 } from "./testCases/update-letter-status";
 import {
   createTestData,
-  deleteLettersBySupplier,
   getLettersBySupplier,
 } from "../../helpers/generate-fetch-test-data";
 import { createInvalidRequestHeaders } from "../../constants/request-headers";
@@ -20,22 +19,27 @@ import {
 } from "../../helpers/common-types";
 
 let baseUrl: string;
+let letters: Awaited<ReturnType<typeof getLettersBySupplier>>;
 
 test.beforeAll(async () => {
   baseUrl = await getRestApiGatewayBaseUrl();
 });
 
 test.describe("API Gateway Tests to Verify Patch Status Endpoint", () => {
+  test.beforeAll(async () => {
+    await createTestData(SUPPLIERID, 2);
+    letters = await getLettersBySupplier(SUPPLIERID, "PENDING", 2);
+
+    if (!letters || letters.length < 2) {
+      throw new Error(
+        `Expected 2 PENDING letters for supplier ${SUPPLIERID}, got ${letters?.length ?? 0}.`,
+      );
+    }
+  });
+
   test(`Patch /letters returns 202 and status is updated to ACCEPTED`, async ({
     request,
   }) => {
-    await createTestData(SUPPLIERID);
-    const letters = await getLettersBySupplier(SUPPLIERID, "PENDING", 1);
-
-    if (!letters?.length) {
-      test.fail(true, `No PENDING letters found for supplier ${SUPPLIERID}`);
-      return;
-    }
     const letter = letters[0];
     const headers = patchRequestHeaders();
     const body = patchValidRequestBody(letter.id, "ACCEPTED");
@@ -49,21 +53,12 @@ test.describe("API Gateway Tests to Verify Patch Status Endpoint", () => {
     );
 
     expect(response.status()).toBe(202);
-
-    await deleteLettersBySupplier(letter.id);
   });
 
   test(`Patch /letters returns 202 and status is updated to REJECTED`, async ({
     request,
   }) => {
-    await createTestData(SUPPLIERID);
-    const letters = await getLettersBySupplier(SUPPLIERID, "PENDING", 1);
-
-    if (!letters?.length) {
-      test.fail(true, `No PENDING letters found for supplier ${SUPPLIERID}`);
-      return;
-    }
-    const letter = letters[0];
+    const letter = letters[1];
     const headers = patchRequestHeaders();
     const body = patchFailureRequestBody(letter.id, "REJECTED");
 
@@ -76,8 +71,6 @@ test.describe("API Gateway Tests to Verify Patch Status Endpoint", () => {
     );
 
     expect(response.status()).toBe(202);
-
-    await deleteLettersBySupplier(letter.id);
   });
 
   test(`Patch /letters returns 400 if request Body is invalid`, async ({

tests/helpers/generate-fetch-test-data.ts

@@ -74,11 +74,14 @@ export const getLettersBySupplier = async (
   return Items as SupplierApiLetters[];
 };
 
-export const deleteLettersBySupplier = async (id: string) => {
+export const deleteLettersBySupplier = async (
+  supplierId: string,
+  id: string,
+) => {
   const resp = await docClient.send(
     new DeleteCommand({
       TableName: LETTERSTABLENAME,
-      Key: { supplierId: SUPPLIERID, id },
+      Key: { id, supplierId },
       ReturnValues: "ALL_OLD",
     }),
   );