Fix tests

Author: stevebux

tests/component-tests/events-tests/event-subscription.spec.ts

@@ -9,6 +9,7 @@ import { SUPPLIER_LETTERS, envName } from "tests/constants/api-constants";
 import {
   pollSupplierAllocatorLogForResolvedSpec,
   pollUpsertLetterLogForError,
+  pollUpsertLetterLogForWarning,
 } from "tests/helpers/aws-cloudwatch-helper";
 import { supplierDataSetup } from "tests/helpers/suppliers-setup-helper";
 import { pollForLetterStatus } from "tests/helpers/poll-for-letters-helper";
@@ -133,8 +134,6 @@ test.describe("Event Subscription SNS Tests", () => {
     expect(duplicateResponse.MessageId).toBeTruthy();
 
     // poll supplier upsert to check if duplicate event was processed
-    await pollUpsertLetterLogForError(
-      `Letter with id ${domainId} already exists for supplier ${supplierId}"`,
-    );
+    await pollUpsertLetterLogForWarning(domainId, "Letter already exists");
   });
 });

tests/component-tests/letterQueue-tests/queue-operations.spec.ts

@@ -7,7 +7,7 @@ import {
 import { logger } from "tests/helpers/pino-logger";
 import { sendSnsBatchEvent, sendSnsEvent } from "tests/helpers/send-sns-event";
 import {
-  pollUpsertLetterLogForError,
+  pollUpsertLetterLogForWarning,
   supplierIdFromSupplierAllocatorLog,
 } from "tests/helpers/aws-cloudwatch-helper";
 import getRestApiGatewayBaseUrl from "tests/helpers/aws-gateway-helper";
@@ -102,9 +102,6 @@ test.describe("Letter Queue Tests", () => {
     expect(letterExists).toBe(true);
     expect(itemCount).toBe(1);
 
-    await pollUpsertLetterLogForError(
-      `Letter with id ${letterId} already exists for supplier ${supplierId}"`,
-      letterId,
-    );
+    await pollUpsertLetterLogForWarning(letterId, "Letter already exists");
   });
 });

tests/constants/api-constants.ts

@@ -2,7 +2,7 @@ export const SUPPLIER_LETTERS = "letters";
 export const SUPPLIER_API_URL_SANDBOX =
   "https://internal-dev-sandbox.api.service.nhs.uk/nhs-notify-supplier";
 export const AWS_REGION = "eu-west-2";
-export const envName = process.env.PR_NUMBER ?? "main";
+export const envName = "pr495";
 export const API_NAME = `nhs-${envName}-supapi`;
 export const LETTERSTABLENAME = `nhs-${envName}-supapi-letters`;
 export const SUPPLIERID = "TestSupplier1";

tests/helpers/aws-cloudwatch-helper.ts

@@ -10,15 +10,17 @@ const sleep = (ms: number) =>
     setTimeout(resolve, ms);
   });
 
-export async function pollSupplierAllocatorLogForResolvedSpec(
-  domainId: string,
+async function pollLambdaLog(
+  lambdaName: string,
+  filterPatterns: string[],
+  extraPatterns?: string[],
 ): Promise<string> {
   const intervalMs = 5000;
   const startTimeMs = Date.now() - 5 * 60_000;
   const timeoutMs = 120_000;
 
   const client = new CloudWatchLogsClient({ region: AWS_REGION });
-  const logGroupName = `/aws/lambda/nhs-${envName}-supapi-supplier-allocator`;
+  const logGroupName = `/aws/lambda/nhs-${envName}-supapi-${lambdaName}`;
   const deadline = Date.now() + timeoutMs;
 
   while (Date.now() < deadline) {
@@ -28,18 +30,15 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
         startTime: startTimeMs,
         interleaved: true,
         limit: 100,
-        filterPattern: `"Sending message to upsert letter queue" "${domainId}"`,
+        filterPattern: filterPatterns.join(" "),
       }),
     );
 
     const foundEvent = (response.events ?? []).find((event) => {
       const message = event.message ?? "";
-      return (
-        message.includes(
-          '"description":"Sending message to upsert letter queue"',
-        ) &&
-        (!domainId || message.includes(domainId))
-      );
+      return extraPatterns
+        ? extraPatterns.some((pattern) => message.includes(pattern))
+        : true;
     });
     if (foundEvent?.message) {
       return foundEvent.message;
@@ -48,55 +47,38 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
     await sleep(intervalMs);
   }
 
-  throw new Error(
-    `Timed out waiting for resolved supplier spec log in ${logGroupName}`,
-  );
+  throw new Error(`Timed out waiting for resolved log in ${logGroupName}`);
+}
+
+export async function pollSupplierAllocatorLogForResolvedSpec(
+  domainId: string,
+): Promise<string> {
+  return pollLambdaLog("supplier-allocator", [
+    '"Sending message to upsert letter queue"',
+    `"${domainId}"`,
+  ]);
 }
 
 export async function pollUpsertLetterLogForError(
   msgToCheck: string,
   domainId?: string,
 ): Promise<string> {
-  const intervalMs = 5000;
-  const startTimeMs = Date.now() - 5 * 60_000;
-  const timeoutMs = 120_000;
-
-  const client = new CloudWatchLogsClient({ region: AWS_REGION });
-  const logGroupName = `/aws/lambda/nhs-${envName}-supapi-upsertletter`;
-  const deadline = Date.now() + timeoutMs;
-
-  while (Date.now() < deadline) {
-    const response = await client.send(
-      new FilterLogEventsCommand({
-        logGroupName,
-        startTime: startTimeMs,
-        interleaved: true,
-        limit: 100,
-        filterPattern: domainId
-          ? `"Error processing upsert of record" "${domainId}"`
-          : `"Error processing upsert of record"`,
-      }),
-    );
-
-    const foundEvent = (response.events ?? []).find((event) => {
-      const message = event.message ?? "";
-      return (
-        message.includes('"description":"Error processing upsert of record"') &&
-        (message.includes(`"message":"${msgToCheck}`) ||
-          message.includes(`"message": "${msgToCheck}`))
-      );
-    });
-
-    if (foundEvent?.message) {
-      return foundEvent.message;
-    }
-
-    await sleep(intervalMs);
+  const filterPatterns = ['"Error processing upsert of record"'];
+  if (domainId) {
+    filterPatterns.push(`"${domainId}"`);
   }
+  return pollLambdaLog("upsertletter", filterPatterns, [
+    `"message": "${msgToCheck}`,
+    `"message":"${msgToCheck}`,
+  ]);
+}
 
-  throw new Error(
-    `Timed out waiting for upsert letter error log in ${logGroupName}`,
-  );
+export async function pollUpsertLetterLogForWarning(
+  description: string,
+  domainId: string,
+): Promise<string> {
+  const filterPatterns = ['"WARN"', `"${domainId}"`, `"${description}"`];
+  return pollLambdaLog("upsertletter", filterPatterns);
 }
 
 export async function supplierIdFromSupplierAllocatorLog(