CCM-15148 - Add BillingId to variant map

Author: nhsd-david-wass

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

@@ -19,7 +19,8 @@ describe("lambdaEnv", () => {
     process.env.VARIANT_MAP = `{
       "lv1": {
         "supplierId": "supplier1",
-        "specId": "spec1"
+        "specId": "spec1",
+        "billingId": "billing1"
       }
     }`;
 
@@ -31,6 +32,7 @@ describe("lambdaEnv", () => {
         lv1: {
           supplierId: "supplier1",
           specId: "spec1",
+          billingId: "billing1",
         },
       },
     });

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

@@ -5,6 +5,7 @@ const LetterVariantSchema = z.record(
   z.object({
     supplierId: z.string(),
     specId: z.string(),
+    billingId: z.string(),
   }),
 );
 export type LetterVariant = z.infer<typeof LetterVariantSchema>;

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

@@ -29,6 +29,7 @@ function makeDeps(overrides: Partial<Deps> = {}): Deps {
       "variant-1": {
         supplierId: "supplier-1",
         specId: "spec-1",
+        billingId: "billing-1",
       },
       "variant-2": {
         supplierId: "supplier-2",

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

@@ -17,7 +17,7 @@ import {
 } from "../services/supplier-config";
 import { Deps } from "../config/deps";
 
-type SupplierSpec = { supplierId: string; specId: string };
+type SupplierSpec = { supplierId: string; specId: string; billingId: string };
 type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
 
 // small envelope that must exist in all inputs

lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts

@@ -216,13 +216,15 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: {
         supplierId: "supplier1",
         specId: "spec1",
+        billingId: "billing1",
       },
     };
     const v1message = {
       letterEvent: createPreparedV1Event(),
       supplierSpec: {
-        supplierId: "supplier1",
-        specId: "spec1",
+        supplierId: "supplier2",
+        specId: "spec2",
+        billingId: "billing2",
       },
     };
 
@@ -257,19 +259,19 @@ describe("createUpsertLetterHandler", () => {
     expect(insertedV2Letter.status).toBe("PENDING");
     expect(insertedV2Letter.groupId).toBe("client1campaign1template1");
     expect(insertedV2Letter.source).toBe("/data-plane/letter-rendering/test");
-    expect(insertedV2Letter.specificationBillingId).toBe("spec1");
+    expect(insertedV2Letter.specificationBillingId).toBe("billing1");
 
     const insertedV1Letter = (mockedDeps.letterRepo.putLetter as jest.Mock).mock
       .calls[1][0];
     expect(insertedV1Letter.id).toBe("letter1");
-    expect(insertedV1Letter.supplierId).toBe("supplier1");
-    expect(insertedV1Letter.specificationId).toBe("spec1");
-    expect(insertedV1Letter.billingRef).toBe("spec1");
+    expect(insertedV1Letter.supplierId).toBe("supplier2");
+    expect(insertedV1Letter.specificationId).toBe("spec2");
+    expect(insertedV1Letter.billingRef).toBe("spec2");
     expect(insertedV1Letter.url).toBe("s3://letterDataBucket/letter1.pdf");
     expect(insertedV1Letter.status).toBe("PENDING");
     expect(insertedV1Letter.groupId).toBe("client1campaign1template1");
     expect(insertedV1Letter.source).toBe("/data-plane/letter-rendering/test");
-    expect(insertedV1Letter.specificationBillingId).toBe("spec1");
+    expect(insertedV1Letter.specificationBillingId).toBe("billing2");
 
     const updatedLetter = (
       mockedDeps.letterRepo.updateLetterStatus as jest.Mock
@@ -285,7 +287,12 @@ describe("createUpsertLetterHandler", () => {
     });
     expect(mockMetrics.putMetric).toHaveBeenCalledWith(
       "MessagesProcessed",
-      3,
+      2,
+      "Count",
+    );
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessagesProcessed",
+      1,
       "Count",
     );
   });
@@ -485,6 +492,7 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: {
         supplierId: "supplier1",
         specId: "spec1",
+        billingId: "billing1",
       },
     };
     const message2 = {
@@ -495,6 +503,7 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: {
         supplierId: "supplier1",
         specId: "spec1",
+        billingId: "billing1",
       },
     };
     const evt: SQSEvent = createSQSEvent([

lambdas/upsert-letter/src/handler/upsert-handler.ts

@@ -16,12 +16,13 @@ import z from "zod";
 import { MetricsLogger, Unit, metricScope } from "aws-embedded-metrics";
 import { Deps } from "../config/deps";
 
-type SupplierSpec = { supplierId: string; specId: string };
+type SupplierSpec = { supplierId: string; specId: string; billingId: string };
 type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
 
 const SupplierSpecSchema = z.object({
   supplierId: z.string().min(1),
   specId: z.string().min(1),
+  billingId: z.string().min(1),
 });
 
 const PreparedEventUnionSchema = z.discriminatedUnion("type", [
@@ -63,6 +64,7 @@ function getOperationFromType(type: string): UpsertOperation {
           supplierSpec.supplierId,
           supplierSpec.specId,
           supplierSpec.specId, // use specId for now
+          supplierSpec.billingId, // use billingId for now
         );
         await deps.letterRepo.putLetter(letterToInsert);
 
@@ -99,6 +101,7 @@ function mapToInsertLetter(
   supplier: string,
   spec: string,
   billingRef: string,
+  billingId: string,
 ): InsertLetter {
   const now = new Date().toISOString();
   return {
@@ -117,7 +120,7 @@ function mapToInsertLetter(
     createdAt: now,
     updatedAt: now,
     billingRef,
-    specificationBillingId: spec,
+    specificationBillingId: billingId,
   };
 }
 
@@ -239,6 +242,7 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
             supplierSpec ?? {
               supplierId: "unknown",
               specId: "unknown",
+              billingId: "unknown",
             },
             deps,
           );