Merge branch 'CCM-12869-excel-parser' into CCM-12869-supplier-reports

Author: m-houston

packages/event-builder/src/__tests__/letter-variant-event-builder.test.ts

@@ -11,6 +11,7 @@ describe("letter-variant-event-builder", () => {
     description: "Test",
     volumeGroupId: "volume-group-123" as any,
     type: "STANDARD",
+    priority: 10,
     packSpecificationIds: ["00000000-0000-0000-0000-000000000001" as any],
     clientId: "client-1",
   };

packages/events/package.json

@@ -39,5 +39,5 @@
     "test:unit": "jest"
   },
   "types": "dist/index.d.ts",
-  "version": "1.0.2"
+  "version": "1.1.0"
 }

packages/events/src/domain/letter-variant.ts

@@ -4,7 +4,7 @@ import { $PackSpecification } from "@nhsdigital/nhs-notify-event-schemas-supplie
 import { z } from "zod";
 import { $VolumeGroup } from "./volume-group";
 import { $Supplier } from "./supplier";
-import { $Constraint, $Constraints } from "./constraint";
+import { $Constraints } from "./constraint";
 
 export const $LetterType = z.enum(["STANDARD", "BRAILLE", "AUDIO"]);
 
@@ -44,6 +44,11 @@ export const $LetterVariant = z
           "This is used to restrict a particular variant to a single supplier, " +
           "for example individual admail campaigns.",
       }),
+    priority: z.int().min(1).max(99).default(50).meta({
+      title: "Priority",
+      description:
+        "Integer priority used to order letters for dispatch to suppliers on a 1 to 99 scale, where lower values indicate higher priority. Defaults to 50 when omitted.",
+    }),
     packSpecificationIds: z.array(idRef($PackSpecification)).nonempty().meta({
       title: "Pack Specifications",
       description:

packages/events/src/events/__tests__/letter-variant-events.test.ts

@@ -28,6 +28,7 @@ describe("LetterVariant Events", () => {
         description: "A standard letter variant for general correspondence",
         volumeGroupId: "supplier-framework-123",
         type: "STANDARD",
+        priority: 10,
         status: "PROD",
         packSpecificationIds: ["bau-standard-c5", "bau-standard-c4"],
       },
@@ -68,6 +69,7 @@ describe("LetterVariant Events", () => {
           name: "Braille Letter Variant",
           volumeGroupId: "supplier-framework-123",
           type: "BRAILLE",
+          priority: 20,
           status: "PROD",
           packSpecificationIds: ["braille"],
         },
@@ -85,6 +87,7 @@ describe("LetterVariant Events", () => {
           name: "Audio Letter Variant",
           volumeGroupId: "supplier-framework-123",
           type: "AUDIO",
+          priority: 30,
           status: "PROD",
           packSpecificationIds: ["audio"],
         },
@@ -173,6 +176,86 @@ describe("LetterVariant Events", () => {
       expect(result.success).toBe(false);
     });
 
+    it("should reject event with non-integer priority", () => {
+      const invalidEvent = {
+        ...validProdEvent,
+        data: {
+          ...validProdEvent.data,
+          priority: 1.5,
+        },
+      };
+
+      const result = $LetterVariantEvent.safeParse(invalidEvent);
+      expect(result.success).toBe(false);
+    });
+
+    it("should default priority to 50 when omitted", () => {
+      const { priority, ...dataWithoutPriority } = validProdEvent.data;
+      expect(priority).toBe(10);
+      const eventWithoutPriority = {
+        ...validProdEvent,
+        data: dataWithoutPriority,
+      };
+
+      const result = $LetterVariantEvent.safeParse(eventWithoutPriority);
+      expect(result.success).toBe(true);
+      expect(result.data?.data.priority).toBe(50);
+    });
+
+    it("should validate priority at the highest boundary value", () => {
+      const eventAtHighestPriority = {
+        ...validProdEvent,
+        data: {
+          ...validProdEvent.data,
+          priority: 1,
+        },
+      };
+
+      const result = $LetterVariantEvent.safeParse(eventAtHighestPriority);
+      expect(result.success).toBe(true);
+      expect(result.data?.data.priority).toBe(1);
+    });
+
+    it("should validate priority at the lowest boundary value", () => {
+      const eventAtLowestPriority = {
+        ...validProdEvent,
+        data: {
+          ...validProdEvent.data,
+          priority: 99,
+        },
+      };
+
+      const result = $LetterVariantEvent.safeParse(eventAtLowestPriority);
+      expect(result.success).toBe(true);
+      expect(result.data?.data.priority).toBe(99);
+    });
+
+    it("should reject priority lower than the allowed range", () => {
+      const invalidEvent = {
+        ...validProdEvent,
+        data: {
+          ...validProdEvent.data,
+          priority: 0,
+        },
+      };
+
+      const result = $LetterVariantEvent.safeParse(invalidEvent);
+      expect(result.success).toBe(false);
+    });
+
+    it("should reject priority higher than the allowed range", () => {
+      const invalidEvent = {
+        ...validProdEvent,
+        data: {
+          ...validProdEvent.data,
+          priority: 100,
+        },
+      };
+
+      const result = $LetterVariantEvent.safeParse(invalidEvent);
+      expect(result.success).toBe(false);
+    });
+
     it("should validate specialised schema enforces PROD status", () => {
       const prodSchema = letterVariantEvents["letter-variant.prod"];
 
@@ -290,6 +373,7 @@ describe("LetterVariant Events", () => {
         name: "Disabled Letter Variant",
         volumeGroupId: "supplier-framework-123",
         type: "STANDARD",
+        priority: 15,
         status: "INT",
         packSpecificationIds: ["bau-standard-c5"],
       },
@@ -350,6 +434,7 @@ describe("LetterVariant Events", () => {
         description: "A letter variant that has been disabled",
         volumeGroupId: "supplier-framework-123",
         type: "STANDARD",
+        priority: 15,
         status: "DISABLED",
         packSpecificationIds: ["bau-standard-c5"],
       },

packages/events/src/examples/specification-examples.ts

@@ -167,6 +167,7 @@ const variants: Record<string, LetterVariant> = {
     volumeGroupId: "volume-group-12345",
     packSpecificationIds: [bauStandardC5.id, bauStandardC4.id],
     type: "STANDARD",
+    priority: 10,
     status: "PROD",
     constraints: {
       sheets: {
@@ -186,6 +187,7 @@ const variants: Record<string, LetterVariant> = {
     volumeGroupId: "volume-group-12345",
     packSpecificationIds: [braille.id],
     type: "BRAILLE",
+    priority: 20,
     status: "PROD",
     constraints: {
       sheets: {
@@ -205,6 +207,7 @@ const variants: Record<string, LetterVariant> = {
     volumeGroupId: "volume-group-12345",
     packSpecificationIds: [audio.id],
     type: "AUDIO",
+    priority: 30,
     status: "PROD",
     constraints: {
       sheets: {
@@ -224,6 +227,7 @@ const variants: Record<string, LetterVariant> = {
     volumeGroupId: "volume-group-12345",
     packSpecificationIds: [sameDay.id],
     type: "STANDARD",
+    priority: 5,
     status: "PROD",
     constraints: {
       sheets: {
@@ -243,6 +247,7 @@ const variants: Record<string, LetterVariant> = {
     volumeGroupId: "volume-group-campaign1",
     packSpecificationIds: [clientPack1.id],
     type: "STANDARD",
+    priority: 40,
     status: "PROD",
     clientId: "client1",
     campaignIds: ["client1-campaign1"],