CCM-11474: review feedback

Author: harrim91

frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { mock } from 'jest-mock-extended';

frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap

@@ -199,7 +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"
-        href="/templates/message-plans/choose-message-order"
+        href="/message-plans/choose-message-order"
       >
         Go back
       </a>
@@ -347,7 +347,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"
-        href="/templates/message-plans/choose-message-order"
+        href="/message-plans/choose-message-order"
       >
         Go back
       </a>
@@ -510,7 +510,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"
-        href="/templates/message-plans/choose-message-order"
+        href="/message-plans/choose-message-order"
       >
         Go back
       </a>
@@ -662,7 +662,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"
-        href="/templates/message-plans/choose-message-order"
+        href="/message-plans/choose-message-order"
       >
         Go back
       </a>
@@ -798,7 +798,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"
-        href="/templates/message-plans/choose-message-order"
+        href="/message-plans/choose-message-order"
       >
         Go back
       </a>

frontend/src/__tests__/utils/form-actions.test.ts

@@ -20,13 +20,16 @@ import {
 import { getSessionServer } from '@utils/amplify-utils';
 import { TemplateDto } from 'nhs-notify-backend-client';
 import { templateApiClient } from 'nhs-notify-backend-client/src/template-api-client';
+import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
 import { randomUUID } from 'node:crypto';
 
 const mockedTemplateClient = jest.mocked(templateApiClient);
+const mockedRoutingConfigClient = jest.mocked(routingConfigurationApiClient);
 const authIdTokenServerMock = jest.mocked(getSessionServer);
 
 jest.mock('@utils/amplify-utils');
 jest.mock('nhs-notify-backend-client/src/template-api-client');
+jest.mock('nhs-notify-backend-client/src/routing-config-api-client');
 
 describe('form-actions', () => {
   beforeEach(() => {
@@ -701,7 +704,7 @@ describe('form-actions', () => {
       const now = new Date();
       const id = randomUUID();
 
-      mockedTemplateClient.createRoutingConfig.mockImplementationOnce(
+      mockedRoutingConfigClient.create.mockImplementationOnce(
         async (input) => ({
           data: {
             ...input,
@@ -728,7 +731,7 @@ describe('form-actions', () => {
         cascadeGroupOverrides: [{ name: 'standard' }],
       });
 
-      expect(mockedTemplateClient.createRoutingConfig).toHaveBeenCalledWith(
+      expect(mockedRoutingConfigClient.create).toHaveBeenCalledWith(
         {
           name: 'My Routing Config',
           campaignId: 'my-campaign-id',
@@ -788,11 +791,11 @@ describe('form-actions', () => {
         })
       ).rejects.toThrow('Failed to get access token');
 
-      expect(mockedTemplateClient.createRoutingConfig).not.toHaveBeenCalled();
+      expect(mockedRoutingConfigClient.create).not.toHaveBeenCalled();
     });
 
     test('errors when request fails', async () => {
-      mockedTemplateClient.createRoutingConfig.mockResolvedValueOnce({
+      mockedRoutingConfigClient.create.mockResolvedValueOnce({
         error: {
           errorMeta: {
             code: 400,

frontend/src/components/forms/MessagePlan/MessagePlan.tsx

@@ -13,9 +13,9 @@ import { MessageOrder } from 'nhs-notify-web-template-management-utils';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
 import { useTextInput } from '@hooks/use-text-input.hook';
 import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
-import { getBasePath } from '@utils/get-base-path';
 import { messagePlanServerAction } from './server-action';
 import content from '@content/content';
+import Link from 'next/link';
 
 const formContent = content.components.messagePlanForm;
 
@@ -109,17 +109,17 @@ export function MessagePlanForm({
         <NHSNotifyButton data-testid='submit-button'>
           {formContent.submitButton}
         </NHSNotifyButton>
-        <a
-          href={`${getBasePath()}/message-plans/choose-message-order`}
+        <Link
+          href={formContent.backLink.href}
           className={classNames(
             'nhsuk-u-font-size-19',
             'nhsuk-u-margin-left-3',
             'nhsuk-u-padding-top-3',
             'inline-block'
           )}
         >
-          {formContent.backLink}
-        </a>
+          {formContent.backLink.text}
+        </Link>
       </div>
     </NHSNotifyFormWrapper>
   );

frontend/src/content/content.ts

@@ -1079,7 +1079,7 @@ const messagePlanForm = {
     },
   },
   submitButton: 'Save and continue',
-  backLink: 'Go back',
+  backLink: { href: '/message-plans/choose-message-order', text: 'Go back' },
 };
 
 const content = {

frontend/src/utils/form-actions.ts

@@ -10,6 +10,7 @@ import {
 } from 'nhs-notify-backend-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
 import { templateApiClient } from 'nhs-notify-backend-client/src/template-api-client';
+import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
 
 export async function createTemplate(
   template: CreateUpdateTemplate
@@ -209,7 +210,7 @@ export async function createRoutingConfig(
     throw new Error('Failed to get access token');
   }
 
-  const { data, error } = await templateApiClient.createRoutingConfig(
+  const { data, error } = await routingConfigurationApiClient.create(
     routingConfig,
     accessToken
   );

lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts

@@ -0,0 +1,88 @@
+import {
+  routingConfigurationApiClient as client,
+  httpClient,
+} from '../routing-config-api-client';
+import MockAdapter from 'axios-mock-adapter';
+import { RoutingConfig } from '../types/generated';
+
+describe('RoutingConfigurationApiClient', () => {
+  const axiosMock = new MockAdapter(httpClient);
+
+  beforeEach(() => {
+    axiosMock.reset();
+  });
+
+  describe('create', () => {
+    test('should return error', async () => {
+      axiosMock.onPost('/v1/routing-configuration').reply(400, {
+        statusCode: 400,
+        technicalMessage: 'Bad request',
+        details: {
+          message: 'Something went wrong',
+        },
+      });
+
+      const result = await client.create(
+        {
+          name: 'test',
+          campaignId: 'campaign-id',
+          cascade: [],
+          cascadeGroupOverrides: [],
+        },
+        'test-token'
+      );
+
+      expect(result.error).toEqual({
+        errorMeta: {
+          code: 400,
+          description: 'Bad request',
+          details: {
+            message: 'Something went wrong',
+          },
+        },
+      });
+
+      expect(result.data).toBeUndefined();
+
+      expect(axiosMock.history.post.length).toBe(1);
+    });
+
+    test('should return routing config', async () => {
+      const data: RoutingConfig = {
+        campaignId: 'campaign-id',
+        cascade: [],
+        cascadeGroupOverrides: [],
+        clientId: 'client-id',
+        createdAt: new Date().toISOString(),
+        id: 'id',
+        name: 'name',
+        status: 'DRAFT',
+        updatedAt: new Date().toISOString(),
+      };
+
+      axiosMock.onPost('/v1/routing-configuration').reply(201, {
+        statusCode: 201,
+        data,
+      });
+
+      const body = {
+        campaignId: data.campaignId,
+        cascade: data.cascade,
+        cascadeGroupOverrides: data.cascadeGroupOverrides,
+        name: data.name,
+      };
+
+      const result = await client.create(body, 'test-token');
+
+      expect(axiosMock.history.post.length).toBe(1);
+      expect(JSON.parse(axiosMock.history.post[0].data)).toEqual(body);
+      expect(axiosMock.history.post[0].headers?.Authorization).toBe(
+        'test-token'
+      );
+
+      expect(result.data).toEqual(data);
+
+      expect(result.error).toBeUndefined();
+    });
+  });
+});

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

@@ -1,7 +1,6 @@
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import { TemplateApiClient } from '../template-api-client';
-import { RoutingConfig } from '../types/generated';
 
 const axiosMock = new MockAdapter(axios);
 
@@ -486,80 +485,4 @@ describe('TemplateAPIClient', () => {
       expect(result.error).toBeUndefined();
     });
   });
-
-  describe('createRoutingConfig', () => {
-    test('should return error', async () => {
-      axiosMock.onPost('/v1/routing-configuration').reply(400, {
-        statusCode: 400,
-        technicalMessage: 'Bad request',
-        details: {
-          message: 'Something went wrong',
-        },
-      });
-
-      const client = new TemplateApiClient();
-
-      const result = await client.createRoutingConfig(
-        {
-          name: 'test',
-          campaignId: 'campaign-id',
-          cascade: [],
-          cascadeGroupOverrides: [],
-        },
-        testToken
-      );
-
-      expect(result.error).toEqual({
-        errorMeta: {
-          code: 400,
-          description: 'Bad request',
-          details: {
-            message: 'Something went wrong',
-          },
-        },
-      });
-
-      expect(result.data).toBeUndefined();
-
-      expect(axiosMock.history.post.length).toBe(1);
-    });
-
-    test('should return routing config', async () => {
-      const data: RoutingConfig = {
-        campaignId: 'campaign-id',
-        cascade: [],
-        cascadeGroupOverrides: [],
-        clientId: 'client-id',
-        createdAt: new Date().toISOString(),
-        id: 'id',
-        name: 'name',
-        status: 'DRAFT',
-        updatedAt: new Date().toISOString(),
-      };
-
-      axiosMock.onPost('/v1/routing-configuration').reply(201, {
-        statusCode: 201,
-        data,
-      });
-
-      const client = new TemplateApiClient();
-
-      const body = {
-        campaignId: data.campaignId,
-        cascade: data.cascade,
-        cascadeGroupOverrides: data.cascadeGroupOverrides,
-        name: data.name,
-      };
-
-      const result = await client.createRoutingConfig(body, testToken);
-
-      expect(axiosMock.history.post.length).toBe(1);
-      expect(JSON.parse(axiosMock.history.post[0].data)).toEqual(body);
-      expect(axiosMock.history.post[0].headers?.Authorization).toBe(testToken);
-
-      expect(result.data).toEqual(data);
-
-      expect(result.error).toBeUndefined();
-    });
-  });
 });

lambdas/backend-client/src/routing-config-api-client.ts

@@ -0,0 +1,38 @@
+import type { RoutingConfig, RoutingConfigSuccess } from './types/generated';
+import { catchAxiosError, createAxiosClient } from './axios-client';
+import { Result } from './types/result';
+
+export const httpClient = createAxiosClient();
+
+export const routingConfigurationApiClient = {
+  async create(
+    routingConfig: Pick<
+      RoutingConfig,
+      'name' | 'campaignId' | 'cascade' | 'cascadeGroupOverrides'
+    >,
+    token: string
+  ): Promise<Result<RoutingConfig>> {
+    const response = await catchAxiosError(
+      httpClient.post<RoutingConfigSuccess>(
+        '/v1/routing-configuration',
+        routingConfig,
+        {
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: token,
+          },
+        }
+      )
+    );
+
+    if (response.error) {
+      return {
+        error: response.error,
+      };
+    }
+
+    return {
+      data: response.data.data,
+    };
+  },
+};