turn it on!

Author: nhsd-david-wass

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

@@ -151,6 +151,7 @@ function setupDefaultMocks() {
   (supplierConfig.getVariantDetails as jest.Mock).mockResolvedValue({
     id: "v1",
     volumeGroupId: "g1",
+    priority: 1,
   });
   (supplierConfig.getVolumeGroupDetails as jest.Mock).mockResolvedValue({
     id: "g1",
@@ -161,19 +162,18 @@ function setupDefaultMocks() {
     suppliers: [{ id: "s1", name: "Supplier 1", status: "PROD" }],
   });
   (allocationConfig.preferredSupplierPack as jest.Mock).mockResolvedValue({
-    id: "pack-spec-1",
+    id: "spec1",
     type: "A4",
     colour: false,
     duplex: false,
+    billingId: "billing1",
   });
   (allocationConfig.filterSuppliersWithCapacity as jest.Mock).mockResolvedValue(
     [{ id: "s1", name: "Supplier 1", status: "PROD" }],
   );
-  (allocationConfig.selectSupplierByFactor as jest.Mock).mockResolvedValue({
-    id: "s1",
-    name: "Supplier 1",
-    status: "PROD",
-  });
+  (allocationConfig.selectSupplierByFactor as jest.Mock).mockResolvedValue(
+    "supplier1",
+  );
   (allocationConfig.suppliersWithValidPack as jest.Mock).mockResolvedValue([
     { id: "s1", name: "Supplier 1", status: "PROD" },
   ]);
@@ -334,24 +334,6 @@ describe("createSupplierAllocatorHandler", () => {
     expect(messageBody.letterEvent.data.domainId).toBe("letter-test");
   });
 
-  test("resolves correct supplier spec from variant map", async () => {
-    const preparedEvent = createPreparedV2Event();
-
-    const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("msg1", JSON.stringify(preparedEvent)),
-    ]);
-
-    process.env.UPSERT_LETTERS_QUEUE_URL = "https://sqs.test.queue";
-
-    const handler = createSupplierAllocatorHandler(mockedDeps);
-    await handler(evt, {} as any, {} as any);
-
-    const sendCall = (mockSqsClient.send as jest.Mock).mock.calls[0][0];
-    const messageBody = JSON.parse(sendCall.input.MessageBody);
-    expect(messageBody.supplierSpec.supplierId).toBe("supplier1");
-    expect(messageBody.supplierSpec.specId).toBe("spec1");
-  });
-
   test("processes multiple messages in batch", async () => {
     const evt: SQSEvent = createSQSEvent([
       createSqsRecord(
@@ -574,8 +556,8 @@ describe("createSupplierAllocatorHandler", () => {
     const handler = createSupplierAllocatorHandler(mockedDeps);
     const result = await handler(evt, {} as any, {} as any);
     if (!result) throw new Error("expected BatchResponse, got void");
-    expect(result.batchItemFailures).toHaveLength(0);
-    expect((mockedDeps.logger.error as jest.Mock).mock.calls).toHaveLength(1);
+    expect(result.batchItemFailures).toHaveLength(1);
+    expect((mockedDeps.logger.error as jest.Mock).mock.calls).toHaveLength(2);
     expect((mockedDeps.logger.error as jest.Mock).mock.calls[0][0]).toEqual(
       expect.objectContaining({
         description: "Error fetching supplier from config",
@@ -654,8 +636,8 @@ describe("createSupplierAllocatorHandler", () => {
       const result = await handler(evt, {} as any, {} as any);
       if (!result) throw new Error("expected BatchResponse, got void");
 
-      expect(result.batchItemFailures).toHaveLength(0);
-      expect((mockedDeps.logger.error as jest.Mock).mock.calls).toHaveLength(1);
+      expect(result.batchItemFailures).toHaveLength(1);
+      expect((mockedDeps.logger.error as jest.Mock).mock.calls).toHaveLength(2);
       expect((mockedDeps.logger.error as jest.Mock).mock.calls[0][0]).toEqual(
         expect.objectContaining({
           description: "Error fetching supplier from config",

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

@@ -61,7 +61,7 @@ function validateType(event: unknown) {
 async function getSupplierFromConfig(
   letterEvent: PreparedEvents,
   deps: Deps,
-): Promise<SupplierDetails | undefined> {
+): Promise<SupplierDetails> {
   try {
     const letterVariant: LetterVariant = await getVariantDetails(
       letterEvent.data.letterVariantId,
@@ -129,12 +129,12 @@ async function getSupplierFromConfig(
     };
     return supplierDetails;
   } catch (error) {
-    deps.logger.info({
+    deps.logger.error({
       description: "Error fetching supplier from config",
       err: error,
       variantId: letterEvent.data.letterVariantId,
     });
-    return undefined;
+    throw error;
   }
 }
 
@@ -232,11 +232,12 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
 
         validateType(letterEvent);
 
-        const supplierSpec = getSupplier(letterEvent as PreparedEvents, deps);
-        const supplierDetails = await getSupplierFromConfig(
+        getSupplier(letterEvent as PreparedEvents, deps);
+        const supplierDetails: SupplierDetails = await getSupplierFromConfig(
           letterEvent as PreparedEvents,
           deps,
         );
+        const supplierSpec = supplierDetails?.supplierSpec;
 
         deps.logger.info({
           description: "Resolved supplier details from config",
@@ -245,8 +246,8 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
 
         incrementAllocation(
           volumeGroupAllocations,
-          supplierDetails?.volumeGroupId ?? "unknown",
-          supplierDetails?.supplierSpec?.supplierId ?? "unknown",
+          supplierDetails.volumeGroupId,
+          supplierDetails?.supplierSpec.supplierId,
           1,
           deps,
         );