CCM-11492 Update message-plans

Author: nicki-nhs

frontend/src/__tests__/utils/message-plans.test.ts

@@ -8,7 +8,7 @@ import {
   createRoutingConfig,
 } from '@utils/message-plans';
 import { getSessionServer } from '@utils/amplify-utils';
-import { routingConfigurationApiClient } from 'nhs-notify-backend-client';
+import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
 import { getTemplate } from '@utils/form-actions';
 import type {
@@ -455,23 +455,21 @@ describe('Message plans actions', () => {
   });
 
   describe('getTemplatesById', () => {
-    it('should return a map of successful template fetches and ignore undefined/rejected', async () => {
+    it('should return a map of successful template fetches and ignore undefined', async () => {
       getTemplateMock.mockImplementation(async (id: string) => {
         if (id === 'template-1') return { ...EMAIL_TEMPLATE, id: 'template-1' };
         if (id === 'template-3') return { ...SMS_TEMPLATE, id: 'template-3' };
         if (id === 'template-2') return undefined;
-        if (id === 'error-template') throw new Error('error');
         return undefined;
       });
 
       const result = await getTemplatesByIds([
         'template-1',
         'template-2',
         'template-3',
-        'error-template',
       ]);
 
-      expect(getTemplateMock).toHaveBeenCalledTimes(4);
+      expect(getTemplateMock).toHaveBeenCalledTimes(3);
       expect(result).toEqual({
         'template-1': expect.objectContaining({
           id: 'template-1',
@@ -483,6 +481,26 @@ describe('Message plans actions', () => {
         }),
       });
     });
+
+    it('should throw an error with the template id when a fetch fails', async () => {
+      getTemplateMock.mockImplementation(async (id: string) => {
+        if (id === 'template-1') return { ...EMAIL_TEMPLATE, id: 'template-1' };
+        if (id === 'template-3') return { ...SMS_TEMPLATE, id: 'template-3' };
+        if (id === 'template-2') return undefined;
+        if (id === 'error-template') throw new Error('error');
+        return undefined;
+      });
+
+      await expect(
+        getTemplatesByIds([
+          'template-1',
+          'template-2',
+          'template-3',
+          'error-template',
+        ])
+      ).rejects.toThrow('Failed to get template for id error-template');
+      expect(getTemplateMock).toHaveBeenCalledTimes(4);
+    });
   });
 
   describe('getMessagePlanTemplates', () => {

frontend/src/utils/message-plans.ts

@@ -3,7 +3,6 @@
 import {
   RoutingConfig,
   $RoutingConfig,
-  routingConfigurationApiClient,
   TemplateDto,
   RoutingConfigStatusActive,
 } from 'nhs-notify-backend-client';
@@ -12,6 +11,7 @@ import { getSessionServer } from './amplify-utils';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
 import { getTemplate } from './form-actions';
 import { sortAscByUpdatedAt } from './sort';
+import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
 
 export async function getRoutingConfigs(): Promise<RoutingConfig[]> {
   const { accessToken } = await getSessionServer();
@@ -55,9 +55,7 @@ export async function countRoutingConfigs(
   );
 
   if (error) {
-    logger.error(`Failed to count routing configuration for ${status}`, {
-      error,
-    });
+    logger.error(`Failed to count routing configuration for ${status}`, error);
     return 0;
   }
 
@@ -79,19 +77,15 @@ export async function getRoutingConfig(
   );
 
   if (error) {
-    logger.error('Failed to get routing configuration', {
-      error: error,
-    });
+    logger.error('Failed to get routing configuration', error);
   }
 
   if (!data) return undefined;
 
   const result = $RoutingConfig.safeParse(data);
 
   if (!result.success) {
-    logger.error('Invalid routing configuration object', {
-      error: result.error,
-    });
+    logger.error('Invalid routing configuration object', result.error);
     return undefined;
   }
 
@@ -116,7 +110,7 @@ export async function createRoutingConfig(
   );
 
   if (error) {
-    logger.error('Failed to create message plan', { error });
+    logger.error('Failed to create message plan', error);
     throw new Error('Failed to create message plan');
   }
 
@@ -140,9 +134,7 @@ export async function updateRoutingConfig(
   );
 
   if (error) {
-    logger.error('Failed to get routing configuration', {
-      error: error,
-    });
+    logger.error('Failed to get routing configuration', error);
     return;
   }
 
@@ -151,9 +143,7 @@ export async function updateRoutingConfig(
   const result = $RoutingConfig.safeParse(data);
 
   if (!result.success) {
-    logger.error('Invalid routing configuration object', {
-      error: result.error,
-    });
+    logger.error('Invalid routing configuration object', result.error);
     return undefined;
   }
 
@@ -172,11 +162,17 @@ export async function getMessagePlanTemplates(
   return getTemplatesByIds([...templateIds]);
 }
 
-export async function getTemplatesByIds(templateIds: string[]) {
+export async function getTemplatesByIds(
+  templateIds: string[]
+): Promise<MessagePlanTemplates> {
   const results = await Promise.allSettled(
     templateIds.map(async (templateId) => {
-      const template = await getTemplate(templateId);
-      return { id: templateId, template };
+      try {
+        const template = await getTemplate(templateId);
+        return { id: templateId, template };
+      } catch (error) {
+        throw { id: templateId, error };
+      }
     })
   );
 
@@ -187,7 +183,8 @@ export async function getTemplatesByIds(templateIds: string[]) {
       const { id, template } = result.value;
       if (template) templates[id] = template;
     } else {
-      // TODO: Error handling
+      const { id, error } = result.reason;
+      throw new Error(`Failed to get template for id ${id}: ${error}`);
     }
   }