Add latest version event schema letter rendering

Author: francisco-videira-nhs

lambdas/upsert-letter/package.json

@@ -3,7 +3,7 @@
     "@aws-sdk/client-dynamodb": "^3.858.0",
     "@aws-sdk/lib-dynamodb": "^3.858.0",
     "@internal/datastore": "*",
-    "@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^1.1.5",
+    "@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^2.0.0",
     "@types/aws-lambda": "^8.10.148",
     "aws-lambda": "^1.0.7",
     "esbuild": "^0.24.0",

lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts

@@ -1,13 +1,13 @@
 import { SNSMessage, SQSEvent } from "aws-lambda";
 import pino from "pino";
 import { LetterRepository } from "internal/datastore/src";
-import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
+import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import createUpsertLetterHandler from "../upsert-handler";
 import { Deps } from "../../config/deps";
 import { EnvVars } from "../../config/env";
 
 function createNotification(
-  event: LetterRequestPreparedEvent,
+  event: LetterRequestPreparedEventV2,
 ): Partial<SNSMessage> {
   return {
     SignatureVersion: "",
@@ -27,7 +27,7 @@ function createNotification(
 
 function createValidEvent(
   overrides: Partial<any> = {},
-): LetterRequestPreparedEvent {
+): LetterRequestPreparedEventV2 {
   // minimal valid event matching the prepared letter schema
   const now = new Date().toISOString();
 
@@ -36,11 +36,11 @@ function createValidEvent(
     id: overrides.id ?? "7b9a03ca-342a-4150-b56b-989109c45613",
     source: "/data-plane/letter-rendering/test",
     subject: "client/client1/letter-request/letterRequest1",
-    type: "uk.nhs.notify.letter-rendering.letter-request.prepared.v1",
+    type: "uk.nhs.notify.letter-rendering.letter-request.prepared.v2",
     time: now,
     dataschema:
-      "https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.1.0.0.schema.json",
-    dataschemaversion: "1.0.0",
+      "https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.2.0.0.schema.json",
+    dataschemaversion: "2.0.0",
     data: {
       domainId: overrides.domainId ?? "letter1",
       letterVariantId: overrides.letterVariantId ?? "lv1",

lambdas/upsert-letter/src/handler/upsert-handler.ts

@@ -1,17 +1,21 @@
-import { SQSBatchItemFailure, SQSEvent, SQSHandler, SNSMessage } from "aws-lambda";
+import {
+  SNSMessage,
+  SQSBatchItemFailure,
+  SQSEvent,
+  SQSHandler,
+} from "aws-lambda";
 import { UpsertLetter } from "@internal/datastore";
 import {
-  $LetterRequestPreparedEvent,
-  LetterRequestPreparedEvent,
+  $LetterRequestPreparedEventV2,
+  LetterRequestPreparedEventV2,
 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import { ZodError } from "zod";
 import { Deps } from "../config/deps";
-import { no } from "zod/v4/locales";
 
 type SupplierSpec = { supplierId: string; specId: string };
 
 function mapToUpsertLetter(
-  upsertRequest: LetterRequestPreparedEvent,
+  upsertRequest: LetterRequestPreparedEventV2,
   supplier: string,
   spec: string,
 ): UpsertLetter {
@@ -52,8 +56,8 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
           );
         }
 
-        const upsertRequest: LetterRequestPreparedEvent =
-          $LetterRequestPreparedEvent.parse(JSON.parse(notification.Message));
+        const upsertRequest: LetterRequestPreparedEventV2 =
+          $LetterRequestPreparedEventV2.parse(JSON.parse(notification.Message));
 
         const supplierSpec: SupplierSpec = resolveSupplierForVariant(
           upsertRequest.data.letterVariantId,