CCM-13372 - Select Preferred Pack

nhsd-david-wass · nhsd-david-wass · commit e24f88534772 · 2026-04-09T09:39:01.000+01:00
diff --git a/infrastructure/terraform/components/api/ddb_table_supplier_configuration.tf b/infrastructure/terraform/components/api/ddb_table_supplier_configuration.tf
@@ -30,6 +30,11 @@ resource "aws_dynamodb_table" "supplier-configuration" {
     type = "S"
   }
 
+  attribute {
+    name = "packSpecificationId"
+    type = "S"
+  }
+
   // The type-index GSI allows us to query for all supplier configurations of a given type (e.g. all letter supplier configurations)
   global_secondary_index {
     name            = "EntityTypeIndex"
@@ -45,6 +50,13 @@ resource "aws_dynamodb_table" "supplier-configuration" {
     projection_type = "ALL"
   }
 
+  global_secondary_index {
+    name            = "packSpecificationId-index"
+    hash_key        = "PK"
+    range_key       = "packSpecificationId"
+    projection_type = "ALL"
+  }
+
   point_in_time_recovery {
     enabled = true
   }
diff --git a/infrastructure/terraform/components/api/module_lambda_supplier_allocator.tf b/infrastructure/terraform/components/api/module_lambda_supplier_allocator.tf
@@ -94,8 +94,7 @@ data "aws_iam_policy_document" "supplier_allocator_lambda" {
 
     resources = [
       aws_dynamodb_table.supplier-configuration.arn,
-      "${aws_dynamodb_table.supplier-configuration.arn}/index/volumeGroup-index"
-
+      "${aws_dynamodb_table.supplier-configuration.arn}/index/*"
     ]
   }
 }
diff --git a/internal/datastore/src/__test__/db.ts b/internal/datastore/src/__test__/db.ts
@@ -165,11 +165,22 @@ const createSupplierConfigTableCommand = new CreateTableCommand({
         ProjectionType: "ALL",
       },
     },
+    {
+      IndexName: "packSpecificationId-index",
+      KeySchema: [
+        { AttributeName: "PK", KeyType: "HASH" }, // Partition key for GSI
+        { AttributeName: "packSpecificationId", KeyType: "RANGE" }, // Sort key for GSI
+      ],
+      Projection: {
+        ProjectionType: "ALL",
+      },
+    },
   ],
   AttributeDefinitions: [
     { AttributeName: "PK", AttributeType: "S" },
     { AttributeName: "SK", AttributeType: "S" },
     { AttributeName: "volumeGroup", AttributeType: "S" },
+    { AttributeName: "packSpecificationId", AttributeType: "S" },
   ],
 });
 
diff --git a/internal/datastore/src/__test__/supplier-config-repository.test.ts b/internal/datastore/src/__test__/supplier-config-repository.test.ts
@@ -263,4 +263,86 @@ describe("SupplierConfigRepository", () => {
       `Supplier with id ${supplierId} not found`,
     );
   });
