import schemas from nhs-notify-event-schemas-supplier-config

Author: nhsd-david-wass

internal/datastore/package.json

@@ -3,6 +3,7 @@
     "@aws-sdk/client-dynamodb": "^3.984.0",
     "@aws-sdk/lib-dynamodb": "^3.1008.0",
     "@internal/helpers": "*",
+    "@nhsdigital/nhs-notify-event-schemas-supplier-config": "^1.0.1",
     "pino": "^10.3.0",
     "zod": "^4.1.11",
     "zod-mermaid": "^1.0.9"

internal/datastore/src/supplier-config-repository.ts

@@ -13,7 +13,7 @@ import {
   Supplier,
   SupplierAllocation,
   VolumeGroup,
-} from "./SupplierConfigDomain";
+} from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
 
 export type SupplierConfigRepositoryConfig = {
   supplierConfigTableName: string;

lambdas/supplier-allocator/package.json

@@ -8,6 +8,7 @@
     "@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^2.0.1",
     "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1": "npm:@nhsdigital/nhs-notify-event-schemas-letter-rendering@^1.1.5",
     "@nhsdigital/nhs-notify-event-schemas-supplier-api": "^1.0.8",
+    "@nhsdigital/nhs-notify-event-schemas-supplier-config": "^1.0.1",
     "@types/aws-lambda": "^8.10.148",
     "aws-lambda": "^1.0.7",
     "esbuild": "^0.27.2",

lambdas/supplier-allocator/src/handler/allocate-handler.ts

@@ -5,7 +5,7 @@ import {
   LetterVariant,
   SupplierAllocation,
   VolumeGroup,
-} from "internal/datastore/src/SupplierConfigDomain";
+} from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
 import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import z from "zod";
 import {

lambdas/supplier-allocator/src/services/__tests__/supplier-config.test.ts

@@ -0,0 +1,134 @@
+import {
+  getSupplierAllocationsForVolumeGroup,
+  getVariantDetails,
+  getVolumeGroupDetails,
+} from "../supplier-config";
+import { Deps } from "../../config/deps";
+
+function makeDeps(overrides: Partial<Deps> = {}): Deps {
+  const logger = {
+    info: jest.fn(),
+    error: jest.fn(),
+  } as unknown as Deps["logger"];
+
+  const supplierConfigRepo = {
+    getLetterVariant: jest.fn(),
+    getVolumeGroup: jest.fn(),
+    getSupplierAllocationsForVolumeGroup: jest.fn(),
+  } as unknown as Deps["supplierConfigRepo"];
+
+  const base: Partial<Deps> = {
+    logger: logger as any,
+    supplierConfigRepo: supplierConfigRepo as any,
+  };
+
+  return { ...(base as Deps), ...overrides } as Deps;
+}
+
+describe("supplier-config service", () => {
+  afterEach(() => jest.resetAllMocks());
+
+  describe("getVariantDetails", () => {
+    it("returns variant details and logs when found", async () => {
+      const variant = { id: "v1", volumeGroupId: "g1" } as any;
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getLetterVariant = jest
+        .fn()
+        .mockResolvedValue(variant);
+
+      const result = await getVariantDetails("v1", deps);
+
+      expect(result).toBe(variant);
+      expect(deps.logger.info).toHaveBeenCalled();
+    });
+
+    it("logs an error and returns undefined when not found", async () => {
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getLetterVariant = jest.fn().mockResolvedValue();
+
+      const result = await getVariantDetails("missing", deps);
+
+      expect(result).toBeUndefined();
+      expect(deps.logger.error).toHaveBeenCalled();
+    });
+  });
+
+  describe("getVolumeGroupDetails", () => {
+    it("returns group details when active", async () => {
+      const group = {
+        id: "g1",
+        status: "PROD",
+        startDate: "2020-01-01",
+      } as any;
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(group);
+
+      const result = await getVolumeGroupDetails("g1", deps);
+
+      expect(result).toBe(group);
+      expect(deps.logger.info).toHaveBeenCalled();
+    });
+
+    it("throws when group is not active based on dates/status", async () => {
+      const future = new Date(Date.now() + 1000 * 60 * 60 * 24).toISOString();
+      const group = { id: "g2", status: "DRAFT", startDate: future } as any;
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(group);
+
+      await expect(getVolumeGroupDetails("g2", deps)).rejects.toThrow(
+        /not active/,
+      );
+      expect(deps.logger.error).toHaveBeenCalled();
+    });
+  });
+
+  describe("getSupplierAllocationsForVolumeGroup", () => {
+    const allocations = [
+      { supplier: "s1", variantId: "v1" },
+      { supplier: "s2", variantId: "v2" },
+    ] as any[];
+
+    it("returns all allocations when no supplierId provided", async () => {
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getSupplierAllocationsForVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(allocations);
+
+      const result = await getSupplierAllocationsForVolumeGroup("g1", "", deps);
+
+      expect(result).toEqual(allocations);
+      expect(deps.logger.info).toHaveBeenCalled();
+    });
+
+    it("filters by supplierId when provided", async () => {
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getSupplierAllocationsForVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(allocations);
+
+      const result = await getSupplierAllocationsForVolumeGroup(
+        "g1",
+        "s2",
+        deps,
+      );
+
+      expect(result).toEqual([allocations[1]]);
+    });
+
+    it("throws when supplierId provided but no matching allocation", async () => {
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getSupplierAllocationsForVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(allocations);
+
+      await expect(
+        getSupplierAllocationsForVolumeGroup("g1", "missing", deps),
+      ).rejects.toThrow(/No supplier allocations found/);
+      expect(deps.logger.error).toHaveBeenCalled();
+    });
+  });
+});

lambdas/supplier-allocator/src/services/supplier-config.ts

@@ -3,7 +3,7 @@ import {
   Supplier,
   SupplierAllocation,
   VolumeGroup,
-} from "internal/datastore/src/SupplierConfigDomain";
+} from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
 import { Deps } from "../config/deps";
 
 export async function getVariantDetails(