CCM-15019: adding plane: data

Author: nhsd-angel-pastor

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

@@ -60,8 +60,8 @@ export const mockResponse: SingleMessageResponse = {
 
 export const validPdmEvent: PDMResourceAvailable = {
   id: 'event-id-123',
-  source:
-    '/nhs/england/notify/development/dev-12345/data-plane/digitalletters/pdm',
+  plane: 'data',
+  source: '/nhs/england/notify/development/dev-12345/digitalletters/pdm',
   specversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
   time: '2025-12-15T10:00:00Z',

lambdas/core-notifier-lambda/src/__tests__/domain/mapper.test.ts

@@ -28,6 +28,7 @@ describe('mapper', () => {
     specversion: '1.0',
     id: 'event-123',
     source: 'pdm-service',
+    plane: 'data',
     subject: 'resource/available',
     type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
     time: '2024-01-15T10:30:00Z',

lambdas/file-scanner-lambda/src/__tests__/apis/sqs-handler.test.ts

@@ -42,8 +42,8 @@ const createValidItemDequeuedBody = (
     detail: {
       specversion: '1.0',
       id: `event-${messageReference}`,
-      source:
-        '/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
+      plane: 'data',
+      source: '/nhs/england/notify/development/primary/digitalletters/queue',
       subject: `message/${messageReference}`,
       type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
       time: '2026-01-19T12:00:00Z',
@@ -319,7 +319,7 @@ describe('SQS Handler', () => {
               specversion: '1.0',
               id: 'event-001',
               source:
-                '/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
+                '/nhs/england/notify/development/primary/digitalletters/queue',
               type: 'uk.nhs.notify.wrong.event.type.v1',
               time: '2026-01-19T12:00:00Z',
               data: {
@@ -386,7 +386,7 @@ describe('SQS Handler', () => {
               specversion: '1.0',
               id: 'event-001',
               source:
-                '/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
+                '/nhs/england/notify/development/primary/digitalletters/queue',
               type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
               time: '2026-01-19T12:00:00Z',
               data: {

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

@@ -9,7 +9,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
         "specversion": "1.0",
         "source": (
             "/nhs/england/notify/production/primary/"
-            'data-plane/digitalletters/mesh'
+            'digitalletters/mesh'
         ),
         "subject": (
             'customer/920fca11-596a-4eca-9c47-99f624614658/'
@@ -18,6 +18,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
         "type": (
             'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1'
         ),
+        "plane": "data",
         "time": '2026-01-08T10:00:00Z',
         "recordedtime": '2026-01-08T10:00:00Z',
         "severitynumber": 2,

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

@@ -66,12 +66,13 @@ def create_invalid_sqs_record(event_id: str) -> Dict[str, str]:
             'detail': {
                 'id': event_id,
                 'specversion': '1.0',
-                'source': '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
+                'source': '/nhs/england/notify/production/primary/digitalletters/mesh',
                 'subject': (
                     'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/'
                     '769acdd4-6a47-496f-999f-76a6fd2c3959'
                 ),
                 'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
+                'plane': 'data',
                 'time': '2026-01-08T10:00:00Z',
                 'recordedtime': '2026-01-08T10:00:00Z',
                 'severitynumber': 2,
@@ -155,6 +156,7 @@ def test_publish_success(
             'time': fixed_time.isoformat(),
             'recordedtime': fixed_time.isoformat(),
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
+            'plane': 'data',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'

lambdas/mesh-acknowledge/mesh_acknowledge/events.py

@@ -51,6 +51,7 @@ def publish_acknowledged_event(
             'time': now,
             'recordedtime': now,
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
+            'plane': 'data',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'

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

@@ -38,9 +38,10 @@ def create_valid_cloud_event():
     return {
         'id': str(uuid4()),
         'specversion': '1.0',
-        'source': '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh',
+        'source': '/nhs/england/notify/development/primary/digitalletters/mesh',
         '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',
         'time': '2023-01-01T12:00:00Z',
         'recordedtime': '2023-01-01T12:00:00Z',
         'severitynumber': 2,
@@ -159,9 +160,10 @@ def test_process_sqs_message_success(self, mock_datetime):
 
         # Verify CloudEvent envelope fields
         assert published_event['type'] == 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1'
-        assert published_event['source'] == '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh'
+        assert published_event['source'] == '/nhs/england/notify/development/primary/digitalletters/mesh'
         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 'id' in published_event
         assert 'tracestate' not in published_event
         assert 'partitionkey' not in published_event

lambdas/mesh-download/mesh_download/processor.py

@@ -115,6 +115,7 @@ def _publish_downloaded_event(self, incoming_event, message_uri):
             'time': now,
             'recordedtime': now,
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
+            'plane': 'data',
             'dataschema': (
                 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
                 'digital-letters-mesh-inbox-message-downloaded-data.schema.json'

lambdas/mesh-poll/mesh_poll/processor.py

@@ -30,9 +30,8 @@ def __init__(self, **kwargs):
 
         environment = 'development'
         deployment = 'primary'
-        plane = 'data-plane'
         self.__cloud_event_source = (
-            f'/nhs/england/notify/{environment}/{deployment}/{plane}/'
+            f'/nhs/england/notify/{environment}/{deployment}/'
             'digitalletters/mesh'
         )
 
@@ -163,6 +162,7 @@ def _publish_mesh_inbox_message_received_event(self, event_detail):
                 f'{event_detail["data"]["messageReference"]}'
             ),
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
+            'plane': 'data',
             'time': now,
             'recordedtime': now,
             'severitynumber': 2,
@@ -199,6 +199,7 @@ def _publish_mesh_inbox_message_invalid_event(self, event_detail):
             'source': self.__cloud_event_source,
             'subject': f'customer/{event_detail["data"]["senderId"]}',
             'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.invalid.v1',
+            'plane': 'data',
             'time': now,
             'recordedtime': now,
             'severitynumber': 3,

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

@@ -68,6 +68,7 @@ describe('sqs-handler', () => {
           specversion: '1.0',
           id: 'test-id',
           source: '/test',
+          plane: 'data',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {
@@ -107,6 +108,7 @@ describe('sqs-handler', () => {
         specversion: '1.0',
         id: 'test-id-1',
         source: '/test',
+        plane: 'data',
         type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -125,6 +127,7 @@ describe('sqs-handler', () => {
         specversion: '1.0',
         id: 'test-id-2',
         source: '/test',
+        plane: 'data',
         type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
         time: '2024-01-01T00:00:00Z',
         data: {
@@ -190,6 +193,7 @@ describe('sqs-handler', () => {
           specversion: '1.0',
           id: 'test-id',
           source: '/test',
+          plane: 'data',
           type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
           time: '2024-01-01T00:00:00Z',
           data: {