CCM-14616: Status handler subject change

Author: nhsd-angel-pastor

lambdas/print-status-handler/src/__tests__/apis/sqs-handler.test.ts

@@ -9,6 +9,8 @@ import {
   recordEvent,
 } from '__tests__/test-data';
 
+import { $LetterEvent } from '@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-events';
+
 const logger = mock<Logger>();
 const eventPublisher = mock<EventPublisher>();
 
@@ -47,6 +49,8 @@ describe('SQS Handler', () => {
             type: 'uk.nhs.notify.digital.letters.print.letter.transitioned.v1',
             source:
               '/nhs/england/notify/production/primary/data-plane/digitalletters/print',
+            subject:
+              'client/32124dde-4b36-4a49-8686-e9da9cbff725/letter-request/2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
             data: {
               senderId: pendingLetterEvent.data.origin.subject.split('/')[1],
               messageReference:
@@ -69,6 +73,22 @@ describe('SQS Handler', () => {
       expect(response).toEqual({ batchItemFailures: [] });
     });
 
+    it('should throw an error', async () => {
+      const {
+        data: item,
+        error: parseError,
+        success: parseSuccess,
+      } = $LetterEvent.safeParse(pendingLetterEvent);
+
+      expect(parseSuccess).toBe(true);
+      expect(parseError).toBeUndefined();
+      expect(item).toBeDefined();
+
+      expect(item?.subject).toBe(
+        'letter-origin/letter-rendering/letter/32124dde-4b36-4a49-8686-e9da9cbff725_2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
+      );
+    });
+
     it('should send print.letter.transitioned event when letter.PENDING received', async () => {
       const response = await handler(recordEvent([acceptedLetterEvent]));
 
@@ -84,6 +104,8 @@ describe('SQS Handler', () => {
             type: 'uk.nhs.notify.digital.letters.print.letter.transitioned.v1',
             source:
               '/nhs/england/notify/production/primary/data-plane/digitalletters/print',
+            subject:
+              'client/f47ac10b-58cc-4372-a567-0e02b2c3d479/letter-request/2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
             data: {
               senderId: acceptedLetterEvent.data.origin.subject.split('/')[1],
               messageReference:
@@ -121,6 +143,8 @@ describe('SQS Handler', () => {
             type: 'uk.nhs.notify.digital.letters.print.letter.transitioned.v1',
             source:
               '/nhs/england/notify/production/primary/data-plane/digitalletters/print',
+            subject:
+              'client/f47ac10b-58cc-4372-a567-0e02b2c3d480/letter-request/2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
             data: {
               senderId: failedLetterEvent.data.origin.subject.split('/')[1],
               messageReference:

lambdas/print-status-handler/src/apis/sqs-handler.ts

@@ -104,6 +104,7 @@ function generateUpdatedEvent(event: LetterEvent): PrintLetterTransitioned {
     id: randomUUID(),
     time: eventTime,
     recordedtime: eventTime,
+    subject: `client/${senderId}/letter-request/${messageReference}`,
     dataschema:
       'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-letter-transitioned-data.schema.json',
     type: 'uk.nhs.notify.digital.letters.print.letter.transitioned.v1',
@@ -153,7 +154,9 @@ export const createHandler = ({
           logger.info(
             `Generated event for incoming event with domainID: ${event.data.domainId}, subject: ${event.subject}`,
           );
-          logger.info(`From SupplierAPI: ${JSON.stringify(event)} To PrintLetterTransitioned: ${JSON.stringify(generatedEvent)}`);
+          logger.info(
+            `From SupplierAPI: ${JSON.stringify(event)} To PrintLetterTransitioned: ${JSON.stringify(generatedEvent)}`,
+          );
         } catch (error: any) {
           logger.warn({
             err: error.message,

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

@@ -15,8 +15,6 @@ const baseLetterEvent = {
   id: '550e8400-e29b-41d4-a716-446655440001',
   specversion: '1.0',
   source: '/data-plane/supplier-api/prod/update-status',
-  subject:
-    'letter-origin/letter-rendering/letter/32124dde-4b36-4a49-8686-e9da9cbff725_2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
   dataschemaversion: '1.0.16',
   time: '2023-06-20T12:00:00Z',
   recordedtime: '2023-06-20T12:00:00.250Z',
@@ -27,7 +25,7 @@ const baseLetterEvent = {
   plane: 'data',
   data: {
     domainId:
-      '32124dde-4b36-4a49-8686-e9da9cbff725_2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
+      '00f3b388-bbe9-41c9-9e76-052d37ee8988_2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
     groupId: 'client_template',
     specificationId: '1y3q9v1zzzz',
     supplierId: 'supplier-1',
@@ -65,6 +63,7 @@ test.describe('Print status handler', () => {
       const messageReference = uuidv4();
       const letterEvent = {
         ...baseLetterEvent,
+        subject: `letter-origin/letter-rendering/letter/00f3b388-bbe9-41c9-9e76-052d37ee8988_${messageReference}`,
         type: `uk.nhs.notify.supplier-api.letter.${status}.v1`,
         dataschema: `https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.${status}.1.0.16.schema.json`,
         data: {
@@ -105,6 +104,7 @@ test.describe('Print status handler', () => {
       [
         {
           ...baseLetterEvent,
+          subject: `letter-origin/letter-rendering/letter/00f3b388-bbe9-41c9-9e76-052d37ee8988_${messageReference}`,
           type: `uk.nhs.notify.supplier-api.letter.ACCEPTED.v1`,
           dataschema: `https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.ACCEPTED.1.0.0.schema.json`,
           data: {