CCM-13752 Added specificationBillingId

Author: nhsd-david-wass

internal/datastore/src/types.ts

@@ -53,6 +53,7 @@ export const LetterSchema = LetterSchemaBase.extend({
   source: z.string(),
   subject: z.string(),
   billingRef: z.string(),
+  specificationBillingId: z.string(),
 }).describe("Letter");
 
 /**

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

@@ -26,8 +26,16 @@ function makeDeps(overrides: Partial<Deps> = {}): Deps {
 
   const env = {
     VARIANT_MAP: {
-      "variant-1": { supplierId: "supplier-1", specId: "spec-1" },
-      "variant-2": { supplierId: "supplier-2", specId: "spec-2" },
+      "variant-1": {
+        supplierId: "supplier-1",
+        specId: "spec-1",
+        billingId: "billing-1",
+      },
+      "variant-2": {
+        supplierId: "supplier-2",
+        specId: "spec-2",
+        billingId: "billing-2",
+      },
     },
   };
 
@@ -87,6 +95,7 @@ function setupDefaultMocks() {
   (supplierConfig.getSupplierDetails as jest.Mock).mockResolvedValue({
     supplierId: "supplier-1",
     specId: "spec-1",
+    billingId: "billing-1",
   });
 }
 

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

@@ -211,11 +211,19 @@ describe("createUpsertLetterHandler", () => {
   test("processes all records successfully and returns no batch failures", async () => {
     const v2message = {
       letterEvent: createPreparedV2Event(),
-      supplierSpec: { supplierId: "supplier1", specId: "spec1" },
+      supplierSpec: {
+        supplierId: "supplier1",
+        specId: "spec1",
+        billingId: "billing1",
+      },
     };
     const v1message = {
       letterEvent: createPreparedV1Event(),
-      supplierSpec: { supplierId: "supplier1", specId: "spec1" },
+      supplierSpec: {
+        supplierId: "supplier1",
+        specId: "spec1",
+        billingId: "billing1",
+      },
     };
 
     const evt: SQSEvent = createSQSEvent([
@@ -249,6 +257,7 @@ 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("billing1");
 
     const insertedV1Letter = (mockedDeps.letterRepo.putLetter as jest.Mock).mock
       .calls[1][0];
@@ -260,6 +269,7 @@ describe("createUpsertLetterHandler", () => {
     expect(insertedV1Letter.status).toBe("PENDING");
     expect(insertedV1Letter.groupId).toBe("client1campaign1template1");
     expect(insertedV1Letter.source).toBe("/data-plane/letter-rendering/test");
+    expect(insertedV1Letter.specificationBillingId).toBe("billing1");
 
     const updatedLetter = (
       mockedDeps.letterRepo.updateLetterStatus as jest.Mock
@@ -472,14 +482,22 @@ describe("createUpsertLetterHandler", () => {
         id: "7b9a03ca-342a-4150-b56b-989109c45615",
         domainId: "ok",
       }),
-      supplierSpec: { supplierId: "supplier1", specId: "spec1" },
+      supplierSpec: {
+        supplierId: "supplier1",
+        specId: "spec1",
+        billingId: "billing1",
+      },
     };
     const message2 = {
       letterEvent: createPreparedV2Event({
         id: "7b9a03ca-342a-4150-b56b-989109c45616",
         domainId: "fail",
       }),
-      supplierSpec: { supplierId: "supplier1", specId: "spec1" },
+      supplierSpec: {
+        supplierId: "supplier1",
+        specId: "spec1",
+        billingId: "billing1",
+      },
     };
     const evt: SQSEvent = createSQSEvent([
       createSqsRecord("ok-msg", JSON.stringify(message1)),

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", [
@@ -62,7 +63,8 @@ function getOperationFromType(type: string): UpsertOperation {
           preparedRequest,
           supplierSpec.supplierId,
           supplierSpec.specId,
-          supplierSpec.specId, // use specId for now
+          supplierSpec.specId,
+          supplierSpec.billingId, // use specId 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,6 +120,7 @@ function mapToInsertLetter(
     createdAt: now,
     updatedAt: now,
     billingRef,
+    specificationBillingId: billingId,
   };
 }