+
+  test("getSupplierPacksForPackSpecification returns correct supplier packs", async () => {
+    const packSpecId = "pack-spec-123";
+    const supplierId = "supplier-123";
+    const supplierPackId = "supplier-pack-123";
+
+    await dbContext.docClient.send(
+      new PutCommand({
+        TableName: dbContext.config.supplierConfigTableName,
+        Item: {
+          PK: "SUPPLIER_PACK",
+          SK: supplierPackId,
+          id: supplierPackId,
+          packSpecificationId: packSpecId,
+          supplierId,
+          status: "PROD",
+          approval: "APPROVED",
+        },
+      }),
+    );
+
+    const result =
+      await repository.getSupplierPacksForPackSpecification(packSpecId);
+    expect(result).toEqual([
+      {
+        approval: "APPROVED",
+        id: supplierPackId,
+        packSpecificationId: packSpecId,
+        supplierId,
+        status: "PROD",
+      },
+    ]);
+  });
+
+  test("getSupplierPacksForPackSpecification returns empty array for non-existent pack specification", async () => {
+    const packSpecId = "non-existent-pack-spec";
+    const result =
+      await repository.getSupplierPacksForPackSpecification(packSpecId);
+    expect(result).toEqual([]);
+  });
+
+  test("getPackSpecification returns correct pack specification details", async () => {
+    const packSpecId = "pack-spec-123";
+
+    await dbContext.docClient.send(
+      new PutCommand({
+        TableName: dbContext.config.supplierConfigTableName,
+        Item: {
+          PK: "PACK_SPECIFICATION",
+          SK: packSpecId,
+          id: packSpecId,
+          name: `Pack Specification ${packSpecId}`,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+          version: 1,
+          billingId: `billing-${packSpecId}`,
+          postage: { id: "postageId", size: "STANDARD" },
+          status: "PROD",
+        },
+      }),
+    );
+
+    const result = await repository.getPackSpecification(packSpecId);
+    expect(result).toEqual({
+      billingId: `billing-${packSpecId}`,
+      createdAt: expect.any(String),
+      id: packSpecId,
+      name: `Pack Specification ${packSpecId}`,
+      postage: { id: "postageId", size: "STANDARD" },
+      updatedAt: expect.any(String),
+      version: 1,
+      status: "PROD",
+    });
+  });
+
+  test("getPackSpecification throws error for non-existent pack specification", async () => {
+    const packSpecId = "non-existent-pack-spec";
+
+    await expect(repository.getPackSpecification(packSpecId)).rejects.toThrow(
+      `No pack specification found for id ${packSpecId}`,
+    );
+  });
 });
diff --git a/internal/datastore/src/supplier-config-repository.ts b/internal/datastore/src/supplier-config-repository.ts
@@ -5,12 +5,16 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import {
   $LetterVariant,
+  $PackSpecification,
   $Supplier,
   $SupplierAllocation,
+  $SupplierPack,
   $VolumeGroup,
   LetterVariant,
+  PackSpecification,
   Supplier,
   SupplierAllocation,
+  SupplierPack,
   VolumeGroup,
 } from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
 
@@ -97,4 +101,39 @@ export class SupplierConfigRepository {
     }
     return suppliers;
   }
+
+  async getSupplierPacksForPackSpecification(
+    packSpecId: string,
+  ): Promise<SupplierPack[]> {
+    const result = await this.ddbClient.send(
+      new QueryCommand({
+        TableName: this.config.supplierConfigTableName,
+        IndexName: "packSpecificationId-index",
+        KeyConditionExpression: "#pk = :pk AND #packSpecId = :packSpecId",
+        ExpressionAttributeNames: {
+          "#pk": "PK",
+          "#packSpecId": "packSpecificationId",
+        },
+        ExpressionAttributeValues: {
+          ":pk": "SUPPLIER_PACK",
+          ":packSpecId": packSpecId,
+        },
+      }),
+    );
+
+    return $SupplierPack.array().parse(result.Items);
+  }
+
+  async getPackSpecification(packSpecId: string): Promise<PackSpecification> {
+    const result = await this.ddbClient.send(
+      new GetCommand({
+        TableName: this.config.supplierConfigTableName,
+        Key: { PK: "PACK_SPECIFICATION", SK: packSpecId },
+      }),
+    );
+    if (!result.Item) {
+      throw new Error(`No pack specification found for id ${packSpecId}`);
+    }
+    return $PackSpecification.parse(result.Item);
+  }
 }
diff --git a/lambdas/supplier-allocator/src/handler/__tests__/allocate-handler.test.ts b/lambdas/supplier-allocator/src/handler/__tests__/allocate-handler.test.ts
@@ -1,6 +1,6 @@
+import { SQSClient, SendMessageCommand } from "@aws-sdk/client-sqs";
 import { SQSEvent, SQSRecord } from "aws-lambda";
 import pino from "pino";
-import { SQSClient, SendMessageCommand } from "@aws-sdk/client-sqs";
 import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
 import {
@@ -158,6 +158,17 @@ function setupDefaultMocks() {
     priority: 1,
     billingId: "billing-1",
   });
