CCM-12090: Fix dependency check and typecheck

Author: chris-elliott-nhsd

lambdas/backend-api/src/__tests__/templates/api/upload-letter.test.ts

@@ -32,6 +32,7 @@ describe('upload-letter', () => {
     name: 'template-name',
     letterType: 'x0',
     language: 'en',
+    campaignId: 'campaign-id'
   };
 
   const pdf = Buffer.from('letterPdf');

lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts

@@ -168,6 +168,7 @@ describe('templateClient', () => {
         name: 'name',
         letterType: 'x0',
         language: 'en',
+        campaignId: 'campaign-id',
       };
 
       const result = await templateClient.createTemplate(data, user);
@@ -1259,6 +1260,7 @@ describe('templateClient', () => {
         templateType: 'LETTER',
         language: 'it',
         letterType: 'x1',
+        campaignId: 'campaign-id',
       };
 
       const result = await templateClient.updateTemplate(

lambdas/backend-api/src/__tests__/templates/infra/get-letter-upload-parts.test.ts

@@ -8,6 +8,7 @@ describe('getLetterUploadParts', () => {
     name: 'template-name',
     letterType: 'x0',
     language: 'en',
+    campaignId: 'camapign-id',
   };
 
   const pdf = Buffer.from('letterPdf');

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

@@ -53,13 +53,12 @@ const smsAttributes: Record<keyof SmsProperties, null> = {
   message: null,
 };
 
-const letterAttributes: Record<keyof LetterProperties, null> = {
+const letterAttributes: Record<keyof UploadLetterProperties, null> = {
   files: null,
   language: null,
   letterType: null,
-  personalisationParameters: null,
   templateType: null,
-  proofingEnabled: null,
+  campaignId: null,
 };
 
 export class TemplateRepository {
@@ -818,7 +817,7 @@ export class TemplateRepository {
     }
     if (template.templateType === 'LETTER') {
       expressions.push(
-        ...this.attributeExpressionsFromMap<LetterProperties>(letterAttributes)
+        ...this.attributeExpressionsFromMap<UploadLetterProperties>(letterAttributes)
       );
     }
     return expressions;
@@ -849,7 +848,7 @@ export class TemplateRepository {
       names = this.attributeNamesFromMap<SmsProperties>(smsAttributes);
     }
     if (template.templateType === 'LETTER') {
-      names = this.attributeNamesFromMap<LetterProperties>(letterAttributes);
+      names = this.attributeNamesFromMap<UploadLetterProperties>(letterAttributes);
     }
 
     return names;

lambdas/backend-client/src/__tests__/schemas/template-schema.test.ts

@@ -169,6 +169,7 @@ describe('Template schemas', () => {
       letterType: 'x1',
       language: 'ar',
       name: 'letter',
+      campaignId: 'campaign-id',
     };
 
     const result = $CreateUpdateNonLetter.safeParse(letter);

lambdas/backend-client/src/__tests__/template-api-client.test.ts

@@ -95,6 +95,7 @@ describe('TemplateAPIClient', () => {
         templateType: 'LETTER',
         language: 'de',
         letterType: 'x1',
+        campaignId: 'campaign-id',
       },
       testToken,
       new File(['pdf'], 'template.pdf', { type: 'application/pdf' })
@@ -147,6 +148,7 @@ describe('TemplateAPIClient', () => {
         templateType: 'LETTER',
         language: 'de',
         letterType: 'x1',
+        campaignId: 'campaign-id',
       },
       testToken,
       new File(['pdf'], 'template.pdf', { type: 'application/pdf' }),

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

@@ -11,19 +11,31 @@ export type BaseCreatedTemplate = BaseTemplate & {
   updatedBy?: string;
 };
 
+export type BaseLetterTemplateProperties = {
+  files?: LetterFiles;
+  language: Language;
+  letterType: LetterType;
+  templateType: 'LETTER';
+};
+
 export type BaseTemplate = {
   name: string;
 };
 
-export type UploadLetterProperties = BaseLetterTemplateProperties & {
-  campaignId: string;
+export type ClientConfiguration = {
+  campaignId?: string;
+  campaignIds?: Array<string>;
+  features: ClientFeatures;
 };
 
-export type BaseLetterTemplateProperties = {
-  files?: LetterFiles;
-  language: Language;
-  letterType: LetterType;
-  templateType: 'LETTER';
+export type ClientConfigurationSuccess = {
+  clientConfiguration: ClientConfiguration;
+  statusCode: number;
+};
+
+export type ClientFeatures = {
+  proofing?: boolean;
+  routing?: boolean;
 };
 
 export type CreateUpdateTemplate = BaseTemplate &
@@ -104,32 +116,6 @@ export type SmsProperties = {
   templateType: 'SMS';
 };
 
-export type TemplateSuccess = {
-  statusCode: number;
-  template: TemplateDto;
-};
-
-export type ClientFeatures = {
-  proofing?: boolean;
-  routing?: boolean;
-};
-
-export type ClientConfiguration = {
-  campaignId?: string;
-  campaignIds?: Array<string>;
-  features: ClientFeatures;
-};
-
-export type ClientConfigurationSuccess = {
-  statusCode: number;
-  clientConfiguration: ClientConfiguration;
-};
-
-export type TemplateSuccessList = {
-  statusCode: number;
-  templates: Array<TemplateDto>;
-};
-
 export type TemplateDto = BaseCreatedTemplate &
   (SmsProperties | EmailProperties | NhsAppProperties | LetterProperties);
 
@@ -145,8 +131,22 @@ export type TemplateStatus =
   | 'WAITING_FOR_PROOF'
   | 'PROOF_AVAILABLE';
 
+export type TemplateSuccess = {
+  statusCode: number;
+  template: TemplateDto;
+};
+
+export type TemplateSuccessList = {
+  statusCode: number;
+  templates: Array<TemplateDto>;
+};
+
 export type TemplateType = 'NHS_APP' | 'EMAIL' | 'SMS' | 'LETTER';
 
+export type UploadLetterProperties = BaseLetterTemplateProperties & {
+  campaignId: string;
+};
+
 export type VersionedFileDetails = {
   currentVersion: string;
   fileName: string;
@@ -155,6 +155,33 @@ export type VersionedFileDetails = {
 
 export type VirusScanStatus = 'PENDING' | 'FAILED' | 'PASSED';
 
+export type GetV1ClientConfigurationData = {
+  body?: never;
+  path?: never;
+  query?: never;
+  url: '/v1/client-configuration';
+};
+
+export type GetV1ClientConfigurationErrors = {
+  /**
+   * Error
+   */
+  default: Failure;
+};
+
+export type GetV1ClientConfigurationError =
+  GetV1ClientConfigurationErrors[keyof GetV1ClientConfigurationErrors];
+
+export type GetV1ClientConfigurationResponses = {
+  /**
+   * 200 response
+   */
+  200: ClientConfigurationSuccess;
+};
+
+export type GetV1ClientConfigurationResponse =
+  GetV1ClientConfigurationResponses[keyof GetV1ClientConfigurationResponses];
+
 export type PostV1LetterTemplateData = {
   /**
    * Letter template to create
@@ -405,33 +432,6 @@ export type GetV1TemplatesResponses = {
 export type GetV1TemplatesResponse =
   GetV1TemplatesResponses[keyof GetV1TemplatesResponses];
 
-export type GetV1ClientConfigurationData = {
-  body?: never;
-  path?: never;
-  query?: never;
-  url: '/v1/client-configuration';
-};
-
-export type GetV1ClientConfigurationErrors = {
-  /**
-   * Error
-   */
-  default: Failure;
-};
-
-export type GetV1ClientConfigurationError =
-  GetV1ClientConfigurationErrors[keyof GetV1ClientConfigurationErrors];
-
-export type GetV1ClientConfigurationResponses = {
-  /**
-   * 200 response
-   */
-  200: ClientConfigurationSuccess;
-};
-
-export type GetV1ClientConfigurationResponse =
-  GetV1ClientConfigurationResponses[keyof GetV1ClientConfigurationResponses];
-
 export type ClientOptions = {
   baseUrl: `${string}://${string}` | (string & {});
 };