CCM-15019: Address review comments

Author: nhsd-angel-pastor

infrastructure/terraform/components/dl/cloudwatch_event_rule_data_plane.tf

@@ -8,6 +8,9 @@ resource "aws_cloudwatch_event_rule" "data_plane" {
       "plane" : [
         "data"
       ],
+      "type" : [{
+        "prefix" : "uk.nhs.notify.digital.letters."
+      }]
     }
   })
 }

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

@@ -41,6 +41,7 @@ describe('SQS Handler', () => {
             id: '550e8400-e29b-41d4-a716-446655440001',
             time: '2023-06-20T12:00:00.250Z',
             recordedtime: '2023-06-20T12:00:00.250Z',
+            plane: 'data',
             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',

lambdas/report-scheduler/src/__tests__/apis/scheduled-event-handler.test.ts

@@ -108,6 +108,10 @@ describe('scheduled-event-handler', () => {
       );
       expect(event.time).toBe('2024-01-15T12:00:00.000Z');
       expect(event.severitynumber).toBe(2);
+      expect(event.dataschema).toBe(
+        'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-reporting-generate-report-data.schema.json',
+      );
+      expect(event.dataschemaversion).toBe('1.0.0');
       expect(event.datacontenttype).toBe('application/json');
 
       expect(() => validateGenerateReport(event, mockLogger)).not.toThrow();

utils/py-utils/dl_utils/__tests__/test_event_publisher.py

@@ -45,7 +45,6 @@ def valid_cloud_event():
         'id': '550e8400-e29b-41d4-a716-446655440001',
         'specversion': '1.0',
         'plane': 'data',
-        'dataschemaversion': '1.0.0',
         '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.received.v1',
@@ -72,7 +71,6 @@ def valid_cloud_event2():
         'id': '550e8400-e29b-41d4-a716-446655440002',
         'specversion': '1.0',
         'plane': 'data',
-        'dataschemaversion': '1.0.0',
         'source': '/nhs/england/notify/development/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.received.v1',