CCM-15256: Initial commit

Author: ScottFullerton-NHSE

infrastructure/terraform/components/dl/scripts/sql/reports/daily_report.sql

@@ -12,7 +12,8 @@ WITH vars AS (
             OR e.type LIKE '%.pdm.resource.retries.exceeded.%'
             OR e.type LIKE '%.messages.request.rejected.%' THEN 'Digital'
             WHEN e.type LIKE '%.print.letter.transitioned.%'
-            OR e.type LIKE '%.print.file.quarantined.%' THEN 'Print' ELSE NULL
+            OR e.type LIKE '%.print.file.quarantined.%'
+            OR e.type LIKE '%.print.invalid.attachment.received.%' THEN 'Print' ELSE NULL
         END as communicationtype,
         CASE
             WHEN e.type LIKE '%.item.dequeued.%' THEN 'Unread'
@@ -21,6 +22,7 @@ WITH vars AS (
             WHEN e.type LIKE '%.pdm.resource.retries.exceeded.%' THEN 'Failed'
             WHEN e.type LIKE '%.messages.request.rejected.%' THEN 'Failed'
             WHEN e.type LIKE '%.print.file.quarantined.%' THEN 'Failed'
+            WHEN e.type LIKE '%.print.invalid.attachment.received.%' THEN 'Failed'
             WHEN e.letterstatus = 'RETURNED' THEN 'Returned'
             WHEN e.letterstatus = 'FAILED' THEN 'Failed'
             WHEN e.letterstatus = 'DISPATCHED' THEN 'Dispatched'

tests/playwright/digital-letters-component-tests/report-generator.component.spec.ts

@@ -124,6 +124,16 @@ const scenarios = [
     'DL_CLIV_003',
     'Attachment contains a virus',
   ),
+  // Scenario for new Print failure event: InvalidAttachmentReceived
+  new ReportScenario(
+    'component-test-invalid-attachment-received',
+    CommunicationType.Print,
+    [EventStatus.PrintInvalidAttachmentReceived],
+    'Failed',
+    senderId,
+    'DL_CLIV_002',
+    'Invalid attachment received',
+  ),
   // multiple events for the same message reference, should take the one with highest priority status (returned > failed > dispatched > rejected)
   new ReportScenario(
     'component-test-rejected-pending',

tests/playwright/helpers/event-builders.ts

@@ -1,6 +1,7 @@
 import {
   DigitalLetterRead,
   FileQuarantined,
+  InvalidAttachmentReceived,
   ItemDequeued,
   MessageRequestRejected,
   PDMResourceRetriesExceeded,
@@ -184,3 +185,24 @@ export function buildFileQuarantinedEvent(
     },
   } as FileQuarantined;
 }
+
+export function buildInvalidAttachmentReceivedEvent(
+  eventId: string,
+  time: string,
+  messageReference: string,
+  senderId: string,
+): InvalidAttachmentReceived {
+  const baseEvent = buildBaseEvent('print', time);
+  return {
+    ...baseEvent,
+    id: eventId,
+    type: 'uk.nhs.notify.digital.letters.print.invalid.attachment.received.v1',
+    dataschema:
+      'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-invalid-attachment-received-data.schema.json',
+    data: {
+      messageReference,
+      senderId,
+      failureCode: 'DL_CLIV_002',
+    },
+  } as InvalidAttachmentReceived;
+}

tests/playwright/helpers/report-helpers.ts

@@ -13,6 +13,7 @@ import {
   DigitalLetterRead,
   FileQuarantined,
   GenerateReport,
+  InvalidAttachmentReceived,
   ItemDequeued,
   MessageRequestRejected,
   MessageRequestSkipped,
@@ -22,6 +23,7 @@ import {
   validateDigitalLetterRead,
   validateFileQuarantined,
   validateGenerateReport,
+  validateInvalidAttachmentReceived,
   validateItemDequeued,
   validateMessageRequestRejected,
   validateMessageRequestSkipped,
@@ -40,6 +42,7 @@ import expectToPassEventually from 'helpers/expectations';
 import {
   buildDigitalLetterReadEvent,
   buildFileQuarantinedEvent,
+  buildInvalidAttachmentReceivedEvent,
   buildItemDequeuedEvent,
   buildMessageRequestRejectedEvent,
   buildPDMResourceRetriesExceededEvent,
@@ -67,6 +70,7 @@ export enum EventStatus {
   DigitalPDMResourceRetriesExceeded = 'PDMResourceRetriesExceeded',
   DigitalMessageRequestRejected = 'MessageRequestRejected',
   PrintFileQuarantined = 'FileQuarantined',
+  PrintInvalidAttachmentReceived = 'InvalidAttachmentReceived',
 }
 /**
  * Utility class to proof the SQL logic to determine which status should be reported for a given message reference,
@@ -219,6 +223,18 @@ export function publishEventForScenario(scenario: ReportScenario) {
             ],
             validateFileQuarantined,
           );
+        } else if (EventStatus.PrintInvalidAttachmentReceived === status) {
+          eventPublisher.sendEvents<InvalidAttachmentReceived>(
+            [
+              buildInvalidAttachmentReceivedEvent(
+                uuidv4(),
+                scenario.time,
+                scenario.messageReference,
+                scenario.senderId,
+              ),
+            ],
+            validateInvalidAttachmentReceived,
+          );
         } else {
           eventPublisher.sendEvents<PrintLetterTransitioned>(
             [

utils/py-utils/dl_utils/failure_codes.csv

@@ -1,4 +1,6 @@
 code,description
+DL_CLIV_001,Local ID not provided
+DL_CLIV_002,Invalid attachment received
 DL_PDMV_001,Letter rejected by PDM
 DL_PDMV_002,Timeout waiting for letter storage
 DL_CLIV_003,Attachment contains a virus