CCM-20032: Letter Variant SupplierId Not Honoured

Author: nhsd-david-wass

lambdas/supplier-allocator/src/handler/__tests__/allocation-config.test.ts

@@ -196,6 +196,37 @@ describe("eligibleSuppliers", () => {
       "Supplier service error",
     );
   });
+  it("should filter allocations by letterVariantSupplierId if provided", async () => {
+    (
+      supplierConfigService.getSupplierAllocationsForVolumeGroup as jest.Mock
+    ).mockResolvedValue(mockSupplierAllocations);
+    (supplierConfigService.getSupplierDetails as jest.Mock).mockResolvedValue(
+      mockSuppliers,
+    );
+
+    const letterVariantSupplierId = "supplier-1";
+    await eligibleSuppliers(mockVolumeGroup, mockDeps, letterVariantSupplierId);
+    expect(supplierConfigService.getSupplierDetails).toHaveBeenCalledWith(
+      ["supplier-1"],
+      mockDeps,
+    );
+  });
+  it("should log a warning if no allocations found for specified letter variant supplier", async () => {
+    (
+      supplierConfigService.getSupplierAllocationsForVolumeGroup as jest.Mock
+    ).mockResolvedValue([]);
+    (supplierConfigService.getSupplierDetails as jest.Mock).mockResolvedValue(
+      [],
+    );
+
+    const letterVariantSupplierId = "supplier-1";
+    await eligibleSuppliers(mockVolumeGroup, mockDeps, letterVariantSupplierId);
+    expect(mockDeps.logger.warn).toHaveBeenCalledWith({
+      description: "No allocations found for specified letter variant supplier",
+      volumeGroupId: mockVolumeGroup.id,
+      letterVariantSupplierId,
+    });
+  });
 });
 
 describe("preferredSupplierPack", () => {

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

@@ -94,7 +94,7 @@ async function getSupplierFromConfig(
     );
 
     const { supplierAllocations, suppliers: allocatedSuppliers } =
-      await eligibleSuppliers(volumeGroup, deps);
+      await eligibleSuppliers(volumeGroup, deps, letterVariant.supplierId);
 
     const preferredPack: PackSpecification = await preferredSupplierPack(
       letterEvent,
@@ -391,6 +391,9 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
 
         ({ priority, supplier } = supplierAllocationResult);
       } catch (error) {
+        console.log(
+          `Error processing allocation of record ${record.messageId}: ${error}`,
+        );
         deps.logger.error({
           description: "Error processing allocation of record",
           err: error,

lambdas/supplier-allocator/src/handler/allocation-config.ts

@@ -23,6 +23,7 @@ import { PreparedEvents } from "./types";
 export async function eligibleSuppliers(
   volumeGroup: VolumeGroup,
   deps: Deps,
+  letterVariantSupplierId?: string,
 ): Promise<{
   supplierAllocations: SupplierAllocation[];
   suppliers: Supplier[];
@@ -31,6 +32,32 @@ export async function eligibleSuppliers(
     volumeGroup.id,
     deps,
   );
+  if (letterVariantSupplierId) {
+    deps.logger.info({
+      description: "Filtering allocations for letter variant supplier",
+      volumeGroupId: volumeGroup.id,
+      letterVariantSupplierId,
+    });
+    const filteredAllocations = supplierAllocations.filter(
+      (alloc) => alloc.supplier === letterVariantSupplierId,
+    );
+    if (filteredAllocations.length === 0) {
+      deps.logger.warn({
+        description:
+          "No allocations found for specified letter variant supplier",
+        volumeGroupId: volumeGroup.id,
+        letterVariantSupplierId,
+      });
+    }
+    return {
+      supplierAllocations: filteredAllocations,
+      suppliers: await getSupplierDetails(
+        filteredAllocations.map((alloc) => alloc.supplier),
+        deps,
+      ),
+    };
+  }
+
   const allocationPercentageSum = supplierAllocations.reduce(
     (sum, alloc) => sum + alloc.allocationPercentage,
     0,