CCM-11474: feedback

harrim91 · harrim91 · commit 01525771b279 · 2025-10-13T15:15:25.000+01:00
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -199,6 +199,7 @@ exports[`renders error if form is submitted with empty name 1`] = `
       </button>
       <a
         class="nhsuk-u-font-size-19 nhsuk-u-margin-left-3 nhsuk-u-padding-top-3 inline-block"
+        data-testid="go-back-link"
         href="/message-plans/choose-message-order"
       >
         Go back
@@ -347,6 +348,7 @@ exports[`renders error if form is submitted with name too long 1`] = `
       </button>
       <a
         class="nhsuk-u-font-size-19 nhsuk-u-margin-left-3 nhsuk-u-padding-top-3 inline-block"
+        data-testid="go-back-link"
         href="/message-plans/choose-message-order"
       >
         Go back
@@ -510,6 +512,7 @@ exports[`renders error if form is submitted with no campaign id selected 1`] = `
       </button>
       <a
         class="nhsuk-u-font-size-19 nhsuk-u-margin-left-3 nhsuk-u-padding-top-3 inline-block"
+        data-testid="go-back-link"
         href="/message-plans/choose-message-order"
       >
         Go back
@@ -662,6 +665,7 @@ exports[`renders form with select for multiple campaign ids 1`] = `
       </button>
       <a
         class="nhsuk-u-font-size-19 nhsuk-u-margin-left-3 nhsuk-u-padding-top-3 inline-block"
+        data-testid="go-back-link"
         href="/message-plans/choose-message-order"
       >
         Go back
