added more validity checks

Author: nhsd-david-wass

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

@@ -110,13 +110,18 @@ export class SupplierConfigRepository {
         TableName: this.config.supplierConfigTableName,
         IndexName: "packSpecificationId-index",
         KeyConditionExpression: "#pk = :pk AND #packSpecId = :packSpecId",
+        FilterExpression: "#status = :status AND #approval = :approval",
         ExpressionAttributeNames: {
           "#pk": "PK",
           "#packSpecId": "packSpecificationId",
+          "#status": "status",
+          "#approval": "approval",
         },
         ExpressionAttributeValues: {
           ":pk": "SUPPLIER_PACK",
           ":packSpecId": packSpecId,
+          ":status": "PROD",
+          ":approval": "APPROVED",
         },
       }),
     );

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

@@ -419,7 +419,11 @@ describe("supplier-config service", () => {
 
   describe("getPackSpecification", () => {
     it("returns pack specification when found", async () => {
-      const packSpec = { id: "spec1", name: "Pack Spec 1" } as any;
+      const packSpec = {
+        id: "spec1",
+        name: "Pack Spec 1",
+        status: "PROD",
+      } as any;
       const deps = makeDeps();
       deps.supplierConfigRepo.getPackSpecification = jest
         .fn()
@@ -429,6 +433,29 @@ describe("supplier-config service", () => {
 
       expect(result).toBe(packSpec);
     });
+
+    it("throws when pack specification is not active based on status", async () => {
+      const packSpec = {
+        id: "spec2",
+        name: "Pack Spec 2",
+        status: "DRAFT",
+      } as any;
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getPackSpecification = jest
+        .fn()
+        .mockResolvedValue(packSpec);
+
+      await expect(getPackSpecification("spec2", deps)).rejects.toThrow(
+        /not active/,
+      );
+      expect(deps.logger.error).toHaveBeenCalledWith(
+        expect.objectContaining({
+          description: "Pack specification is not active based on status",
+          packSpecId: "spec2",
+          status: "DRAFT",
+        }),
+      );
+    });
   });
 
   describe("getSuppliersWithValidPack", () => {

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

@@ -154,6 +154,14 @@ export async function getPackSpecification(
 ): Promise<PackSpecification> {
   const packSpec =
     await deps.supplierConfigRepo.getPackSpecification(packSpecId);
+  if (packSpec.status !== "PROD") {
+    deps.logger.error({
+      description: "Pack specification is not active based on status",
+      packSpecId,
+      status: packSpec.status,
+    });
+    throw new Error(`Pack specification with id ${packSpecId} is not active`);
+  }
   return packSpec;
 }