CCM-11492 Use CreateUpdateRoutingConfig type and zod validator

Author: nicki-nhs

frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.ts

@@ -27,13 +27,20 @@ export async function removeTemplateFromMessagePlan(formData: FormData) {
   if (!routingConfig)
     throw new Error(`Routing configuration ${routingConfigId} not found`);
 
-  const updatedCascade = routingConfig.cascade.map((cascadeItem) =>
+  const { campaignId, cascade, cascadeGroupOverrides, name } = routingConfig;
+
+  const updatedCascade = cascade.map((cascadeItem) =>
     cascadeItem.channel === channel
       ? { ...cascadeItem, defaultTemplateId: null }
       : cascadeItem
   );
 
-  const updatedConfig = { ...routingConfig, cascade: updatedCascade };
+  const updatedConfig = {
+    campaignId,
+    name,
+    cascadeGroupOverrides,
+    cascade: updatedCascade,
+  };
 
   await updateRoutingConfig(routingConfigId, updatedConfig);
 

frontend/src/utils/message-plans.ts

@@ -5,6 +5,7 @@ import {
   $RoutingConfig,
   TemplateDto,
   RoutingConfigStatusActive,
+  CreateUpdateRoutingConfig,
 } from 'nhs-notify-backend-client';
 import { getMessagePlanTemplateIds } from './get-message-plan-template-ids';
 import { getSessionServer } from './amplify-utils';
@@ -93,10 +94,7 @@ export async function getRoutingConfig(
 }
 
 export async function createRoutingConfig(
-  routingConfig: Pick<
-    RoutingConfig,
-    'name' | 'campaignId' | 'cascade' | 'cascadeGroupOverrides'
-  >
+  routingConfig: CreateUpdateRoutingConfig
 ): Promise<RoutingConfig> {
   const { accessToken } = await getSessionServer();
 
@@ -119,7 +117,7 @@ export async function createRoutingConfig(
 
 export async function updateRoutingConfig(
   routingConfigId: string,
-  updatedRoutingConfig: RoutingConfig
+  updatedRoutingConfig: CreateUpdateRoutingConfig
 ): Promise<RoutingConfig | undefined> {
   const { accessToken } = await getSessionServer();
 

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

@@ -1,6 +1,5 @@
 import MockAdapter from 'axios-mock-adapter';
 import {
-  isValidUuid,
   routingConfigurationApiClient as client,
   httpClient,
 } from '../routing-config-api-client';
@@ -271,11 +270,7 @@ describe('RoutingConfigurationApiClient', () => {
       const body = {
         id: notFoundRoutingConfigId,
         name: 'Test plan',
-        status: 'DRAFT' as RoutingConfigStatus,
-        clientId: 'client-1',
         campaignId: 'campaign-1',
-        createdAt: '2025-01-01T00:00:00.000Z',
-        updatedAt: '2025-01-02T00:00:00.000Z',
         cascade: [],
         cascadeGroupOverrides: [],
       };
@@ -301,11 +296,7 @@ describe('RoutingConfigurationApiClient', () => {
       const body = {
         id: invalidRoutingConfigId,
         name: 'Test plan',
-        status: 'DRAFT' as RoutingConfigStatus,
-        clientId: 'client-1',
         campaignId: 'campaign-1',
-        createdAt: '2025-01-01T00:00:00.000Z',
-        updatedAt: '2025-01-02T00:00:00.000Z',
         cascade: [],
         cascadeGroupOverrides: [],
       };
@@ -332,11 +323,7 @@ describe('RoutingConfigurationApiClient', () => {
       const body = {
         id: validRoutingConfigId,
         name: 'Updated Plan',
-        status: 'DRAFT' as RoutingConfigStatus,
-        clientId: 'client-1',
         campaignId: 'campaign-1',
-        createdAt: '2025-01-01T00:00:00.000Z',
-        updatedAt: '2025-01-02T00:00:00.000Z',
         cascade: [],
         cascadeGroupOverrides: [],
       };
@@ -358,17 +345,4 @@ describe('RoutingConfigurationApiClient', () => {
       expect(axiosMock.history.put.length).toBe(1);
     });
   });
-
-  describe('isValidUuid', () => {
-    it('returns true for valid UUID v4', () => {
-      expect(isValidUuid('a3f1c2e4-5b6d-4e8f-9a2b-1c3d4e5f6a7b')).toBe(true);
-      expect(isValidUuid('b7e2d3c4-8f9a-4b1c-9d2e-3f4a5b6c7d8e')).toBe(true);
-    });
-
-    it('returns false for invalid UUIDs', () => {
-      expect(isValidUuid('not-a-uuid')).toBe(false);
-      expect(isValidUuid('123456')).toBe(false);
-      expect(isValidUuid('11111111-1111-1111-1111-111111111111')).toBe(false);
-    });
-  });
 });

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

@@ -9,26 +9,21 @@ import type {
   PostV1RoutingConfigurationData,
   GetV1RoutingConfigurationByRoutingConfigIdData,
   PutV1RoutingConfigurationByRoutingConfigIdData,
+  CreateUpdateRoutingConfig,
 } from './types/generated';
 import { ErrorCase } from './types/error-cases';
 import { catchAxiosError, createAxiosClient } from './axios-client';
 import { Result } from './types/result';
 import { OpenApiToTemplate } from './types/open-api-helper';
+import { z } from 'zod';
 
-export function isValidUuid(id: string): boolean {
-  return /^[\da-f]{8}-[\da-f]{4}-4[\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/i.test(
-    id
-  );
-}
+const uuidSchema = z.uuidv4();
 
 export const httpClient = createAxiosClient();
 
 export const routingConfigurationApiClient = {
   async create(
-    routingConfig: Pick<
-      RoutingConfig,
-      'name' | 'campaignId' | 'cascade' | 'cascadeGroupOverrides'
-    >,
+    routingConfig: CreateUpdateRoutingConfig,
     token: string
   ): Promise<Result<RoutingConfig>> {
     const url =
@@ -79,7 +74,7 @@ export const routingConfigurationApiClient = {
     token: string,
     id: RoutingConfig['id']
   ): Promise<Result<RoutingConfig>> {
-    if (!isValidUuid(id)) {
+    if (!uuidSchema.safeParse(id).success) {
       return {
         error: {
           errorMeta: {
@@ -129,9 +124,9 @@ export const routingConfigurationApiClient = {
   async update(
     token: string,
     id: RoutingConfig['id'],
-    routingConfig: RoutingConfig
+    routingConfig: CreateUpdateRoutingConfig
   ): Promise<Result<RoutingConfig>> {
-    if (!isValidUuid(id)) {
+    if (!uuidSchema.safeParse(id).success) {
       return {
         error: {
           errorMeta: {