CCM-12896: Update ttl-handle-expiry-lambda to use new types/validators

Author: gareth-allan

lambdas/ttl-handle-expiry-lambda/package.json

@@ -3,6 +3,7 @@
     "@aws-sdk/client-sqs": "^3.914.0",
     "@aws-sdk/util-dynamodb": "^3.928.0",
     "aws-lambda": "^1.0.7",
+    "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1"
   },
   "devDependencies": {

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

@@ -3,9 +3,10 @@ import { EventPublisher, Logger } from 'utils';
 import { mock } from 'jest-mock-extended';
 import { createHandler } from 'apis/dynamodb-stream-handler';
 import { Dlq } from 'app/dlq';
+import { ItemDequeued } from 'digital-letters-events';
 
 const logger = mock<Logger>();
-const eventPublisher = mock<EventPublisher>();
+const eventPublisher = mock<EventPublisher<ItemDequeued>>();
 const dlq = mock<Dlq>();
 const futureTimestamp = Date.now() + 1_000_000;
 
@@ -29,12 +30,10 @@ const mockEvent: DynamoDBStreamEvent = {
           dateOfExpiry: { S: 'dateOfExpiry' },
           event: {
             M: {
-              profileversion: { S: '1.0.0' },
-              profilepublished: { S: '2025-10' },
               id: { S: '550e8400-e29b-41d4-a716-446655440001' },
               specversion: { S: '1.0' },
               source: {
-                S: '/nhs/england/notify/production/primary/data-plane/digital-letters',
+                S: '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
               },
               subject: {
                 S: 'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
@@ -50,16 +49,12 @@ const mockEvent: DynamoDBStreamEvent = {
               },
               datacontenttype: { S: 'application/json' },
               dataschema: {
-                S: 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10/digital-letter-base-data.schema.json',
+                S: 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-downloaded-data.schema.json',
               },
-              dataschemaversion: { S: '1.0' },
               severitytext: { S: 'INFO' },
               data: {
                 M: {
                   messageUri: { S: 'https://example.com/ttl/resource' },
-                  'digital-letter-id': {
-                    S: '123e4567-e89b-12d3-a456-426614174000',
-                  },
                   messageReference: { S: 'ref1' },
                   senderId: { S: 'sender1' },
                 },
@@ -110,21 +105,16 @@ describe('createHandler', () => {
 
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       expect.objectContaining({
-        profileversion: '1.0.0',
-        profilepublished: '2025-10',
         specversion: '1.0',
         source:
-          '/nhs/england/notify/production/primary/data-plane/digital-letters',
+          '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
         subject:
           'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
         type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
         datacontenttype: 'application/json',
         dataschema:
-          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10/digital-letter-base-data.schema.json',
+          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-queue-item-dequeued-data.schema.json',
         data: expect.objectContaining({
-          'digital-letter-id': expect.stringMatching(
-            /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i,
-          ),
           messageReference: 'ref1',
           messageUri: 'https://example.com/ttl/resource',
           senderId: 'sender1',

lambdas/ttl-handle-expiry-lambda/src/__tests__/container.test.ts

@@ -1,6 +1,7 @@
 import { EventPublisher } from 'utils';
 import { loadConfig } from 'infra/config';
 import { createContainer } from 'container';
+import eventValidator from 'digital-letters-events/ItemDequeued.js';
 
 jest.mock('utils', () => ({
   EventPublisher: jest.fn(),
@@ -14,9 +15,7 @@ jest.mock('infra/config', () => ({
 }));
 
 const mockLoadConfig = loadConfig as jest.MockedFunction<typeof loadConfig>;
-const mockEventPublisher = EventPublisher as jest.MockedClass<
-  typeof EventPublisher
->;
+const mockEventPublisher = jest.mocked(EventPublisher);
 
 describe('createContainer', () => {
   beforeEach(() => {
@@ -49,6 +48,7 @@ describe('createContainer', () => {
       logger: expect.any(Object),
       sqsClient: expect.any(Object),
       eventBridgeClient: expect.any(Object),
+      validateEvent: eventValidator,
     });
 
     expect(container).toEqual({

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

@@ -1,21 +1,21 @@
+import { unmarshall } from '@aws-sdk/util-dynamodb';
+import { Dlq } from 'app/dlq';
 import type {
   DynamoDBBatchItemFailure,
   DynamoDBRecord,
   DynamoDBStreamEvent,
 } from 'aws-lambda';
-import { unmarshall } from '@aws-sdk/util-dynamodb';
-import {
-  $TtlDynamodbRecord,
-  $TtlItemEvent,
-  EventPublisher,
-  Logger,
-} from 'utils';
+import type {
+  ItemDequeued,
+  MESHInboxMessageDownloaded,
+} from 'digital-letters-events';
+import eventValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
 import { randomUUID } from 'node:crypto';
-import { Dlq } from 'app/dlq';
+import { $TtlDynamodbRecord, EventPublisher, Logger } from 'utils';
 
 export type CreateHandlerDependencies = {
   dlq: Dlq;
-  eventPublisher: EventPublisher;
+  eventPublisher: EventPublisher<ItemDequeued>;
   logger: Logger;
 };
 
@@ -63,15 +63,10 @@ export const createHandler = ({
         return;
       }
 
-      const {
-        data: itemEvent,
-        error: eventParseError,
-        success: eventParseSuccess,
-      } = $TtlItemEvent.safeParse(item.event);
-
-      if (!eventParseSuccess) {
+      const isEventValid = eventValidator(item.event);
+      if (!isEventValid) {
         logger.warn({
-          err: eventParseError,
+          err: eventValidator.errors,
           description: 'Error parsing ttl item event',
         });
 
@@ -80,6 +75,8 @@ export const createHandler = ({
         return;
       }
 
+      const itemEvent: MESHInboxMessageDownloaded = item.event as any;
+
       if (item.withdrawn) {
         logger.info({
           description: 'ItemDequeued event not sent as item withdrawn',
@@ -95,6 +92,8 @@ export const createHandler = ({
             time: new Date().toISOString(),
             recordedtime: new Date().toISOString(),
             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',
           },
         ]);
       }

lambdas/ttl-handle-expiry-lambda/src/container.ts

@@ -2,17 +2,20 @@ import { EventPublisher, eventBridgeClient, logger, sqsClient } from 'utils';
 import { CreateHandlerDependencies } from 'apis/dynamodb-stream-handler';
 import { loadConfig } from 'infra/config';
 import { Dlq } from 'app/dlq';
+import { ItemDequeued } from 'digital-letters-events';
+import eventValidator from 'digital-letters-events/ItemDequeued.js';
 
 export const createContainer = (): CreateHandlerDependencies => {
   const { dlqUrl, eventPublisherDlqUrl, eventPublisherEventBusArn } =
     loadConfig();
 
-  const eventPublisher = new EventPublisher({
+  const eventPublisher = new EventPublisher<ItemDequeued>({
     eventBusArn: eventPublisherEventBusArn,
     dlqUrl: eventPublisherDlqUrl,
     logger,
     sqsClient,
     eventBridgeClient,
+    validateEvent: eventValidator,
   });
 
   const dlq = new Dlq({