CCM-15019: adding dataschemaversion

nhsd-angel-pastor · nhsd-angel-pastor · commit 6bf912333dbd · 2026-04-08T15:53:48.000+01:00
diff --git a/lambdas/core-notifier-lambda/src/__tests__/constants.ts b/lambdas/core-notifier-lambda/src/__tests__/constants.ts
@@ -61,6 +61,7 @@ export const mockResponse: SingleMessageResponse = {
 export const validPdmEvent: PDMResourceAvailable = {
   id: 'event-id-123',
   plane: 'data',
+  dataschemaversion: '1.0',
   source: '/nhs/england/notify/development/dev-12345/digitalletters/pdm',
   specversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
diff --git a/lambdas/core-notifier-lambda/src/__tests__/domain/mapper.test.ts b/lambdas/core-notifier-lambda/src/__tests__/domain/mapper.test.ts
@@ -29,6 +29,7 @@ describe('mapper', () => {
     id: 'event-123',
     source: 'pdm-service',
     plane: 'data',
+    dataschemaversion: '1.0',
     subject: 'resource/available',
     type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
     time: '2024-01-15T10:30:00Z',
diff --git a/lambdas/file-scanner-lambda/src/__tests__/apis/sqs-handler.test.ts b/lambdas/file-scanner-lambda/src/__tests__/apis/sqs-handler.test.ts
@@ -43,6 +43,7 @@ const createValidItemDequeuedBody = (
       specversion: '1.0',
       id: `event-${messageReference}`,
       plane: 'data',
+      dataschemaversion: '1.0',
       source: '/nhs/england/notify/development/primary/digitalletters/queue',
       subject: `message/${messageReference}`,
       type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
diff --git a/lambdas/mesh-acknowledge/mesh_acknowledge/__tests__/test_events.py b/lambdas/mesh-acknowledge/mesh_acknowledge/__tests__/test_events.py
@@ -73,6 +73,7 @@ def create_invalid_sqs_record(event_id: str) -> Dict[str, str]:
                 ),
                 'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
                 'plane': 'data',
+                'dataschemaversion': '1.0',
                 'time': '2026-01-08T10:00:00Z',
                 'recordedtime': '2026-01-08T10:00:00Z',
                 'severitynumber': 2,
@@ -157,6 +158,7 @@ def test_publish_success(
             'recordedtime': fixed_time.isoformat(),
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'
diff --git a/lambdas/mesh-acknowledge/mesh_acknowledge/events.py b/lambdas/mesh-acknowledge/mesh_acknowledge/events.py
@@ -52,6 +52,7 @@ def publish_acknowledged_event(
             'recordedtime': now,
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'
diff --git a/lambdas/mesh-download/mesh_download/__tests__/test_processor.py b/lambdas/mesh-download/mesh_download/__tests__/test_processor.py
@@ -42,6 +42,7 @@ def create_valid_cloud_event():
         'subject': 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
         'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
         'plane': 'data',
+        'dataschemaversion': '1.0',
         'time': '2023-01-01T12:00:00Z',
         'recordedtime': '2023-01-01T12:00:00Z',
         'severitynumber': 2,
@@ -164,6 +165,7 @@ 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 'id' in published_event
         assert 'tracestate' not in published_event
         assert 'partitionkey' not in published_event
diff --git a/lambdas/mesh-download/mesh_download/processor.py b/lambdas/mesh-download/mesh_download/processor.py
@@ -116,6 +116,7 @@ def _publish_downloaded_event(self, incoming_event, message_uri):
             'recordedtime': now,
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-downloaded-data.schema.json'
diff --git a/lambdas/mesh-poll/mesh_poll/processor.py b/lambdas/mesh-poll/mesh_poll/processor.py
@@ -163,6 +163,7 @@ def _publish_mesh_inbox_message_received_event(self, event_detail):
             ),
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'time': now,
             'recordedtime': now,
             'severitynumber': 2,
@@ -200,6 +201,7 @@ def _publish_mesh_inbox_message_invalid_event(self, event_detail):
             'subject': f'customer/{event_detail["data"]["senderId"]}',
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.invalid.v1',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'time': now,
             'recordedtime': now,
             'severitynumber': 3,
diff --git a/lambdas/move-scanned-files-lambda/src/__tests__/apis/sqs-handler.test.ts b/lambdas/move-scanned-files-lambda/src/__tests__/apis/sqs-handler.test.ts
@@ -69,6 +69,7 @@ describe('sqs-handler', () => {
           id: 'test-id',
           source: '/test',
           plane: 'data',
+          dataschemaversion: '1.0',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {
@@ -109,6 +110,7 @@ describe('sqs-handler', () => {
         id: 'test-id-1',
         source: '/test',
         plane: 'data',
+        dataschemaversion: '1.0',
         type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -128,6 +130,7 @@ describe('sqs-handler', () => {
         id: 'test-id-2',
         source: '/test',
         plane: 'data',
+        dataschemaversion: '1.0',
         type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -194,6 +197,7 @@ describe('sqs-handler', () => {
           id: 'test-id',
           source: '/test',
           plane: 'data',
+          dataschemaversion: '1.0',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {
diff --git a/lambdas/move-scanned-files-lambda/src/__tests__/domain/mapper.test.ts b/lambdas/move-scanned-files-lambda/src/__tests__/domain/mapper.test.ts
@@ -45,6 +45,7 @@ describe('mapper', () => {
         subject: `customer/${senderId}/recipient/${messageReference}`,
         source: '/nhs/england/notify/production/primary/digitalletters/print',
         plane: 'data',
+        dataschemaversion: '1.0',
         traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
         type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
         time: '2024-01-15T10:30:00.000Z',
@@ -100,6 +101,7 @@ describe('mapper', () => {
         id: 'mocked-uuid-12345',
         subject: `customer/${senderId}/recipient/${messageReference}`,
         plane: 'data',
+        dataschemaversion: '1.0',
         source: '/nhs/england/notify/production/primary/digitalletters/print',
         traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
         type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
diff --git a/lambdas/move-scanned-files-lambda/src/domain/mapper.ts b/lambdas/move-scanned-files-lambda/src/domain/mapper.ts
@@ -12,6 +12,7 @@ export function createFileSafeEvent(
     id: randomUUID(),
     subject: `customer/${senderId}/recipient/${messageReference}`,
     plane: 'data',
+    dataschemaversion: '1.0',
     source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.
     traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01', // Note CCM-14255.
     type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
@@ -38,6 +39,7 @@ export function createFileQuarantinedEvent(
     id: randomUUID(),
     subject: `customer/${senderId}/recipient/${messageReference}`,
     plane: 'data',
+    dataschemaversion: '1.0',
     source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.
     traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01', // Note CCM-14255.
     type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
diff --git a/lambdas/pdm-poll-lambda/src/__tests__/test-data.ts b/lambdas/pdm-poll-lambda/src/__tests__/test-data.ts
@@ -11,6 +11,7 @@ const baseEvent = {
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
   plane: 'data',
+  dataschemaversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.pdm.resource.submitted.v1',
   time: '2023-06-20T12:00:00Z',
   recordedtime: '2023-06-20T12:00:00.250Z',
diff --git a/lambdas/pdm-uploader-lambda/src/__tests__/data.ts b/lambdas/pdm-uploader-lambda/src/__tests__/data.ts
@@ -5,6 +5,7 @@ export const mockEvent: MESHInboxMessageDownloaded = {
   specversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/mesh',
   plane: 'data',
+  dataschemaversion: '1.0',
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
   type: 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
diff --git a/lambdas/print-analyser/src/__tests__/test-data.ts b/lambdas/print-analyser/src/__tests__/test-data.ts
@@ -8,6 +8,7 @@ export const fileSafeEvent: FileSafe = {
   specversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/print',
   plane: 'data',
+  dataschemaversion: '1.0',
   subject:
     'letter-origin/digital-letters/letter/f47ac10b-58cc-4372-a567-0e02b2c3d479',
   type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
diff --git a/lambdas/print-sender-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts b/lambdas/print-sender-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts
@@ -29,6 +29,7 @@ const createValidEvent = (overrides = {}): PDFAnalysed => ({
   dataschema:
     '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',
   source: '/nhs/england/notify/production/primary/digitalletters/print',
   specversion: '1.0',
   traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
diff --git a/lambdas/print-sender-lambda/src/__tests__/app/print-sender.test.ts b/lambdas/print-sender-lambda/src/__tests__/app/print-sender.test.ts
@@ -18,6 +18,7 @@ describe('PrintSender', () => {
     source:
       '/nhs/england/notify/production/primary/data-plane/digitalletters/print',
     plane: 'data',
+    dataschemaversion: '1.0',
     specversion: '1.0',
     traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
     severitynumber: 2,
diff --git a/lambdas/print-status-handler/src/__tests__/apis/sqs-handler.test.ts b/lambdas/print-status-handler/src/__tests__/apis/sqs-handler.test.ts
@@ -48,6 +48,7 @@ describe('SQS Handler', () => {
               '/nhs/england/notify/production/primary/digitalletters/print',
             subject:
               'client/f47ac10b-58cc-4372-a567-0e02b2c3d479/letter-request/2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
+            dataschemaversion: '1.0',
             data: {
               senderId: acceptedLetterEvent.data.origin.subject.split('/')[1],
               messageReference:
@@ -87,6 +88,7 @@ describe('SQS Handler', () => {
               '/nhs/england/notify/production/primary/digitalletters/print',
             subject:
               'client/f47ac10b-58cc-4372-a567-0e02b2c3d480/letter-request/2503cbd5-6722-4e90-9fbd-5f1e96d65c22',
+            dataschemaversion: '1.0',
             data: {
               senderId: failedLetterEvent.data.origin.subject.split('/')[1],
               messageReference:
diff --git a/lambdas/print-status-handler/src/apis/sqs-handler.ts b/lambdas/print-status-handler/src/apis/sqs-handler.ts
@@ -114,6 +114,8 @@ function generateUpdatedEvent(event: LetterEvent): PrintLetterTransitioned {
     type: 'uk.nhs.notify.digital.letters.print.letter.transitioned.v1',
     // NOTE: CCM-13892 Generate event digital letters source property from scratch
     source: '/nhs/england/notify/production/primary/digitalletters/print',
+    plane: 'data',
+    dataschemaversion: '1.0',
     data: {
       senderId,
       messageReference,
diff --git a/lambdas/report-generator/src/__tests__/apis/sqs-trigger-lambda.test.ts b/lambdas/report-generator/src/__tests__/apis/sqs-trigger-lambda.test.ts
@@ -25,6 +25,7 @@ const createMockSQSRecord = (
         event.source ||
         '/nhs/england/notify/development/primary/digitalletters/reporting',
       plane: 'data',
+      dataschemaversion: '1.0',
       specversion: event.specversion || '1.0',
       type:
         event.type ||
diff --git a/lambdas/report-generator/src/__tests__/app/report-generator.test.ts b/lambdas/report-generator/src/__tests__/app/report-generator.test.ts
@@ -48,6 +48,7 @@ describe('ReportGenerator', () => {
       datacontenttype: 'application/json',
       subject: 'customer/5661de82-7453-44a1-9922-e0c98e5411c1',
       plane: 'data',
+      dataschemaversion: '1.0',
       traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
       recordedtime: '2025-12-15T10:00:00Z',
       severitynumber: 2,
diff --git a/lambdas/report-scheduler/src/apis/scheduled-event-handler.ts b/lambdas/report-scheduler/src/apis/scheduled-event-handler.ts
@@ -28,6 +28,7 @@ export const createHandler = ({
         specversion: '1.0',
         id: randomUUID(),
         plane: 'data',
+        dataschemaversion: '1.0',
         source:
           '/nhs/england/notify/production/primary/digitalletters/reporting', // CCM-13892
         subject: `customer/${sender.senderId}`,
diff --git a/lambdas/report-sender/report_sender/__tests__/test_report_sender_processor.py b/lambdas/report-sender/report_sender/__tests__/test_report_sender_processor.py
@@ -96,6 +96,7 @@ def create_valid_sqs_record(sender_id=SENDER_ID, report_uri=REPORT_URI):
                 'subject': 'customer/920fca11-596a-4eca-9c47-99f624614658',
                 'type': 'uk.nhs.notify.digital.letters.reporting.report.generated.v1',
                 'plane': 'data',
+                'dataschemaversion': '1.0',
                 'time': '2026-02-03T10:00:00Z',
                 'datacontenttype': 'application/json',
                 'dataschema': 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-reporting-report-generated-data.schema.json',
@@ -135,6 +136,7 @@ def test_parse_and_validate_event_validation_error(self, processor, mock_logger)
                     'source': '/test/source',
                     'type': 'uk.nhs.notify.digital.letters.reporting.report.generated.v1',
                     'plane': 'data',
+                    'dataschemaversion': '1.0',
                     'time': '2026-02-03T10:00:00Z',
                     'data': {
                         # Missing required fields
@@ -244,6 +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 'id' in event
         assert 'time' in event
         assert 'recordedtime' in event
diff --git a/lambdas/report-sender/report_sender/report_sender_processor.py b/lambdas/report-sender/report_sender/report_sender_processor.py
@@ -93,6 +93,7 @@ def _publish_report_sent_event(self, sender_id, mesh_mailbox_reports_id, report_
             'source': self.__cloud_event_source,
             'subject': f'customer/{sender_id}',
             'plane': 'data',
+            'dataschemaversion': '1.0',
             'type': 'uk.nhs.notify.digital.letters.reporting.report.sent.v1',
             'time': now,
             'recordedtime': now,
diff --git a/lambdas/ttl-create-lambda/src/__tests__/data.ts b/lambdas/ttl-create-lambda/src/__tests__/data.ts
@@ -7,6 +7,7 @@ export const messageDownloadedEvent: MESHInboxMessageDownloaded = {
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
   plane: 'data',
+  dataschemaversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
   time: '2023-06-20T12:00:00Z',
   recordedtime: '2023-06-20T12:00:00.250Z',
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
@@ -39,6 +39,7 @@ const mockEvent: DynamoDBStreamEvent = {
                 S: 'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
               },
               plane: { S: 'data' },
+              dataschemaversion: { S: '1.0' },
               type: {
                 S: 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
               },
diff --git a/src/cloudevents/domains/digital-letters/2025-10-draft/digital-letters-profile.schema.yaml b/src/cloudevents/domains/digital-letters/2025-10-draft/digital-letters-profile.schema.yaml
@@ -4,7 +4,6 @@ description: NHS Notify Digital Letters profile for CloudEvents 1.0 including ad
 type: object
 allOf:
   - $ref: https://notify.nhs.uk/cloudevents/schemas/common/2026-04/nhs-notify-profile.schema.json
-  #- $ref: ./nhs-notify-profile.schema.yaml
 properties:
   type:
     type: string
@@ -22,3 +21,9 @@ properties:
     type: string
     enum:
       - data
+  dataschemaversion:
+    type: string
+    const: "1.0"
+    description: Data Schema version (fixed to 1.0).
+    examples:
+      - "1.0"
diff --git a/tests/playwright/digital-letters-component-tests/core-notify.component.spec.ts b/tests/playwright/digital-letters-component-tests/core-notify.component.spec.ts
@@ -22,6 +22,7 @@ import { v4 as uuidv4 } from 'uuid';
 const baseEvent: Omit<PDMResourceAvailable, 'id' | 'data'> = {
   specversion: '1.0',
   plane: 'data',
+  dataschemaversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/pdm',
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
diff --git a/tests/playwright/digital-letters-component-tests/file-scanner.component.spec.ts b/tests/playwright/digital-letters-component-tests/file-scanner.component.spec.ts
@@ -59,6 +59,7 @@ test('should extract PDF from DocumentReference and store in unscanned bucket wi
       {
         id: eventId,
         plane: 'data',
+        dataschemaversion: '1.0',
         specversion: '1.0',
         source: `/nhs/england/notify/development/dev-1/digitalletters/queue`,
         subject: `message/${messageReference}`,
@@ -127,6 +128,7 @@ test('should handle validation errors by sending messages to DLQ', async () => {
         id: eventId,
         specversion: '1.0',
         plane: 'data',
+        dataschemaversion: '1.0',
         source: `/nhs/england/notify/development/dev-1/digitalletters/queue`,
         subject: `message/${messageReference}`,
         type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
diff --git a/tests/playwright/digital-letters-component-tests/mesh-acknowledge.component.spec.ts b/tests/playwright/digital-letters-component-tests/mesh-acknowledge.component.spec.ts
@@ -25,6 +25,7 @@ test.describe('Digital Letters - Mesh Acknowledger', () => {
     id: uuidv4(),
     specversion: '1.0',
     plane: 'data',
+    dataschemaversion: '1.0',
     source: '/nhs/england/notify/production/primary/digitalletters/mesh',
     subject:
       'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
diff --git a/tests/playwright/digital-letters-component-tests/mesh-poll-download.component.spec.ts b/tests/playwright/digital-letters-component-tests/mesh-poll-download.component.spec.ts
@@ -123,6 +123,7 @@ test.describe('Digital Letters - MESH Poll and Download', () => {
           id: uuidv4(),
           specversion: '1.0',
           plane: 'data',
+          dataschemaversion: '1.0',
           source: '/nhs/england/notify/development/primary/digitalletters/mesh',
           subject:
             'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
diff --git a/tests/playwright/digital-letters-component-tests/pdm-poll.component.spec.ts b/tests/playwright/digital-letters-component-tests/pdm-poll.component.spec.ts
@@ -17,6 +17,7 @@ import { v4 as uuidv4 } from 'uuid';
 const baseEvent = {
   specversion: '1.0',
   plane: 'data',
+  dataschemaversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/pdm',
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
diff --git a/tests/playwright/digital-letters-component-tests/pdm-uploader.component.spec.ts b/tests/playwright/digital-letters-component-tests/pdm-uploader.component.spec.ts
@@ -37,6 +37,7 @@ const pdmRequest = {
 const baseEvent = {
   specversion: '1.0',
   plane: 'data',
+  dataschemaversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/mesh',
   subject:
     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
diff --git a/tests/playwright/digital-letters-component-tests/print-analyser.component.spec.ts b/tests/playwright/digital-letters-component-tests/print-analyser.component.spec.ts
@@ -18,6 +18,7 @@ export const fileSafeEvent: FileSafe = {
   id: '550e8400-e29b-41d4-a716-446655440001',
   specversion: '1.0',
   plane: 'data',
+  dataschemaversion: '1.0',
   source: '/nhs/england/notify/production/primary/digitalletters/print',
   subject:
     'letter-origin/digital-letters/letter/f47ac10b-58cc-4372-a567-0e02b2c3d479',
diff --git a/tests/playwright/digital-letters-component-tests/print-sender.component.spec.ts b/tests/playwright/digital-letters-component-tests/print-sender.component.spec.ts
@@ -28,6 +28,7 @@ test.describe('Digital Letters - Print Sender', () => {
           id: letterId,
           specversion: '1.0',
           plane: 'data',
+          dataschemaversion: '1.0',
           source: '/nhs/england/notify/production/primary/digitalletters/print',
           subject:
             'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
@@ -77,6 +78,7 @@ test.describe('Digital Letters - Print Sender', () => {
       id: uuidv4(),
       specversion: '1.0',
       plane: 'data',
+      dataschemaversion: '1.0',
       source: '/nhs/england/notify/production/primary/digitalletters/print',
       subject:
         'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
diff --git a/tests/playwright/digital-letters-component-tests/send-reports-trust.component.spec.ts b/tests/playwright/digital-letters-component-tests/send-reports-trust.component.spec.ts
@@ -26,6 +26,7 @@ test.describe('Digital Letters - Send reports to Trust', () => {
           id: uuidv4(),
           specversion: '1.0',
           plane: 'data',
+          dataschemaversion: '1.0',
           source:
             '/nhs/england/notify/development/dev-12345/digitalletters/reporting',
           subject: `report/${uuidv4()}`,
diff --git a/tests/playwright/digital-letters-component-tests/ttl-create.component.spec.ts b/tests/playwright/digital-letters-component-tests/ttl-create.component.spec.ts
diff --git a/tests/playwright/digital-letters-component-tests/ttl-handle.component.spec.ts b/tests/playwright/digital-letters-component-tests/ttl-handle.component.spec.ts
diff --git a/tests/playwright/helpers/event-builders.ts b/tests/playwright/helpers/event-builders.ts
diff --git a/tests/playwright/helpers/report-helpers.ts b/tests/playwright/helpers/report-helpers.ts
diff --git a/utils/py-utils/dl_utils/__tests__/test_event_publisher.py b/utils/py-utils/dl_utils/__tests__/test_event_publisher.py
