CCM-15676: more cleanup after merge

Author: Ian-Hodges

lambdas/nhsapp-status-handler/package.json

@@ -3,8 +3,7 @@
     "@aws-sdk/client-dynamodb": "^3.981.0",
     "@aws-sdk/lib-dynamodb": "^3.908.0",
     "digital-letters-events": "^0.0.1",
-    "utils": "^0.0.1",
-    "zod": "^4.3.6"
+    "utils": "^0.0.1"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.2",

lambdas/nhsapp-status-handler/src/__tests__/data.ts

@@ -1,5 +1,5 @@
 import { MESHInboxMessageDownloaded } from 'digital-letters-events';
-import { ChannelStatusPublishedEvent } from 'types/types';
+import { ChannelStatusPublishedEvent } from 'utils';
 
 export const messageDownloadedEvent: MESHInboxMessageDownloaded = {
   id: '550e8400-e29b-41d4-a716-446655440001',
@@ -29,6 +29,6 @@ export const messageDownloadedEvent: MESHInboxMessageDownloaded = {
 export const nhsAppStatusEvent: ChannelStatusPublishedEvent = {
   data: {
     messageReference: `${messageDownloadedEvent.data.senderId}_${messageDownloadedEvent.data.messageReference}`,
-    supplierStatus: 'PaperLetterOptedOut',
+    supplierStatus: 'paper_letter_opted_out',
   },
 };

lambdas/nhsapp-status-handler/src/apis/sqs-trigger-lambda.ts

@@ -5,13 +5,12 @@ import type {
 } from 'aws-lambda';
 import { randomUUID } from 'node:crypto';
 import type { TtlActionOutcome, TtlActions } from 'app/ttl-actions';
-import { EventPublisher, Logger } from 'utils';
+import { $ChannelStatusPublishedEvent, EventPublisher, Logger } from 'utils';
 import {
   DigitalLetterRead,
   MESHInboxMessageDownloaded,
   validateDigitalLetterRead,
 } from 'digital-letters-events';
-import { $ChannelStatusPublishedEvent } from 'types/types';
 
 interface ProcessingResult {
   outcome: TtlActionOutcome;

lambdas/nhsapp-status-handler/src/app/ttl-actions.ts

@@ -1,6 +1,6 @@
-import { Logger } from 'utils';
+import { ChannelStatusPublishedEvent, Logger } from 'utils';
 import { TtlRepository } from 'infra/ttl-repository';
-import { ChannelStatusPublishedEvent, TtlRecord } from 'types/types';
+import { TtlRecord } from 'types/types';
 
 export type TtlItem = TtlRecord | undefined;
 

lambdas/nhsapp-status-handler/src/types/types.ts

@@ -1,17 +1,5 @@
-import { z } from 'zod';
 import { MESHInboxMessageDownloaded } from 'digital-letters-events';
 
-export const $ChannelStatusPublishedEvent = z.object({
-  data: z.object({
-    messageReference: z.string(),
-    supplierStatus: z.literal('PaperLetterOptedOut'),
-  }),
-});
-
-export type ChannelStatusPublishedEvent = z.infer<
-  typeof $ChannelStatusPublishedEvent
->;
-
 export type TtlRecord = {
   event: MESHInboxMessageDownloaded;
 };

package-lock.json

@@ -4,26 +4,18 @@ import {
   MessageConsumerPact,
   asynchronousBodyHandler,
 } from '@pact-foundation/pact';
-import { z } from 'zod';
-
+import { $ChannelStatusPublishedEvent } from 'utils';
 import {
   PACT_CONSUMER,
   PACT_DIRECTORY,
   PACT_MESSAGE_DESCRIPTION,
   PACT_PROVIDER,
 } from '../utils/pact-config';
 
-const ChannelStatusPublishedEventSchema = z.object({
-  data: z.object({
-    messageReference: z.string(),
-    supplierStatus: z.literal('paper_letter_opted_out'),
-  }),
-});
-
 async function handle(event: unknown) {
   // This should ultimately reference the actual event validation code
   // being implemented in CCM-15676
-  ChannelStatusPublishedEventSchema.parse(event);
+  $ChannelStatusPublishedEvent.parse(event);
 }
 
 describe('Pact message consumer - ChannelStatusPublished event', () => {

tests/pact-tests/consumer/channel-status-published.consumer.pact.test.ts

@@ -5,6 +5,7 @@
     "@types/jest": "^29.5.14",
     "jest": "^29.7.0",
     "rimraf": "^6.0.1",
+    "utils": "^0.0.1",
     "zod": "^4.3.6"
   },
   "name": "nhs-notify-digital-letters-pact-tests",

tests/pact-tests/package.json

@@ -73,7 +73,7 @@ test.describe('Digital Letters - NHSApp Status Handler', () => {
           type: 'uk.nhs.notify.channel.status.PUBLISHED.v1',
           data: {
             messageReference: concatedReference,
-            supplierStatus: 'PaperLetterOptedOut',
+            supplierStatus: 'paper_letter_opted_out',
           },
         },
       ],
@@ -114,7 +114,7 @@ test.describe('Digital Letters - NHSApp Status Handler', () => {
           type: 'uk.nhs.notify.channel.status.PUBLISHED.v1',
           data: {
             messageReference: concatedReference,
-            supplierStatus: 'PaperLetterOptedOut',
+            supplierStatus: 'paper_letter_opted_out',
           },
         },
       ],

tests/playwright/digital-letters-component-tests/nhsapp-status-handler.component.spec.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export const $ChannelStatusPublishedEvent = z.object({
+  data: z.object({
+    messageReference: z.string(),
+    supplierStatus: z.literal('paper_letter_opted_out'),
+  }),
+});
+
+export type ChannelStatusPublishedEvent = z.infer<
+  typeof $ChannelStatusPublishedEvent
+>;