CCM-12896: Also transform source field and make test validate events produced

Author: gareth-allan

lambdas/ttl-create-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts

@@ -52,9 +52,11 @@ describe('createHandler', () => {
   const itemEnqueuedEvent: ItemEnqueued = {
     ...messageDownloadedEvent,
     id: '550e8400-e29b-41d4-a716-446655440001',
+    source:
+      '/nhs/england/notify/production/primary/data-plane/digitalletters/queue',
+    type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
     time: '2023-06-20T12:00:00.250Z',
     recordedtime: '2023-06-20T12:00:00.250Z',
-    type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
     dataschema:
       'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-queue-item-enqueued-data.schema.json',
   };
@@ -80,6 +82,11 @@ describe('createHandler', () => {
       [itemEnqueuedEvent],
       itemEnqueuedValidator,
     );
+
+    const publishedEvent = eventPublisher.sendEvents.mock.lastCall?.[0];
+    expect(publishedEvent).toHaveLength(1);
+    expect(itemEnqueuedValidator(publishedEvent?.[0])).toBeTruthy();
+
     expect(logger.info).toHaveBeenCalledWith({
       description: 'Processed SQS Event.',
       failed: 0,

lambdas/ttl-create-lambda/src/apis/sqs-trigger-lambda.ts

@@ -106,6 +106,7 @@ export const createHandler = ({
             type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
             dataschema:
               'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-queue-item-enqueued-data.schema.json',
+            source: event.source.replace(/\/mesh$/, '/queue'),
           })),
           itemEnqueuedValidator,
         );

lambdas/ttl-handle-expiry-lambda/src/__tests__/apis/dynamodb-stream-handler.test.ts

@@ -108,7 +108,7 @@ describe('createHandler', () => {
         expect.objectContaining({
           specversion: '1.0',
           source:
-            '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
+            '/nhs/england/notify/production/primary/data-plane/digitalletters/queue',
           subject:
             'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
           type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
@@ -125,6 +125,10 @@ describe('createHandler', () => {
       itemDequeuedValidator,
     );
 
+    const publishedEvent = eventPublisher.sendEvents.mock.lastCall?.[0];
+    expect(publishedEvent).toHaveLength(1);
+    expect(itemDequeuedValidator(publishedEvent?.[0])).toBeTruthy();
+
     expect(result).toEqual({});
   });
 

lambdas/ttl-handle-expiry-lambda/src/apis/dynamodb-stream-handler.ts

@@ -96,6 +96,7 @@ export const createHandler = ({
               type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
               dataschema:
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-queue-item-dequeued-data.schema.json',
+              source: itemEvent.source.replace(/\/mesh$/, '/queue'),
             },
           ],
           itemDequeuedValidator,