Merge branch 'main' into feature/CCM-11459_edit-button

Author: bhansell1

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -216,6 +216,12 @@
               },
               "proofingEnabled": {
                 "type": "boolean"
+              },
+              "supplierReferences": {
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "type": "object"
               }
             },
             "required": [

lambdas/backend-api/src/__tests__/templates/infra/template-repository.test.ts

@@ -2108,6 +2108,7 @@ describe('templateRepository', () => {
           '#templateType': 'templateType',
           '#updatedAt': 'updatedAt',
           '#proofingEnabled': 'proofingEnabled',
+          '#supplierReferences': 'supplierReferences',
         },
         ExpressionAttributeValues: {
           ':condition_1_templateStatus': 'PENDING_PROOF_REQUEST',
@@ -2116,13 +2117,14 @@ describe('templateRepository', () => {
           ':condition_5_proofingEnabled': true,
           ':templateStatus': 'WAITING_FOR_PROOF',
           ':updatedAt': '2024-12-27T00:00:00.000Z',
+          ':supplierReferences': {},
         },
         Key: { id: 'template-id', owner: ownerWithClientPrefix },
         ReturnValues: 'ALL_NEW',
         ReturnValuesOnConditionCheckFailure: 'ALL_OLD',
         TableName: 'templates',
         UpdateExpression:
-          'SET #templateStatus = :templateStatus, #updatedAt = :updatedAt',
+          'SET #templateStatus = :templateStatus, #supplierReferences = if_not_exists(#supplierReferences, :supplierReferences), #updatedAt = :updatedAt',
       });
     });
 

lambdas/backend-api/src/templates/infra/template-repository.ts

@@ -60,6 +60,7 @@ const letterAttributes: Record<keyof LetterProperties, null> = {
   personalisationParameters: null,
   templateType: null,
   proofingEnabled: null,
+  supplierReferences: null,
 };
 
 export class TemplateRepository {
@@ -651,6 +652,11 @@ export class TemplateRepository {
       )
         .setStatus('WAITING_FOR_PROOF')
         .expectedStatus('PENDING_PROOF_REQUEST')
+
+        // dynamodb does not support conditional initialising of maps, so we have to
+        // initialise an empty map here, then we set supplier-specific values in the
+        // per-supplier sftp send lambda
+        .initialiseSupplierReferences()
         .expectedTemplateType('LETTER')
         .expectedClientId(user.clientId)
         .expectTemplateExists()

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -80,6 +80,9 @@ export type LetterProperties = UploadLetterProperties & {
   files: LetterFiles;
   personalisationParameters?: Array<string>;
   proofingEnabled?: boolean;
+  supplierReferences?: {
+    [key: string]: string;
+  };
 };
 
 export type LetterType = 'q4' | 'x0' | 'x1';

lambdas/event-publisher/src/__tests__/domain/event-builder.test.ts

@@ -201,7 +201,7 @@ const expectedEvent = (status: string, type: string, dataschema: string) => ({
   type,
   specversion: '1.0',
   dataschema,
-  dataschemaversion: '1.1.0',
+  dataschemaversion: '1.1.1',
   plane: 'control',
   subject: '92b676e9-470f-4d04-ab14-965ef145e15d',
   data: {