CCM-12896: Make eventpublisher method generic instead of class

gareth-allan · gareth-allan · commit 05812626c88a · 2025-12-10T11:23:11.000Z
diff --git a/lambdas/ttl-create-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts b/lambdas/ttl-create-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts
@@ -4,6 +4,7 @@ import {
   ItemEnqueued,
   MESHInboxMessageDownloaded,
 } from 'digital-letters-events';
+import itemEnqueuedValidator from 'digital-letters-events/ItemEnqueued.js';
 import { randomUUID } from 'node:crypto';
 
 jest.mock('node:crypto', () => ({
@@ -75,7 +76,10 @@ describe('createHandler', () => {
 
     expect(res.batchItemFailures).toEqual([]);
     expect(createTtl.send).toHaveBeenCalledWith(messageDownloadedEvent);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([itemEnqueuedEvent]);
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [itemEnqueuedEvent],
+      itemEnqueuedValidator,
+    );
     expect(logger.info).toHaveBeenCalledWith({
       description: 'Processed SQS Event.',
       failed: 0,
@@ -185,11 +189,10 @@ describe('createHandler', () => {
 
     expect(res.batchItemFailures).toEqual([]);
     expect(createTtl.send).toHaveBeenCalledTimes(3);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
-      itemEnqueuedEvent,
-      itemEnqueuedEvent,
-      itemEnqueuedEvent,
-    ]);
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [itemEnqueuedEvent, itemEnqueuedEvent, itemEnqueuedEvent],
+      itemEnqueuedValidator,
+    );
     expect(logger.info).toHaveBeenCalledWith({
       description: 'Processed SQS Event.',
       failed: 0,
@@ -213,10 +216,10 @@ describe('createHandler', () => {
     const res = await handler(event);
 
     expect(res.batchItemFailures).toEqual([]);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
-      itemEnqueuedEvent,
-      itemEnqueuedEvent,
-    ]);
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [itemEnqueuedEvent, itemEnqueuedEvent],
+      itemEnqueuedValidator,
+    );
     expect(logger.warn).toHaveBeenCalledWith({
       description: 'Some events failed to publish',
       failedCount: 1,
@@ -236,7 +239,10 @@ describe('createHandler', () => {
     const res = await handler(event);
 
     expect(res.batchItemFailures).toEqual([]);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([itemEnqueuedEvent]);
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [itemEnqueuedEvent],
+      itemEnqueuedValidator,
+    );
     expect(logger.warn).toHaveBeenCalledWith({
       err: publishError,
       description: 'Failed to send events to EventBridge',
@@ -282,7 +288,10 @@ describe('createHandler', () => {
       { itemIdentifier: 'msg2' },
       { itemIdentifier: 'msg3' },
     ]);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([itemEnqueuedEvent]);
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [itemEnqueuedEvent],
+      itemEnqueuedValidator,
+    );
     expect(logger.info).toHaveBeenCalledWith({
       description: 'Processed SQS Event.',
       failed: 2,
diff --git a/lambdas/ttl-create-lambda/src/apis/sqs-trigger-lambda.ts b/lambdas/ttl-create-lambda/src/apis/sqs-trigger-lambda.ts
@@ -6,7 +6,8 @@ import type {
 import { randomUUID } from 'node:crypto';
 import type { CreateTtl, CreateTtlOutcome } from 'app/create-ttl';
 import { EventPublisher, Logger } from 'utils';
-import eventValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
+import itemEnqueuedValidator from 'digital-letters-events/ItemEnqueued.js';
+import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
 import {
   ItemEnqueued,
   MESHInboxMessageDownloaded,
@@ -19,7 +20,7 @@ interface ProcessingResult {
 
 interface CreateHandlerDependencies {
   createTtl: CreateTtl;
-  eventPublisher: EventPublisher<ItemEnqueued>;
+  eventPublisher: EventPublisher;
   logger: Logger;
 }
 
@@ -37,10 +38,10 @@ export const createHandler = ({
           const sqsEventBody = JSON.parse(body);
           const sqsEventDetail = sqsEventBody.detail;
 
-          const isEventValid = eventValidator(sqsEventDetail);
+          const isEventValid = messageDownloadedValidator(sqsEventDetail);
           if (!isEventValid) {
             logger.error({
-              err: eventValidator.errors,
+              err: messageDownloadedValidator.errors,
               description: 'Error parsing ttl queue entry',
             });
             batchItemFailures.push({ itemIdentifier: messageId });
@@ -96,7 +97,7 @@ export const createHandler = ({
 
     if (successfulEvents.length > 0) {
       try {
-        const failedEvents = await eventPublisher.sendEvents(
+        const failedEvents = await eventPublisher.sendEvents<ItemEnqueued>(
           successfulEvents.map((event) => ({
             ...event,
             id: randomUUID(),
@@ -106,6 +107,7 @@ export const createHandler = ({
             dataschema:
               'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-queue-item-enqueued-data.schema.json',
           })),
+          itemEnqueuedValidator,
         );
         if (failedEvents.length > 0) {
           logger.warn({
diff --git a/lambdas/ttl-create-lambda/src/container.ts b/lambdas/ttl-create-lambda/src/container.ts
@@ -8,8 +8,6 @@ import {
 import { loadConfig } from 'infra/config';
 import { TtlRepository } from 'infra/ttl-repository';
 import { CreateTtl } from 'app/create-ttl';
-import { ItemEnqueued } from 'digital-letters-events';
-import eventValidator from 'digital-letters-events/ItemEnqueued.js';
 
 export const createContainer = () => {
   const {
@@ -30,13 +28,12 @@ export const createContainer = () => {
 
   const createTtl = new CreateTtl(requestTtlRepository, logger);
 
-  const eventPublisher = new EventPublisher<ItemEnqueued>({
+  const eventPublisher = new EventPublisher({
     eventBusArn: eventPublisherEventBusArn,
     dlqUrl: eventPublisherDlqUrl,
     logger,
     sqsClient,
     eventBridgeClient,
-    validateEvent: eventValidator,
   });
 
   return {
diff --git a/lambdas/ttl-handle-expiry-lambda/src/__tests__/apis/dynamodb-stream-handler.test.ts b/lambdas/ttl-handle-expiry-lambda/src/__tests__/apis/dynamodb-stream-handler.test.ts
@@ -3,10 +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';
+import itemDequeuedValidator from 'digital-letters-events/ItemDequeued.js';
 
 const logger = mock<Logger>();
-const eventPublisher = mock<EventPublisher<ItemDequeued>>();
+const eventPublisher = mock<EventPublisher>();
 const dlq = mock<Dlq>();
 const futureTimestamp = Date.now() + 1_000_000;
 
@@ -103,24 +103,27 @@ describe('createHandler', () => {
 
     expect(eventPublisher.sendEvents).toHaveBeenCalledTimes(1);
 
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
-      expect.objectContaining({
-        specversion: '1.0',
-        source:
-          '/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-draft/data/digital-letters-queue-item-dequeued-data.schema.json',
-        data: expect.objectContaining({
-          messageReference: 'ref1',
-          messageUri: 'https://example.com/ttl/resource',
-          senderId: 'sender1',
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [
+        expect.objectContaining({
+          specversion: '1.0',
+          source:
+            '/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-draft/data/digital-letters-queue-item-dequeued-data.schema.json',
+          data: expect.objectContaining({
+            messageReference: 'ref1',
+            messageUri: 'https://example.com/ttl/resource',
+            senderId: 'sender1',
+          }),
         }),
-      }),
-    ]);
+      ],
+      itemDequeuedValidator,
+    );
 
     expect(result).toEqual({});
   });
@@ -377,16 +380,19 @@ describe('createHandler', () => {
     const result = await handler(mockNotWithdrawnEvent);
 
     expect(eventPublisher.sendEvents).toHaveBeenCalledTimes(1);
-    expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
-      expect.objectContaining({
-        type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
-        data: expect.objectContaining({
-          messageReference: 'ref1',
-          messageUri: 'https://example.com/ttl/resource',
-          senderId: 'sender1',
+    expect(eventPublisher.sendEvents).toHaveBeenCalledWith(
+      [
+        expect.objectContaining({
+          type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
+          data: expect.objectContaining({
+            messageReference: 'ref1',
+            messageUri: 'https://example.com/ttl/resource',
+            senderId: 'sender1',
+          }),
         }),
-      }),
-    ]);
+      ],
+      itemDequeuedValidator,
+    );
     expect(result).toEqual({});
   });
 });
diff --git a/lambdas/ttl-handle-expiry-lambda/src/__tests__/container.test.ts b/lambdas/ttl-handle-expiry-lambda/src/__tests__/container.test.ts
@@ -1,7 +1,6 @@
 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(),
@@ -48,7 +47,6 @@ describe('createContainer', () => {
       logger: expect.any(Object),
       sqsClient: expect.any(Object),
       eventBridgeClient: expect.any(Object),
-      validateEvent: eventValidator,
     });
 
     expect(container).toEqual({
diff --git a/lambdas/ttl-handle-expiry-lambda/src/apis/dynamodb-stream-handler.ts b/lambdas/ttl-handle-expiry-lambda/src/apis/dynamodb-stream-handler.ts
@@ -9,13 +9,14 @@ import type {
   ItemDequeued,
   MESHInboxMessageDownloaded,
 } from 'digital-letters-events';
-import eventValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
+import itemDequeuedValidator from 'digital-letters-events/ItemDequeued.js';
+import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
 import { randomUUID } from 'node:crypto';
 import { $TtlDynamodbRecord, EventPublisher, Logger } from 'utils';
 
 export type CreateHandlerDependencies = {
   dlq: Dlq;
-  eventPublisher: EventPublisher<ItemDequeued>;
+  eventPublisher: EventPublisher;
   logger: Logger;
 };
 
@@ -63,10 +64,10 @@ export const createHandler = ({
         return;
       }
 
-      const isEventValid = eventValidator(item.event);
+      const isEventValid = messageDownloadedValidator(item.event);
       if (!isEventValid) {
         logger.warn({
-          err: eventValidator.errors,
+          err: messageDownloadedValidator.errors,
           description: 'Error parsing ttl item event',
         });
 
@@ -85,17 +86,20 @@ export const createHandler = ({
           senderId: itemEvent.data.senderId,
         });
       } else {
-        await eventPublisher.sendEvents([
-          {
-            ...itemEvent,
-            id: randomUUID(),
-            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',
-          },
-        ]);
+        await eventPublisher.sendEvents<ItemDequeued>(
+          [
+            {
+              ...itemEvent,
+              id: randomUUID(),
+              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',
+            },
+          ],
+          itemDequeuedValidator,
+        );
       }
     } catch (error) {
       logger.warn({
diff --git a/lambdas/ttl-handle-expiry-lambda/src/container.ts b/lambdas/ttl-handle-expiry-lambda/src/container.ts
@@ -2,20 +2,17 @@ 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<ItemDequeued>({
+  const eventPublisher = new EventPublisher({
     eventBusArn: eventPublisherEventBusArn,
     dlqUrl: eventPublisherDlqUrl,
     logger,
     sqsClient,
     eventBridgeClient,
-    validateEvent: eventValidator,
   });
 
   const dlq = new Dlq({
diff --git a/tests/playwright/digital-letters-component-tests/create-ttl.component.spec.ts b/tests/playwright/digital-letters-component-tests/create-ttl.component.spec.ts
@@ -1,4 +1,6 @@
 import { expect, test } from '@playwright/test';
+import { MESHInboxMessageDownloaded } from 'digital-letters-events';
+import messageDownloadedValidator from 'digital-letters-events/MESHInboxMessageDownloaded.js';
 import getTtl from 'helpers/dynamodb-helpers';
 import eventPublisher from 'helpers/event-bus-helpers';
 import expectToPassEventually from 'helpers/expectations';
@@ -9,30 +11,34 @@ test.describe('Digital Letters - Create TTL', () => {
     const letterId = uuidv4();
     const messageUri = `https://example.com/ttl/resource/${letterId}`;
 
-    await eventPublisher.sendEvents([
-      {
-        id: letterId,
-        specversion: '1.0',
-        source:
-          '/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.mesh.inbox.message.downloaded.v1',
-        time: '2023-06-20T12:00:00Z',
-        recordedtime: '2023-06-20T12:00:00.250Z',
-        severitynumber: 2,
-        traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
-        datacontenttype: 'application/json',
-        dataschema:
-          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-downloaded-data.schema.json',
-        severitytext: 'INFO',
-        data: {
-          messageUri,
-          messageReference: 'ref1',
-          senderId: 'sender1',
+    await eventPublisher.sendEvents<MESHInboxMessageDownloaded>(
+      [
+        {
+          id: letterId,
+          specversion: '1.0',
+          source:
+            '/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.mesh.inbox.message.downloaded.v1',
+          time: '2023-06-20T12:00:00Z',
+          recordedtime: '2023-06-20T12:00:00.250Z',
+          severitynumber: 2,
+          traceparent:
+            '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
+          datacontenttype: 'application/json',
+          dataschema:
+            'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-downloaded-data.schema.json',
+          severitytext: 'INFO',
+          data: {
+            messageUri,
+            messageReference: 'ref1',
+            senderId: 'sender1',
+          },
         },
-      },
-    ]);
+      ],
+      messageDownloadedValidator,
+    );
 
     await expectToPassEventually(async () => {
       const ttl = await getTtl(messageUri);
diff --git a/tests/playwright/helpers/event-bus-helpers.ts b/tests/playwright/helpers/event-bus-helpers.ts
diff --git a/utils/utils/src/__tests__/event-publisher/event-publisher.test.ts b/utils/utils/src/__tests__/event-publisher/event-publisher.test.ts
diff --git a/utils/utils/src/event-publisher/event-publisher.ts b/utils/utils/src/event-publisher/event-publisher.ts
