CCM-12896: Changes following self-review

Author: gareth-allan

package-lock.json

@@ -100,11 +100,26 @@ try:
         "dataschema": "https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-pdm-resource-submitted-data.schema.json",
         "specversion": "1.0",
         "id": "0249e529-f947-4012-819e-b634eb71be79",
-        "subject": "pdm-resource-123",
-        "time": "2025-12-11T10:00:00Z",
+        "subject": "customer/7ff8ed41-cd5f-20e4-ef4e-34f96d8cc8ac/75027ace-9b8c-bcfe-866e-6c24242cffc3/q58dnxk5e/4cbek805wwx/yiaw7bl0d/her/1ccb7eb8-c6fe-0a42-279a-2a0e48ff1ca9/zk",
+        "time": "2025-11-21T16:01:52.268Z",
+        "datacontenttype": "application/json",
+        "traceparent": "00-ee4790eb6821064c645406abe918b3da-3a4e6957ce2a15de-01",
+        "tracestate": "nisi quis",
+        "partitionkey": "customer-7ff8ed41",
+        "recordedtime": "2025-11-21T16:01:53.268Z",
+        "sampledrate": 1,
+        "sequence": "00000000000350773861",
+        "severitytext": "INFO",
+        "severitynumber": 2,
+        "dataclassification": "restricted",
+        "dataregulation": "ISO-27001",
+        "datacategory": "non-sensitive",
         "data": {
-            "something": "example value"
-        }
+            "messageReference": "incididunt Ut aute laborum",
+            "senderId": "officia voluptate culpa Ut dolor",
+            "resourceId": "a2bcbb42-ab7e-42b6-88d6-74f8d3ca4a09",
+            "retryCount": 97_903_257,
+        },
     }
 
     # Create and validate the event
@@ -113,7 +128,8 @@ try:
     # Access validated fields
     print(event.id)
     print(event.type)
-    print(event.data.something)
+    print(event.data.messageReference)
 except Exception as e:
     print(e)
+    raise ValueError("Error processing event") from e
 ```

src/digital-letters-events/README.md

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "json-schema-merge-allof": "^0.8.1",
+    "tsx": "^4.21.0",
     "utils": "^0.0.1"
   },
   "description": "A tool to generate Python classes for the application's event schemas.",
@@ -11,7 +12,8 @@
     "@types/node": "^25.0.2",
     "eslint": "^9.39.2",
     "jest": "^29.7.0",
-    "mock-fs": "^5.5.0"
+    "mock-fs": "^5.5.0",
+    "typescript": "^5.9.3"
   },
   "name": "python-schema-generator",
   "private": true,

src/python-schema-generator/package.json

@@ -8,7 +8,6 @@ export function mergeAllOfInSchemas(): void {
   const eventSchemaFilenames = listEventSchemas();
 
   const outputDir = createOutputDir('schemas');
-
   console.log(`Output directory created at ${outputDir}`);
 
   console.group('Merging allOf entries in schemas:');

src/python-schema-generator/src/merge-allof.ts

@@ -1,11 +1,12 @@
 /* eslint-disable security/detect-non-literal-fs-filename */
 
+import { destinationPackageName } from 'file-utils';
 import { generateTypes } from 'generate-types';
 import { compile } from 'json-schema-to-typescript';
 import mockFs from 'mock-fs';
 import { readFileSync, readdirSync } from 'node:fs';
 import path from 'node:path';
-import { destinationPackageName, eventSchemasDir } from 'utils';
+import { eventSchemasDir } from 'utils';
 
 jest.mock('json-schema-to-typescript');
 

src/typescript-schema-generator/src/__tests__/generate-types.test.ts

@@ -1,10 +1,11 @@
 /* eslint-disable security/detect-non-literal-fs-filename */
 import standaloneCode from 'ajv/dist/standalone';
+import { destinationPackageName } from 'file-utils';
 import { generateValidators } from 'generate-validators';
 import mockFs from 'mock-fs';
 import { readFileSync, readdirSync } from 'node:fs';
 import path from 'node:path';
-import { destinationPackageName, eventSchemasDir } from 'utils';
+import { eventSchemasDir } from 'utils';
 
 jest.mock('ajv/dist/2020');
 jest.mock('ajv/dist/standalone');

src/typescript-schema-generator/src/__tests__/generate-validators.test.ts

@@ -3,7 +3,8 @@
 
 import { mkdirSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
-import { destinationPackageName } from 'utils';
+
+export const destinationPackageName = 'digital-letters-events';
 
 /**
  * Creates the specified output directory if it doesn't exist.

src/typescript-schema-generator/src/file-utils.ts

@@ -5,13 +5,13 @@ import path from 'node:path';
 import Ajv from 'ajv/dist/2020';
 
 import standaloneCode from 'ajv/dist/standalone';
-import { createOutputDir, writeFile, writeTypesIndex } from 'file-utils';
 import {
+  createOutputDir,
   destinationPackageName,
-  eventSchemasDir,
-  listEventSchemas,
-  loadSchema,
-} from 'utils';
+  writeFile,
+  writeTypesIndex,
+} from 'file-utils';
+import { eventSchemasDir, listEventSchemas, loadSchema } from 'utils';
 
 export function generateValidators() {
   const ajv = new Ajv({

src/typescript-schema-generator/src/generate-validators.ts

@@ -16,8 +16,6 @@ export const eventSchemasDir = path.resolve(
   'events',
 );
 
-export const destinationPackageName = 'digital-letters-events';
-
 /**
  * Lists all event schema filenames in the digital letters schemas directory.
  *