Accept types ending in status and version

Author: stevebux

lambdas/supplier-config-ingress/src/__tests__/supplier-config-ingress-handler.test.ts

@@ -14,15 +14,25 @@ function createSqsRecord(
 
 function createSupplierConfig(overrides: Record<string, any> = {}) {
   return {
-    id: "supplier-123",
-    name: "Supplier supplier-123",
+    id: "supplier-1",
+    name: "Supplier 1",
     channelType: "LETTER",
     dailyCapacity: 2000,
     status: "PROD",
     ...overrides,
   };
 }
 
+function createSupplierPackConfig() {
+  return {
+    id: "supplier1-client1-campaign",
+    packSpecificationId: "client-1-campaign",
+    supplierId: "supplier1",
+    approval: "APPROVED",
+    status: "PROD",
+  };
+}
+
 describe("supplierConfigHandler", () => {
   let mockDeps: Deps;
   let handler: ReturnType<typeof createSupplierConfigIngressHandler>;
@@ -110,6 +120,22 @@ describe("supplierConfigHandler", () => {
     ).not.toHaveBeenCalled();
   });
 
+  it("accepts a type field ending in a status and version", async () => {
+    const data = createSupplierPackConfig();
+    const record = createSqsRecord(
+      data,
+      "uk.nhs.notify.supplier-config.supplier-pack.prod.v1",
+    );
+    const event = { Records: [record] } as unknown as SQSEvent;
+
+    const result = await handler(event);
+
+    expect(result).toEqual({ batchItemFailures: [] });
+    expect(
+      mockDeps.supplierConfigRepo.upsertSupplierConfig,
+    ).toHaveBeenCalledWith("supplier-pack", data);
+  });
+
   it("rejects an entity not matching the appropriate schema", async () => {
     const invalidData = createSupplierConfig({ dailyCapacity: undefined });
     const record = createSqsRecord(invalidData);

lambdas/supplier-config-ingress/src/handler/supplier-config-ingress-handler.ts

@@ -32,13 +32,20 @@ const entitySchemas: Record<SupplierConfigEntity, z.ZodType<{ id: string }>> = {
   "supplier-pack": $SupplierPack as unknown as z.ZodType<{ id: string }>,
 };
 
+function extractEntityFromType(type: string) {
+  const elements = type.split(".");
+  return $SupplierConfigEntity.parse(
+    elements.length > 4 ? elements[4] : undefined,
+  );
+}
+
 function parseSupplierConfigFromRecord(record: SQSRecord): {
   entity: SupplierConfigEntity;
   config: { id: string };
 } {
   const event = $EventEnvelope.parse(JSON.parse(record.body));
 
-  const entity = $SupplierConfigEntity.parse(event.type.split(".").pop());
+  const entity = extractEntityFromType(event.type);
   const config = entitySchemas[entity].parse(event.data);
 
   return { entity, config };