Skip to content

CCM-13012: Add defaultCascadeGroup and supplierReferences #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-elliott-nhsd merged 10 commits into from
Nov 21, 2025
Merged

CCM-13012: Add defaultCascadeGroup and supplierReferences #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5fde75
CCM-13012: Add defaultCascadeGroup and supplierReferences
chris-elliott-nhsd Nov 18, 2025
555a79d
CCM-13012: Fix CI
chris-elliott-nhsd Nov 18, 2025
b5d333d
CCM-13012: Fix CI
chris-elliott-nhsd Nov 18, 2025
aa000a2
CCM-13012: Fix tests
chris-elliott-nhsd Nov 18, 2025
8af613e
CCM-13012: Revert account ID change
chris-elliott-nhsd Nov 18, 2025
1ac3182
CCM-13012: Fix update-routing-config endpoint
chris-elliott-nhsd Nov 19, 2025
64f480e
CCM-13012: Fix unit tests
chris-elliott-nhsd Nov 20, 2025
135cb39
CCM-13012: Add missing supplierReferences to zod validator
chris-elliott-nhsd Nov 20, 2025
5698464
CCM-13012: Add supplierReferences test
chris-elliott-nhsd Nov 21, 2025
e2b224b
CCM-13012: Add supplierReferences test
chris-elliott-nhsd Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions frontend/src/__tests__/app/choose-templates/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import {
getRoutingConfig,
getMessagePlanTemplates,
} from '@utils/message-plans';
import type {
RoutingConfig,
RoutingConfigStatus,
} from 'nhs-notify-backend-client';
import type { RoutingConfig } from 'nhs-notify-backend-client';
import {
EMAIL_TEMPLATE,
LETTER_TEMPLATE,
Expand All @@ -34,13 +31,14 @@ const validRoutingConfigId = 'fbb81055-79b9-4759-ac07-d191ae57be34';
const routingConfig: RoutingConfig = {
id: validRoutingConfigId,
name: 'Autumn Campaign Plan',
status: 'DRAFT' as RoutingConfigStatus,
status: 'DRAFT',
clientId: 'client-1',
campaignId: 'campaign-2',
createdAt: '2025-01-13T10:19:25.579Z',
updatedAt: '2025-01-13T10:19:25.579Z',
cascadeGroupOverrides: [],
cascade: [],
defaultCascadeGroup: 'standard',
};

describe('ChooseTemplatesPage', () => {
Expand Down
297 changes: 142 additions & 155 deletions frontend/src/__tests__/app/message-plans/create-message-plan/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { mock } from 'jest-mock-extended';
import { redirect, RedirectType } from 'next/navigation';
import type {
CascadeGroup,
CascadeItem,
RoutingConfig,
} from 'nhs-notify-backend-client';
import type { CascadeItem, RoutingConfig } from 'nhs-notify-backend-client';
import type { MessageOrder } from 'nhs-notify-web-template-management-utils';
import { createMessagePlanServerAction } from '@app/message-plans/create-message-plan/server-action';
import { NextRedirectError } from '@testhelpers/next-redirect';
Expand All @@ -26,175 +22,166 @@ beforeEach(() => {
jest.clearAllMocks();
});

const MESSAGE_ORDER_SCENARIOS: [MessageOrder, CascadeItem[], CascadeGroup[]][] =
const MESSAGE_ORDER_SCENARIOS: [MessageOrder, CascadeItem[]][] = [
[
'NHSAPP',
[
'NHSAPP',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,EMAIL',
[
'NHSAPP,EMAIL',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,SMS',
[
'NHSAPP,SMS',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,EMAIL,SMS',
[
'NHSAPP,EMAIL,SMS',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,SMS,EMAIL',
[
'NHSAPP,SMS,EMAIL',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,SMS,LETTER',
[
'NHSAPP,SMS,LETTER',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'NHSAPP,EMAIL,SMS,LETTER',
[
'NHSAPP,EMAIL,SMS,LETTER',
[
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'NHSAPP',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'EMAIL',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'SMS',
channelType: 'primary',
defaultTemplateId: null,
},
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
],
[
'LETTER',
[
'LETTER',
[
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
[{ name: 'standard' }],
{
cascadeGroups: ['standard'],
channel: 'LETTER',
channelType: 'primary',
defaultTemplateId: null,
},
],
];
],
];

test.each(MESSAGE_ORDER_SCENARIOS)(
'creates a message plan with correct initial cascade for %s message order and redirects to the choose templates page',
async (messageOrder, expectedCascade, expectedCascadeGroups) => {
async (messageOrder, expectedCascade) => {
const form = new FormData();
form.append('name', 'Message Plan Name');
form.append('campaignId', 'test-campaign-id');
Expand All @@ -212,7 +199,7 @@ test.each(MESSAGE_ORDER_SCENARIOS)(
name: 'Message Plan Name',
campaignId: 'test-campaign-id',
cascade: expectedCascade,
cascadeGroupOverrides: expectedCascadeGroups,
cascadeGroupOverrides: [],
});
}
);
Expand Down
Loading
Loading