@@ -798,6 +802,7 @@ exports[`renders form with single campaign id displayed 1`] = `
       </button>
       <a
         class="nhsuk-u-font-size-19 nhsuk-u-margin-left-3 nhsuk-u-padding-top-3 inline-block"
+        data-testid="go-back-link"
         href="/message-plans/choose-message-order"
       >
         Go back
diff --git a/frontend/src/components/forms/MessagePlan/MessagePlan.tsx b/frontend/src/components/forms/MessagePlan/MessagePlan.tsx
@@ -117,6 +117,7 @@ export function MessagePlanForm({
             'nhsuk-u-padding-top-3',
             'inline-block'
           )}
+          data-testid='go-back-link'
         >
           {formContent.backLink.text}
         </Link>
diff --git a/lambdas/backend-api/src/templates/infra/routing-config-repository/repository.ts b/lambdas/backend-api/src/templates/infra/routing-config-repository/repository.ts
@@ -34,7 +34,10 @@ export class RoutingConfigRepository {
     private readonly tableName: string
   ) {}
 
-  async create(routingConfigInput: CreateUpdateRoutingConfig, user: User) {
+  async create(
+    routingConfigInput: CreateUpdateRoutingConfig,
+    user: User
+  ): Promise<ApplicationResult<RoutingConfig>> {
     const date = new Date().toISOString();
 
     try {
diff --git a/tests/test-team/helpers/enum.ts b/tests/test-team/helpers/enum.ts
@@ -0,0 +1,34 @@
+export const ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS = [
+  {
+    messageOrder: 'NHSAPP',
+    label: 'NHS App only',
+  },
+  {
+    messageOrder: 'NHSAPP,EMAIL',
+    label: 'NHS App, Email',
+  },
+  {
+    messageOrder: 'NHSAPP,SMS',
+    label: 'NHS App, Text message',
+  },
+  {
+    messageOrder: 'NHSAPP,EMAIL,SMS',
+    label: 'NHS App, Email, Text message',
+  },
+  {
+    messageOrder: 'NHSAPP,SMS,EMAIL',
+    label: 'NHS App, Text message, Email',
+  },
+  {
+    messageOrder: 'NHSAPP,SMS,LETTER',
+    label: 'NHS App, Text message, Letter',
+  },
+  {
+    messageOrder: 'NHSAPP,EMAIL,SMS,LETTER',
+    label: 'NHS App, Email, Text message, Letter',
+  },
+  {
+    messageOrder: 'LETTER',
+    label: 'Letter only',
+  },
+];
diff --git a/tests/test-team/pages/routing/campaign-id-required-page.ts b/tests/test-team/pages/routing/campaign-id-required-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
 
-export class MessagePlanCampaignIdRequiredPage extends TemplateMgmtBasePageNonDynamic {
+export class RoutingMessagePlanCampaignIdRequiredPage extends TemplateMgmtBasePageNonDynamic {
   static readonly pageUrlSegment = 'message-plans/campaign-id-required';
 
   public readonly errorDetailsInsetText: Locator;
diff --git a/tests/test-team/pages/routing/create-message-plan-page.ts b/tests/test-team/pages/routing/create-message-plan-page.ts
@@ -1,7 +1,7 @@
 import { Locator, type Page } from '@playwright/test';
 import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
 
-export class CreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic {
+export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic {
   static readonly pageUrlSegment = 'message-plans/create-message-plan';
 
   readonly submitButton: Locator;
@@ -20,10 +20,8 @@ export class CreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic {
 
   constructor(page: Page, queryParameters?: { messageOrder: string }) {
     super(page);
-    this.submitButton = page.locator('button.nhsuk-button[type="submit"]', {
-      hasText: 'Save and continue',
-    });
-    this.goBackLink = page.getByText('Go back');
+    this.submitButton = page.getByTestId('submit-button');
+    this.goBackLink = page.getByTestId('go-back-link');
     this.nameField = page.getByTestId('name-field');
     this.campaignIdSelector = page.getByTestId('campaign-id-field');
     this.singleCampaignIdElement = page.getByTestId('single-campaign-id');
diff --git a/tests/test-team/pages/template-mgmt-message-templates-page.ts b/tests/test-team/pages/template-mgmt-message-templates-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
 
-export class MessageTemplatesPage extends TemplateMgmtBasePageNonDynamic {
+export class TemplateMgmtMessageTemplatesPage extends TemplateMgmtBasePageNonDynamic {
   static readonly pageUrlSegment = 'message-templates';
 
   readonly createTemplateButton: Locator;
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-message-templates-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-message-templates-page.component.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { randomUUID } from 'node:crypto';
-import { MessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
+import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
 import {
   assertFooterLinks,
   assertGoBackLinkNotPresent,
@@ -95,7 +95,7 @@ test.describe('Manage templates page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new MessageTemplatesPage(page),
+      page: new TemplateMgmtMessageTemplatesPage(page),
       baseURL,
     };
 
@@ -110,7 +110,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
     await expect(page).toHaveURL(`${baseURL}/templates/message-templates`);
     await expect(messageTemplatesPage.pageHeading).toHaveText(
@@ -123,7 +123,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -148,7 +148,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -173,7 +173,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
     await expect(messageTemplatesPage.pageHeading).toHaveText(
@@ -188,7 +188,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -211,7 +211,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -234,7 +234,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -258,7 +258,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -278,7 +278,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
@@ -294,7 +294,7 @@ test.describe('Manage templates page', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
 
     expect(page.url()).toContain(`${baseURL}/templates/message-templates`);
diff --git a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { glob } from 'glob';
 import { execSync } from 'node:child_process';
-import { MessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
+import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
 import { TemplateMgmtBasePageDynamic } from '../pages/template-mgmt-base-page-dynamic';
 import { TemplateMgmtChoosePage } from '../pages/template-mgmt-choose-page';
 import { TemplateMgmtCopyPage } from '../pages/template-mgmt-copy-page';
@@ -34,29 +34,27 @@ import { TemplateMgmtTemplateSubmittedNhsAppPage } from '../pages/nhs-app/templa
 import { TemplateMgmtTemplateSubmittedSmsPage } from '../pages/sms/template-mgmt-template-submitted-sms-page';
 import { TemplateMgmtUploadLetterMissingCampaignClientIdPage } from '../pages/letter/template-mgmt-upload-letter-missing-campaign-client-id-page';
 import { RoutingChooseMessageOrderPage } from '../pages/routing/choose-message-order-page';
-import { CreateMessagePlanPage } from '../pages/routing/create-message-plan-page';
-import { MessagePlanCampaignIdRequiredPage } from '../pages/routing/campaign-id-required-page';
+import { RoutingCreateMessagePlanPage } from '../pages/routing/create-message-plan-page';
+import { RoutingMessagePlanCampaignIdRequiredPage } from '../pages/routing/campaign-id-required-page';
 
 // Reset storage state for this file to avoid being authenticated
 test.use({ storageState: { cookies: [], origins: [] } });
 
 const protectedPages = [
-  CreateMessagePlanPage,
-  MessagePlanCampaignIdRequiredPage,
-  MessageTemplatesPage,
   RoutingChooseMessageOrderPage,
+  RoutingCreateMessagePlanPage,
+  RoutingMessagePlanCampaignIdRequiredPage,
   TemplateMgmtChoosePage,
   TemplateMgmtCopyPage,
   TemplateMgmtCreateEmailPage,
-  TemplateMgmtUploadLetterPage,
-  TemplateMgmtUploadLetterMissingCampaignClientIdPage,
   TemplateMgmtCreateNhsAppPage,
   TemplateMgmtCreateSmsPage,
   TemplateMgmtDeletePage,
   TemplateMgmtEditEmailPage,
   TemplateMgmtEditNhsAppPage,
   TemplateMgmtEditSmsPage,
   TemplateMgmtInvalidTemplatePage,
+  TemplateMgmtMessageTemplatesPage,
   TemplateMgmtPreviewEmailPage,
   TemplateMgmtPreviewLetterPage,
   TemplateMgmtPreviewNhsAppPage,
@@ -74,6 +72,8 @@ const protectedPages = [
   TemplateMgmtTemplateSubmittedLetterPage,
   TemplateMgmtTemplateSubmittedNhsAppPage,
   TemplateMgmtTemplateSubmittedSmsPage,
+  TemplateMgmtUploadLetterMissingCampaignClientIdPage,
+  TemplateMgmtUploadLetterPage,
 ];
 
 const publicPages = [TemplateMgmtStartPage];
diff --git a/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts
@@ -6,7 +6,7 @@ import {
   TestUser,
   testUsers,
 } from '../helpers/auth/cognito-auth-helper';
-import { MessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
+import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
 import { TemplateMgmtPreviewEmailPage } from '../pages/email/template-mgmt-preview-email-page';
 import { TemplateMgmtPreviewSubmittedEmailPage } from '../pages/email/template-mgmt-preview-submitted-email-page';
 
@@ -59,7 +59,7 @@ test.describe('Unauthorised data access Tests', () => {
     page,
     baseURL,
   }) => {
-    const messageTemplatesPage = new MessageTemplatesPage(page);
+    const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     await messageTemplatesPage.loadPage();
     await expect(page).toHaveURL(`${baseURL}/templates/message-templates`);
     await expect(messageTemplatesPage.pageHeading).toHaveText(
diff --git a/tests/test-team/template-mgmt-routing-component-tests/campaign-id-required-page.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/campaign-id-required-page.routing-component.spec.ts
@@ -5,11 +5,13 @@ import {
   assertHeaderLogoLink,
   assertSkipToMainContent,
 } from 'helpers/template-mgmt-common.steps';
-import { MessagePlanCampaignIdRequiredPage } from 'pages/routing/campaign-id-required-page';
+import { RoutingMessagePlanCampaignIdRequiredPage } from 'pages/routing/campaign-id-required-page';
 
 test.describe('Message Plan Campaign Id Required Page', () => {
   test('common page tests', async ({ page, baseURL }) => {
-    const campaignIdRequiredPage = new MessagePlanCampaignIdRequiredPage(page);
+    const campaignIdRequiredPage = new RoutingMessagePlanCampaignIdRequiredPage(
+      page
+    );
 
     await campaignIdRequiredPage.loadPage();
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/choose-message-order.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/choose-message-order.routing-component.spec.ts
@@ -7,6 +7,7 @@ import {
   assertHeaderLogoLink,
   assertSkipToMainContent,
 } from '../helpers/template-mgmt-common.steps';
+import { ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS } from 'helpers/enum';
 
 test.describe('Choose Message Order Page', () => {
   test('should land on "Choose Message Order" page when navigating to "/choose-message-order" url', async ({
@@ -69,41 +70,11 @@ test.describe('Choose Message Order Page', () => {
     ]);
   });
 
-  for (const { label, option } of [
-    {
-      option: 'NHSAPP',
-      label: 'NHS App only',
-    },
-    {
-      option: 'NHSAPP,EMAIL',
-      label: 'NHS App, Email',
-    },
-    {
-      option: 'NHSAPP,SMS',
-      label: 'NHS App, Text message',
-    },
-    {
-      option: 'NHSAPP,EMAIL,SMS',
-      label: 'NHS App, Email, Text message',
-    },
-    {
-      option: 'NHSAPP,SMS,EMAIL',
-      label: 'NHS App, Text message, Email',
-    },
-    {
-      option: 'NHSAPP,SMS,LETTER',
-      label: 'NHS App, Text message, Letter',
-    },
-    {
-      option: 'NHSAPP,EMAIL,SMS,LETTER',
-      label: 'NHS App, Email, Text message, Letter',
-    },
-    {
-      option: 'LETTER',
-      label: 'Letter only',
-    },
-  ])
-    test(`when the ${label} option is selected, nagivates to the create-message-plan page with the correct query parameter`, async ({
+  for (const {
+    label,
+    messageOrder,
+  } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
+    test(`when the ${label} message order is selected, nagivates to the create-message-plan page with the correct query parameter`, async ({
       page,
       baseURL,
     }) => {
@@ -114,7 +85,7 @@ test.describe('Choose Message Order Page', () => {
       await chooseMessageOrderPage.clickContinueButton();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(option)}`
+        `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(messageOrder)}`
       );
     });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ export function MessagePlanForm({`
`117`	`117`	`'nhsuk-u-padding-top-3',`
`118`	`118`	`'inline-block'`
`119`	`119`	`)}`
	`120`	`+ data-testid='go-back-link'`
`120`	`121`	`>`
`121`	`122`	`{formContent.backLink.text}`
`122`	`123`	`</Link>`