CCM-10333 Types and lint fixes

nicki-nhs · nicki-nhs · commit 0211aacee085 · 2025-06-17T15:22:36.000+01:00
diff --git a/frontend/src/__tests__/components/forms/CopyTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/CopyTemplate/server-action.test.ts
@@ -23,6 +23,8 @@ test('submit form - validation error', async () => {
     templateStatus: 'NOT_YET_SUBMITTED',
     templateType: 'NHS_APP',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'template-message',
     createdAt: 'today',
     updatedAt: 'today',
@@ -55,6 +57,8 @@ test('submit form - create email template from non-email template', async () =>
   const testTemplate: Omit<NHSAppTemplate, 'id' | 'templateType'> = {
     templateStatus: 'NOT_YET_SUBMITTED',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'template-message',
     createdAt: 'today',
     updatedAt: 'today',
@@ -93,6 +97,8 @@ test('submit form - create email template from email template', async () => {
   const testTemplate: Omit<EmailTemplate, 'id' | 'templateType'> = {
     templateStatus: 'NOT_YET_SUBMITTED',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'template-message',
     subject: 'template-subject',
     createdAt: 'today',
@@ -132,6 +138,8 @@ test('submit form - create non-email template', async () => {
   const testTemplate: Omit<NHSAppTemplate, 'id' | 'templateType'> = {
     templateStatus: 'NOT_YET_SUBMITTED',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'template-message',
     createdAt: 'today',
     updatedAt: 'today',
diff --git a/frontend/src/__tests__/components/forms/DeleteTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/DeleteTemplate/server-action.test.ts
@@ -32,6 +32,8 @@ test('calls form action and redirects', async () => {
   const mockTemplate: NHSAppTemplate = {
     id: 'template-id',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'template-message',
     templateType: 'NHS_APP',
     templateStatus: 'NOT_YET_SUBMITTED',
diff --git a/frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts b/frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts
@@ -18,6 +18,8 @@ const initialState: EmailTemplate = {
   templateType: 'EMAIL',
   templateStatus: 'NOT_YET_SUBMITTED',
   name: 'name',
+  clientId: 'client1',
+  userId: 'user1',
   subject: 'subject',
   message: 'message',
   createdAt: '2025-01-13T10:19:25.579Z',
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts
@@ -14,6 +14,8 @@ const redirectMock = jest.mocked(redirect);
 const initialState: CreateLetterTemplate = {
   templateType: 'LETTER',
   name: 'name',
+  clientId: 'client1',
+  userId: 'user1',
   letterType: 'x0',
   language: 'en',
 };
diff --git a/frontend/src/__tests__/components/forms/NhsAppTemplateForm/server-action.test.ts b/frontend/src/__tests__/components/forms/NhsAppTemplateForm/server-action.test.ts
@@ -18,6 +18,8 @@ const redirectMock = jest.mocked(redirect);
 const initialState: CreateUpdateNHSAppTemplate = {
   templateType: 'NHS_APP',
   name: 'name',
+  clientId: 'client1',
+  userId: 'user1',
   message: 'message',
 };
 
diff --git a/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts
@@ -15,6 +15,8 @@ const initialState: EmailTemplate = {
   templateType: 'EMAIL',
   templateStatus: 'NOT_YET_SUBMITTED',
   name: 'template-name',
+  clientId: 'client1',
+  userId: 'user1',
   subject: 'template-subject',
   message: 'template-message',
   createdAt: '2025-01-13T10:19:25.579Z',
diff --git a/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts
@@ -16,6 +16,8 @@ describe('previewNhsAppTemplateAction', () => {
     templateType: 'NHS_APP',
     templateStatus: 'NOT_YET_SUBMITTED',
     name: 'Example name',
+    clientId: 'client1',
+    userId: 'user1',
     message: 'Example message',
     validationError: undefined,
     createdAt: '2025-01-13T10:19:25.579Z',
diff --git a/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts
@@ -15,6 +15,8 @@ const initialState: SMSTemplate = {
   templateType: 'SMS',
   templateStatus: 'NOT_YET_SUBMITTED',
   name: 'template-name',
+  clientId: 'client1',
+  userId: 'user1',
   message: 'template-message',
   createdAt: '2025-01-13T10:19:25.579Z',
   updatedAt: '2025-01-13T10:19:25.579Z',
diff --git a/frontend/src/__tests__/components/forms/SmsTemplateForm/server-action.test.ts b/frontend/src/__tests__/components/forms/SmsTemplateForm/server-action.test.ts
@@ -18,6 +18,8 @@ const initialState: SMSTemplate = {
   templateType: 'SMS',
   templateStatus: 'NOT_YET_SUBMITTED',
   name: 'name',
+  clientId: 'client1',
+  userId: 'user1',
   message: 'message',
   createdAt: '2025-01-13T10:19:25.579Z',
   updatedAt: '2025-01-13T10:19:25.579Z',
diff --git a/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx b/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
@@ -14,6 +14,8 @@ const messageTemplatesProps: {
       templateType: 'NHS_APP',
       templateStatus: 'NOT_YET_SUBMITTED',
       name: 'Template 1',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'Message',
       createdAt: '2021-01-01T00:00:00.000Z',
       updatedAt: '2021-01-01T00:00:00.000Z',
@@ -23,6 +25,8 @@ const messageTemplatesProps: {
       templateType: 'NHS_APP',
       templateStatus: 'SUBMITTED',
       name: 'Template 2',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'Message',
       createdAt: '2021-02-01T00:00:00.000Z',
       updatedAt: '2021-02-01T00:00:00.000Z',
@@ -32,6 +36,8 @@ const messageTemplatesProps: {
       templateType: 'LETTER',
       templateStatus: 'SUBMITTED',
       name: 'Template 3',
+      clientId: 'client1',
+      userId: 'user1',
       createdAt: '2021-02-01T00:00:00.000Z',
       letterType: 'x0',
       language: 'fr',
diff --git a/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx b/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx
@@ -11,6 +11,8 @@ describe('PreviewTemplateDetailsNhsApp', () => {
         template={{
           id: 'template-id',
           name: 'Example template',
+          clientId: 'client1',
+          userId: 'user1',
           message: 'app message message',
           templateStatus: 'NOT_YET_SUBMITTED',
           templateType: 'NHS_APP',
@@ -32,6 +34,8 @@ describe('PreviewTemplateDetailsEmail', () => {
         template={{
           id: 'template-id',
           name: 'Example Email template',
+          clientId: 'client1',
+          userId: 'user1',
           message: 'email message message',
           subject: 'subject',
           templateStatus: 'SUBMITTED',
@@ -55,6 +59,8 @@ describe('PreviewTemplateDetailsSms', () => {
         template={{
           id: 'template-id',
           name: 'SMS template',
+          clientId: 'client1',
+          userId: 'user1',
           message: 'SMS message',
           templateStatus: 'SUBMITTED',
           templateType: 'SMS',
@@ -76,6 +82,8 @@ describe('PreviewTemplateDetailsLetter', () => {
         template={{
           id: 'template-id',
           name: 'Example template',
+          clientId: 'client1',
+          userId: 'user1',
           templateStatus: 'PENDING_VALIDATION',
           templateType: 'LETTER',
           letterType: 'x0',
@@ -107,6 +115,8 @@ describe('PreviewTemplateDetailsLetter', () => {
         template={{
           id: 'template-id',
           name: 'Example template',
+          clientId: 'client1',
+          userId: 'user1',
           templateStatus: 'PENDING_VALIDATION',
           templateType: 'LETTER',
           letterType: 'x0',
@@ -133,6 +143,8 @@ describe('PreviewTemplateDetailsLetter', () => {
         template={{
           id: 'template-id',
           name: 'Example letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateStatus: 'PROOF_AVAILABLE',
           templateType: 'LETTER',
           letterType: 'x0',
@@ -169,6 +181,8 @@ describe('PreviewTemplateDetailsLetter', () => {
         template={{
           id: 'template-id',
           name: 'Example letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateStatus: 'PROOF_AVAILABLE',
           templateType: 'LETTER',
           letterType: 'x0',
diff --git a/frontend/src/__tests__/components/molecules/ViewEmailTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewEmailTemplate.test.tsx
@@ -11,6 +11,8 @@ describe('ViewEmailTemplate component', () => {
             id: 'template-id',
             templateType: 'EMAIL',
             name: 'Example template',
+            clientId: 'client1',
+            userId: 'user1',
             templateStatus: 'SUBMITTED',
             subject: 'Example subject',
             message: 'Example message',
diff --git a/frontend/src/__tests__/components/molecules/ViewLetterTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewLetterTemplate.test.tsx
@@ -11,6 +11,8 @@ describe('ViewLetterTemplate component', () => {
             templateType: 'LETTER',
             id: 'template-id',
             name: 'Example template',
+            clientId: 'client1',
+            userId: 'user1',
             templateStatus: 'SUBMITTED',
             createdAt: '2025-03-28T12:30:54.684Z',
             updatedAt: '2025-03-28T12:31:54.684Z',
diff --git a/frontend/src/__tests__/components/molecules/ViewNHSAppTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewNHSAppTemplate.test.tsx
@@ -10,6 +10,8 @@ describe('ViewNHSAppTemplate component', () => {
           {
             id: 'template-id',
             name: 'Example template',
+            clientId: 'client1',
+            userId: 'user1',
             templateStatus: 'SUBMITTED',
             message: 'Example message',
             templateType: 'NHS_APP',
diff --git a/frontend/src/__tests__/components/molecules/ViewSMSTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewSMSTemplate.test.tsx
@@ -10,6 +10,8 @@ describe('ViewNHSAppTemplate component', () => {
           {
             id: 'template-id',
             name: 'Example template',
+            clientId: 'client1',
+            userId: 'user1',
             templateStatus: 'SUBMITTED',
             message: 'Example message',
             templateType: 'SMS',
diff --git a/frontend/src/__tests__/components/organisms/PreviewLetterTemplate.test.tsx b/frontend/src/__tests__/components/organisms/PreviewLetterTemplate.test.tsx
@@ -8,6 +8,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           templateType: 'LETTER',
           name: 'test-template-letter',
+          clientId: 'client1',
+          userId: 'user1',
           id: 'template-id',
           templateStatus: 'VIRUS_SCAN_FAILED',
           language: 'en',
@@ -35,6 +37,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           id: '53525D03-1BC1-4563-ABF9-A74FF04142AF',
           name: 'letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateType: 'LETTER',
           templateStatus: 'PENDING_PROOF_REQUEST',
           letterType: 'q4',
@@ -61,6 +65,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           id: '53525D03-1BC1-4563-ABF9-A74FF04142AF',
           name: 'letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateType: 'LETTER',
           templateStatus: 'WAITING_FOR_PROOF',
           letterType: 'q4',
@@ -87,6 +93,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           id: '2C56C5F6-B3AD-4FF8-A8A2-52E4FA8AF2BE',
           name: 'letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateType: 'LETTER',
           templateStatus: 'PROOF_AVAILABLE',
           letterType: 'x1',
@@ -119,6 +127,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           id: '0A097DCD-35F9-4DAD-A37E-AC358B71B74D',
           name: 'letter',
+          clientId: 'client1',
+          userId: 'user1',
           templateType: 'LETTER',
           templateStatus: 'NOT_YET_SUBMITTED',
           letterType: 'x0',
@@ -151,6 +161,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           templateType: 'LETTER',
           name: 'test-template-letter',
+          clientId: 'client1',
+          userId: 'user1',
           id: 'template-id',
           templateStatus: 'VALIDATION_FAILED',
           language: 'en',
@@ -182,6 +194,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           templateType: 'LETTER',
           name: 'test-template-letter',
+          clientId: 'client1',
+          userId: 'user1',
           id: 'template-id',
           templateStatus: 'PENDING_UPLOAD',
           language: 'en',
@@ -208,6 +222,8 @@ describe('PreviewLetterTemplate component', () => {
         template={{
           templateType: 'LETTER',
           name: 'test-template-letter',
+          clientId: 'client1',
+          userId: 'user1',
           id: 'template-id',
           templateStatus: 'PENDING_VALIDATION',
           language: 'en',
diff --git a/frontend/src/components/forms/CopyTemplate/server-action.ts b/frontend/src/components/forms/CopyTemplate/server-action.ts
@@ -55,6 +55,8 @@ export const copyTemplateAction: CopyTemplateAction = async (
     case 'SMS': {
       await createTemplate({
         name: copyName,
+        clientId: 'client1',
+        userId: 'user1',
         message,
         templateType: newTemplateType,
       });
@@ -64,6 +66,8 @@ export const copyTemplateAction: CopyTemplateAction = async (
     case 'EMAIL': {
       await createTemplate({
         name: copyName,
+        clientId: 'client1',
+        userId: 'user1',
         message,
         templateType: newTemplateType,
         subject,
diff --git a/lambdas/backend-api/src/__tests__/templates/api/create-letter.test.ts b/lambdas/backend-api/src/__tests__/templates/api/create-letter.test.ts
@@ -32,6 +32,8 @@ describe('create-letter', () => {
   const initialTemplate: CreateUpdateTemplate = {
     templateType: 'LETTER',
     name: 'template-name',
+    clientId: 'client1',
+    userId: 'user1',
     letterType: 'x0',
     language: 'en',
   };
diff --git a/lambdas/backend-api/src/__tests__/templates/api/create.test.ts b/lambdas/backend-api/src/__tests__/templates/api/create.test.ts
@@ -110,6 +110,8 @@ describe('Template API - Create', () => {
 
     const create: CreateUpdateTemplate = {
       name: 'updated-name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       templateType: 'SMS',
     };
diff --git a/lambdas/backend-api/src/__tests__/templates/api/get.test.ts b/lambdas/backend-api/src/__tests__/templates/api/get.test.ts
@@ -93,6 +93,8 @@ describe('Template API - Get', () => {
       id: 'id',
       templateType: 'EMAIL',
       name: 'name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       subject: 'subject',
       createdAt: new Date().toISOString(),
diff --git a/lambdas/backend-api/src/__tests__/templates/api/list.test.ts b/lambdas/backend-api/src/__tests__/templates/api/list.test.ts
@@ -71,6 +71,8 @@ describe('Template API - List', () => {
       id: 'id',
       templateType: 'EMAIL',
       name: 'name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       subject: 'subject',
       createdAt: new Date().toISOString(),
diff --git a/lambdas/backend-api/src/__tests__/templates/api/responses.test.ts b/lambdas/backend-api/src/__tests__/templates/api/responses.test.ts
@@ -6,6 +6,8 @@ describe('responses', () => {
     const dto: TemplateDto = {
       id: '1',
       name: 'name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       subject: 'subject',
       templateStatus: 'SUBMITTED',
diff --git a/lambdas/backend-api/src/__tests__/templates/api/submit.test.ts b/lambdas/backend-api/src/__tests__/templates/api/submit.test.ts
@@ -94,6 +94,8 @@ describe('Template API - Submit', () => {
     const response: TemplateDto = {
       id: '1-2-3',
       name: 'updated-name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       templateStatus: 'SUBMITTED',
       templateType: 'SMS',
diff --git a/lambdas/backend-api/src/__tests__/templates/api/update.test.ts b/lambdas/backend-api/src/__tests__/templates/api/update.test.ts
@@ -140,6 +140,8 @@ describe('Template API - Update', () => {
 
     const update: CreateUpdateTemplate = {
       name: 'updated-name',
+      clientId: 'client1',
+      userId: 'user1',
       message: 'message',
       templateType: 'SMS',
     };
diff --git a/lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts b/lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts
@@ -1270,6 +1270,8 @@ describe('templateClient', () => {
         id: undefined as unknown as string,
         templateType: 'EMAIL',
         name: undefined as unknown as string,
+        clientId: 'client1',
+        userId: 'user1',
         message: 'message',
         subject: 'subject',
         createdAt: new Date().toISOString(),
diff --git a/lambdas/backend-api/src/__tests__/templates/infra/get-letter-upload-parts.test.ts b/lambdas/backend-api/src/__tests__/templates/infra/get-letter-upload-parts.test.ts
diff --git a/lambdas/backend-api/src/__tests__/templates/infra/template-repository.test.ts b/lambdas/backend-api/src/__tests__/templates/infra/template-repository.test.ts
diff --git a/lambdas/backend-client/src/__tests__/template-api-client.test.ts b/lambdas/backend-client/src/__tests__/template-api-client.test.ts
diff --git a/tests/accessibility/pa11y-setup.ts b/tests/accessibility/pa11y-setup.ts
