CCM-15019: missing fields

Author: nhsd-angel-pastor

lambdas/core-notifier-lambda/src/__tests__/constants.ts

@@ -63,6 +63,8 @@ export const validPdmEvent: PDMResourceAvailable = {
   plane: 'data',
   dataschemaversion: '1.0.0',
   source: '/nhs/england/notify/development/dev-12345/digitalletters/pdm',
+  dataschema:
+    'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-pdm-resource-available-data.schema.json',
   specversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
   time: '2025-12-15T10:00:00Z',

lambdas/mesh-acknowledge/mesh_acknowledge/__tests__/fixtures.py

@@ -29,6 +29,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
             'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
             'digital-letters-mesh-inbox-message-downloaded-data.schema.json'
         ),
+        "dataschemaversion": '1.0.0',
         "datacategory": "non-sensitive",
         "dataclassification": "public",
         "dataregulation": "GDPR",

lambdas/mesh-download/mesh_download/__tests__/test_processor.py

@@ -43,6 +43,7 @@ def create_valid_cloud_event():
         'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
         'plane': 'data',
         'dataschemaversion': '1.0.0',
+        'datacontenttype': 'application/json',
         'time': '2023-01-01T12:00:00Z',
         'recordedtime': '2023-01-01T12:00:00Z',
         'severitynumber': 2,
@@ -165,7 +166,8 @@ def test_process_sqs_message_success(self, mock_datetime):
         assert published_event['subject'] == 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000'
         assert published_event['time'] == '2025-11-19T15:30:45+00:00'
         assert published_event['plane'] == 'data'
-        assert published_event['dataschemaversion'] == '1.0'
+        assert published_event['dataschemaversion'] == '1.0.0'
+        assert published_event['datacontenttype'] == 'application/json'
         assert 'id' in published_event
         assert 'tracestate' not in published_event
         assert 'partitionkey' not in published_event

lambdas/move-scanned-files-lambda/src/__tests__/apis/sqs-handler.test.ts

@@ -70,6 +70,9 @@ describe('sqs-handler', () => {
           source: '/test',
           plane: 'data',
           dataschemaversion: '1.0.0',
+          datacontenttype: 'application/json',
+          dataschema:
+            'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {
@@ -110,7 +113,10 @@ describe('sqs-handler', () => {
         id: 'test-id-1',
         source: '/test',
         plane: 'data',
+        dataschema:
+          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
         dataschemaversion: '1.0.0',
+        datacontenttype: 'application/json',
         type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -130,7 +136,10 @@ describe('sqs-handler', () => {
         id: 'test-id-2',
         source: '/test',
         plane: 'data',
+        dataschema:
+          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
         dataschemaversion: '1.0.0',
+        datacontenttype: 'application/json',
         type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -198,6 +207,9 @@ describe('sqs-handler', () => {
           source: '/test',
           plane: 'data',
           dataschemaversion: '1.0.0',
+          datacontenttype: 'application/json',
+          dataschema:
+            'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {

lambdas/move-scanned-files-lambda/src/__tests__/domain/mapper.test.ts

@@ -45,6 +45,8 @@ describe('mapper', () => {
         subject: `customer/${senderId}/recipient/${messageReference}`,
         source: '/nhs/england/notify/production/primary/digitalletters/print',
         plane: 'data',
+        dataschema:
+          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
         dataschemaversion: '1.0.0',
         datacontenttype: 'application/json',
         traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
@@ -102,6 +104,8 @@ describe('mapper', () => {
         id: 'mocked-uuid-12345',
         subject: `customer/${senderId}/recipient/${messageReference}`,
         plane: 'data',
+        dataschema:
+          'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
         dataschemaversion: '1.0.0',
         datacontenttype: 'application/json',
         source: '/nhs/england/notify/production/primary/digitalletters/print',

lambdas/move-scanned-files-lambda/src/domain/mapper.ts

@@ -12,6 +12,8 @@ export function createFileSafeEvent(
     id: randomUUID(),
     subject: `customer/${senderId}/recipient/${messageReference}`,
     plane: 'data',
+    dataschema:
+      'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
     dataschemaversion: '1.0.0',
     datacontenttype: 'application/json',
     source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.
@@ -40,6 +42,8 @@ export function createFileQuarantinedEvent(
     id: randomUUID(),
     subject: `customer/${senderId}/recipient/${messageReference}`,
     plane: 'data',
+    dataschema:
+      'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
     dataschemaversion: '1.0.0',
     datacontenttype: 'application/json',
     source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.

lambdas/print-sender-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts

@@ -30,6 +30,7 @@ const createValidEvent = (overrides = {}): PDFAnalysed => ({
     'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-pdf-analysed-data.schema.json',
   plane: 'data',
   dataschemaversion: '1.0.0',
+  datacontenttype: 'application/json',
   source: '/nhs/england/notify/production/primary/digitalletters/print',
   specversion: '1.0',
   traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',

lambdas/print-sender-lambda/src/__tests__/app/print-sender.test.ts

@@ -19,6 +19,7 @@ describe('PrintSender', () => {
       '/nhs/england/notify/production/primary/data-plane/digitalletters/print',
     plane: 'data',
     dataschemaversion: '1.0.0',
+    datacontenttype: 'application/json',
     specversion: '1.0',
     traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
     severitynumber: 2,

lambdas/report-generator/src/__tests__/app/report-generator.test.ts

@@ -48,6 +48,8 @@ describe('ReportGenerator', () => {
       datacontenttype: 'application/json',
       subject: 'customer/5661de82-7453-44a1-9922-e0c98e5411c1',
       plane: 'data',
+      dataschema:
+        'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-reporting-generate-report-data.schema.json',
       dataschemaversion: '1.0.0',
       traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
       recordedtime: '2025-12-15T10:00:00Z',

lambdas/report-sender/report_sender/__tests__/test_report_sender_processor.py

@@ -246,7 +246,7 @@ def test_publish_report_sent_event_success(
         assert event['data']['meshMailboxReportsId'] == mesh_mailbox_reports_id
         assert event['specversion'] == '1.0'
         assert event['plane'] == 'data'
-        assert event['dataschemaversion'] == '1.0'
+        assert event['dataschemaversion'] == '1.0.0'
         assert event['datacontenttype'] == 'application/json'
         assert 'id' in event
         assert 'time' in event