+  (supplierConfig.getPreferredSupplierPacks as jest.Mock).mockResolvedValue([
+    {
+      packSpecificationId: "pack-spec-1",
+    },
+  ]);
+  (supplierConfig.getPackSpecification as jest.Mock).mockResolvedValue({
+    id: "pack-spec-1",
+    type: "A4",
+    colour: false,
+    duplex: false,
+  });
 }
 
 describe("createSupplierAllocatorHandler", () => {
diff --git a/lambdas/supplier-allocator/src/handler/allocate-handler.ts b/lambdas/supplier-allocator/src/handler/allocate-handler.ts
@@ -3,17 +3,22 @@ import { SendMessageCommand } from "@aws-sdk/client-sqs";
 import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
 import {
   LetterVariant,
+  PackSpecification,
   Supplier,
   SupplierAllocation,
+  SupplierPack,
   VolumeGroup,
 } from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
 import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import z from "zod";
 import { Unit } from "aws-embedded-metrics";
 import { MetricEntry, MetricStatus, buildEMFObject } from "@internal/helpers";
 import {
+  getPackSpecification,
+  getPreferredSupplierPacks,
   getSupplierAllocationsForVolumeGroup,
   getSupplierDetails,
+  getSuppliersWithValidPack,
   getVariantDetails,
   getVolumeGroupDetails,
 } from "../services/supplier-config";
@@ -83,19 +88,44 @@ async function getSupplierFromConfig(letterEvent: PreparedEvents, deps: Deps) {
         variantDetails.supplierId,
       );
 
-    const supplierDetails: Supplier[] = await getSupplierDetails(
-      supplierAllocations,
+    const supplierIds = supplierAllocations.map((alloc) => alloc.supplier);
+
+    const allocatedSuppliers: Supplier[] = await getSupplierDetails(
+      supplierIds,
       deps,
     );
+
+    const preferredSupplierPacks: SupplierPack[] =
+      await getPreferredSupplierPacks(
+        variantDetails.packSpecificationIds,
+        allocatedSuppliers,
+        deps,
+      );
+
+    const preferredPack: PackSpecification = await getPackSpecification(
+      preferredSupplierPacks[0].packSpecificationId,
+      deps,
+    );
+
+    const suppliersForPack: Supplier[] = await getSuppliersWithValidPack(
+      allocatedSuppliers,
+      preferredPack.id,
+      deps,
+    );
+
     deps.logger.info({
       description: "Fetched supplier details for supplier allocations",
       variantId: letterEvent.data.letterVariantId,
       volumeGroupId: volumeGroupDetails.id,
       supplierAllocationIds: supplierAllocations.map((a) => a.id),
-      supplierDetails,
+      allocatedSuppliers,
+      eligiblePacks: variantDetails.packSpecificationIds,
+      preferredSupplierPacks,
+      preferredPack,
+      suppliersForPack,
     });
 
-    return supplierDetails;
+    return allocatedSuppliers;
   } catch (error) {
     deps.logger.error({
       description: "Error fetching supplier from config",
diff --git a/lambdas/supplier-allocator/src/services/__tests__/supplier-config.test.ts b/lambdas/supplier-allocator/src/services/__tests__/supplier-config.test.ts
diff --git a/lambdas/supplier-allocator/src/services/supplier-config.ts b/lambdas/supplier-allocator/src/services/supplier-config.ts

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,7 @@ data "aws_iam_policy_document" "supplier_allocator_lambda" {`
`94`	`94`
`95`	`95`	`resources = [`
`96`	`96`	`aws_dynamodb_table.supplier-configuration.arn,`
`97`		`- "${aws_dynamodb_table.supplier-configuration.arn}/index/volumeGroup-index"`
`98`		`-`
	`97`	`+ "${aws_dynamodb_table.supplier-configuration.arn}/index/*"`
`99`	`98`	`]`
`100`	`99`	`}`
`101`	`100`	`}`