component tests

Author: nhsd-david-wass

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

@@ -29,7 +29,6 @@ import {
   selectSupplierByFactor,
   suppliersWithValidPack,
 } from "./allocation-config";
-
 import { Deps } from "../config/deps";
 import { PreparedEventSchema, PreparedEvents, SupplierDetails } from "./types";
 
@@ -136,6 +135,7 @@ async function getSupplierFromConfig(
 
     deps.logger.info({
       description: "Fetched supplier details for supplier allocations",
+      domainId: letterEvent.data.domainId,
       variantId: letterEvent.data.letterVariantId,
       volumeGroupId: volumeGroup.id,
       supplierAllocationIds: supplierAllocations.map((a) => a.id),

tests/component-tests/allocation-tests/allocation-letter-variant.spec.ts

@@ -0,0 +1,35 @@
+import { randomUUID } from "node:crypto";
+import { expect, test } from "@playwright/test";
+import {
+  FetchedSupplierLog,
+  getAllocationDetailsForDomainId,
+  getVariantsForAllocation,
+} from "tests/helpers/allocation-helper";
+
+import { createPreparedV1Event } from "tests/helpers/event-fixtures";
+import { sendSnsEvent } from "tests/helpers/send-sns-event";
+
+test.describe("Letter Variant Tests", () => {
+  test.setTimeout(180_000); // 3 minutes for long running polling
+
+  test("Verify that supplierId on letter variant takes pecedence over volume group", async () => {
+    const letterVariant = getVariantsForAllocation(3);
+    const domainId = randomUUID();
+    const preparedEvent = createPreparedV1Event({
+      domainId,
+      letterVariantId: letterVariant,
+    });
+
+    const response = await sendSnsEvent(preparedEvent);
+
+    expect(response.MessageId).toBeTruthy();
+
+    const allocationDetails: FetchedSupplierLog =
+      await getAllocationDetailsForDomainId(domainId);
+
+    expect(allocationDetails.allocatedSuppliers).toHaveLength(1);
+
+    const allocatedSupplierId = allocationDetails.allocatedSuppliers?.[0]?.id;
+    expect(allocatedSupplierId).toBe("supplier1");
+  });
+});

tests/helpers/allocation-helper.ts

@@ -9,6 +9,7 @@ import {
 import { envName } from "tests/constants/api-constants";
 import {
   pollAllocatorLogWithOptions,
+  pollSupplierAllocatorLogForAllocationDetails,
   pollSupplierAllocatorLogForExceededDailyCapacity,
   pollSupplierAllocatorLogForResolvedSpec,
 } from "./aws-cloudwatch-helper";
@@ -83,6 +84,22 @@ export type AllocationLogOptions = {
   extraPatterns?: string[];
 };
 
+export type AllocatedSuppliersLogEntry = {
+  id: string;
+  name: string;
+  channelType: string;
+  dailyCapacity: number;
+  status: string;
+};
+
+export type FetchedSupplierLog = {
+  supplierAllocationIds?: string[];
+  allocatedSuppliers?: AllocatedSuppliersLogEntry[];
+  allSuppliersForPack?: string[];
+  supplierForPackWithCapacity?: string[];
+  selectedSupplierId?: string;
+};
+
 type LetterVariantConfig = {
   id: string;
   packSpecificationIds: string[];
@@ -137,6 +154,15 @@ export async function getAllocationLogForDomainId(
   return supplierAllocatorLog;
 }
 
+export async function getAllocationDetailsForDomainId(
+  domainId: string,
+): Promise<FetchedSupplierLog> {
+  const message = await pollSupplierAllocatorLogForAllocationDetails(domainId);
+  const fetchedSupplierLog = JSON.parse(message) as FetchedSupplierLog;
+
+  return fetchedSupplierLog;
+}
+
 export async function getAllocationLog<
   TLog extends { description: string } = PackSpecificationLog,
 >(description: string, options?: AllocationLogOptions): Promise<TLog> {

tests/helpers/aws-cloudwatch-helper.ts

@@ -60,6 +60,16 @@ export async function pollSupplierAllocatorLogForResolvedSpec(
     `"${domainId}"`,
   ]);
 }
+
+export async function pollSupplierAllocatorLogForAllocationDetails(
+  domainId: string,
+): Promise<string> {
+  return pollLambdaLog("supplier-allocator", [
+    '"Fetched supplier details for supplier allocations"',
+    `"${domainId}"`,
+  ]);
+}
+
 export async function pollSupplierAllocatorLogForError(
   msgToCheck: string,
   domainId?: string,