CCM-12090: Test fixes and code cleanup

Author: chris-elliott-nhsd

frontend/src/__tests__/app/upload-letter-template/page.test.tsx

@@ -120,7 +120,7 @@ describe('UploadLetterTemplatePage', () => {
     );
   });
 
-  it('should redirect to error page when neither campaignIds is present and empty', async () => {
+  it('should redirect to error page when campaignIds is present and empty', async () => {
     const mockRedirect = jest.mocked(redirect);
 
     mockGetSessionServer.mockResolvedValueOnce({

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

@@ -1,5 +1,4 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { UploadLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import { apiFailure, apiSuccess } from './responses';
 import { getLetterUploadParts } from '../app/get-letter-upload-parts';
 import { TemplateClient } from '../app/template-client';
@@ -32,7 +31,7 @@ export function createHandler({
 
     const { data: created, error: createTemplateError } =
       await templateClient.uploadLetterTemplate(
-        template as UploadLetterTemplate,
+        template,
         { userId, clientId },
         pdf,
         csv

tests/test-team/template-mgmt-api-tests/create-template.api.spec.ts

@@ -108,7 +108,7 @@ test.describe('POST /v1/template', () => {
   });
 
   test.describe('NHS_APP templates', () => {
-    test('returns 201 if template is valid', async ({ request }) => {
+    test.only('returns 201 if template is valid', async ({ request }) => {
       const template = TemplateAPIPayloadFactory.getCreateTemplatePayload({
         templateType: 'NHS_APP',
       });

tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts

@@ -1101,7 +1101,7 @@ test.describe('POST /v1/template/:templateId/submit', () => {
       expect(updated).toEqual({
         statusCode: 200,
         template: {
-          campaignId: testClients[userProofingDisabled.clientKey]?.campaignId,
+          campaignId: 'campaign-id',
           clientId: userProofingDisabled.clientId,
           createdAt: expect.stringMatching(isoDateRegExp),
           id: expect.stringMatching(uuidRegExp),

tests/test-team/template-mgmt-api-tests/upload-letter-template.api.spec.ts

@@ -414,6 +414,7 @@ test.describe('POST /v1/letter-template', () => {
         {
           templateType: 'LETTER',
           name: undefined,
+          campaignId: 'Campaign1',
         },
         [
           {
@@ -462,6 +463,7 @@ test.describe('POST /v1/letter-template', () => {
       TemplateAPIPayloadFactory.getUploadLetterTemplatePayload(
         {
           templateType: 'LETTER',
+          campaignId: 'Campaign1',
         },
         [
           {
@@ -514,6 +516,7 @@ test.describe('POST /v1/letter-template', () => {
       TemplateAPIPayloadFactory.getUploadLetterTemplatePayload(
         {
           templateType: 'LETTER',
+          campaignId: 'Campaign1',
         },
         [
           {
@@ -557,6 +560,7 @@ test.describe('POST /v1/letter-template', () => {
       TemplateAPIPayloadFactory.getUploadLetterTemplatePayload(
         {
           templateType: 'LETTER',
+          campaignId: 'Campaign1',
         },
         [
           {

tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts

@@ -132,8 +132,12 @@ test.describe('Preview Letter template Page', () => {
       templates.notYetSubmitted.name
     );
 
+    if (!templates.notYetSubmitted.campaignId) {
+      throw new Error('Test data misconfiguration');
+    }
+
     await expect(previewLetterTemplatePage.campaignId).toContainText(
-      templates.notYetSubmitted.campaignId!
+      templates.notYetSubmitted.campaignId
     );
 
     await previewLetterTemplatePage.clickContinueButton();

tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts

@@ -85,8 +85,12 @@ test.describe('Preview submitted Letter message template Page', () => {
       templates.valid.name
     );
 
+    if (!templates.valid.campaignId) {
+      throw new Error('Test data misconfiguration');
+    }
+
     await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
-      templates.valid.campaignId!
+      templates.valid.campaignId
     );
   });
 

tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts

@@ -37,7 +37,7 @@ function create(
 
     if (campaignId) {
       await page.selectOption('#letterTemplateCampaignId', {
-        value: 'other-campaign-id',
+        value: campaignId,
       });
     }