CCM-12616: Updated base CloudEvent model to match latest schemas

Author: gareth-allan

utils/event-publisher-py/event_publisher/__tests__/test_models.py

@@ -9,8 +9,6 @@ class TestCloudEvent:
     @pytest.fixture
     def valid_event(self):
         return {
-            'profileversion': '1.0.0',
-            'profilepublished': '2025-10',
             'id': '550e8400-e29b-41d4-a716-446655440001',
             'specversion': '1.0',
             'source': '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',

utils/event-publisher-py/event_publisher/models.py

@@ -4,14 +4,6 @@
 
 class CloudEvent(BaseModel):
     # Required fields - NHS Notify CloudEvents profile
-    profileversion: Literal['1.0.0'] = Field(
-        default='1.0.0',
-        description='NHS Notify CloudEvents profile semantic version'
-    )
-    profilepublished: Literal['2025-10'] = Field(
-        default='2025-10',
-        description='NHS Notify CloudEvents profile publication date'
-    )
     specversion: Literal['1.0'] = Field(
         default='1.0',
         description='CloudEvents specification version'
@@ -50,23 +42,19 @@ class CloudEvent(BaseModel):
         ...,
         description='W3C Trace Context traceparent header value'
     )
-    dataschema: str = Field(
-        ...,
-        description='Canonical URI of the event data schema'
-    )
     data: dict[str, Any] = Field(
         ...,
         description='Digital letters payload'
     )
 
     # Optional fields
-    datacontenttype: Optional[Literal['application/json']] = Field(
+    dataschema: Optional[str] = Field(
         None,
-        description='Media type for the data field'
+        description='Canonical URI of the event data schema'
     )
-    dataschemaversion: Optional[str] = Field(
+    datacontenttype: Optional[Literal['application/json']] = Field(
         None,
-        description='Version of the data schema'
+        description='Media type for the data field'
     )
     severitytext: Optional[Literal['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL']] = Field(
         None,
@@ -111,7 +99,7 @@ def validate_source(cls, v: str) -> str:
             raise ValueError('Source cannot be empty')
         import re
         # Must match NHS Notify CloudEvents pattern
-        pattern = r'^/nhs/england/notify/(production|staging|development|uat)/(primary|secondary|dev-\d+)/(data-plane|control-plane)/digitalletters/mesh$'
+        pattern = r'^/nhs/england/notify/(production|staging|development|uat)/(primary|secondary|dev-\d+)/data-plane/digitalletters/mesh$'
 
         if not re.match(pattern, v):
             raise ValueError(