CCM-13146 update e2e tests so they pass

Author: Ian-Hodges

tests/playwright/digital-letters-component-tests/handle-ttl.component.spec.ts

@@ -61,7 +61,10 @@ test.describe('Digital Letters - Handle TTL', () => {
     await expectToPassEventually(async () => {
       const eventLogEntry = await getLogsFromCloudwatch(
         `/aws/lambda/nhs-${ENV}-dl-ttl-handle-expiry`,
-        `{ ($.message.messageUri = "${messageUri}") && ($.message.description = "ItemDequeued event not sent as item withdrawn") }`,
+        [
+          `$.message.messageUri = "${messageUri}"`,
+          '$.message.description = "ItemDequeued event not sent as item withdrawn"',
+        ],
       );
 
       expect(eventLogEntry.length).toEqual(1);
@@ -100,7 +103,11 @@ test.describe('Digital Letters - Handle TTL', () => {
       await expectToPassEventually(async () => {
         const eventLogEntry = await getLogsFromCloudwatch(
           `/aws/vendedlogs/events/event-bus/nhs-${ENV}-dl`,
-          `{ ($.id = "${letterId}") }`,
+          [
+            '$.message_type = "EVENT_RECEIPT"',
+            '$.details.detail_type = "uk.nhs.notify.digital.letters.queue.item.dequeued.v1"',
+            `$.details.event_detail = "*\\"messageUri\\":\\"${messageUri}\\"*"`,
+          ],
         );
 
         expect(eventLogEntry.length).toEqual(1);

tests/playwright/helpers/cloudwatch-helpers.ts

@@ -14,17 +14,17 @@ test.beforeEach(() => {
 });
 
 /**
- * @param logGroupName e.g. `/aws/lambda/nhs-main-dl-apim-key-generation`
- * @param pattern e.g. `{ $.id = ${JSON.stringify(letterId)} }`
+ * @param logGroupName e.g. '/aws/lambda/nhs-main-dl-apim-key-generation'
+ * @param patterns e.g. [ '$.id = "someId"', '$.message.messageUri = "messageUri"' ]
  */
 export async function getLogsFromCloudwatch(
   logGroupName: string,
-  pattern: string,
+  patterns: string[],
 ): Promise<unknown[]> {
   const filterEvents = new FilterLogEventsCommand({
     logGroupName,
     startTime: testStartTime.getTime() - 60 * 1000,
-    filterPattern: pattern,
+    filterPattern: `{${patterns.join(' && ')}}`,
     limit: 50,
   });