CCM-11492 Update routing client

Author: nicki-nhs

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

@@ -1,33 +1,21 @@
-import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import { createAxiosClient } from '../axios-client';
 import {
   isValidUuid,
-  RoutingConfigurationApiClient,
+  routingConfigurationApiClient as client,
+  httpClient,
 } from '../routing-config-api-client';
 import { RoutingConfig, RoutingConfigStatus } from '../types/generated';
 import { ErrorCase } from '../types/error-cases';
 
-jest.mock('../axios-client', () => {
-  const actual = jest.requireActual('../axios-client');
-  return {
-    ...actual,
-    createAxiosClient: jest.fn(),
-  };
-});
-
-const createAxiosClientMock = jest.mocked(createAxiosClient);
-
 const validRoutingConfigId = '2a4b6c8d-0e1f-4a2b-9c3d-5e6f7a8b9c0d';
 const notFoundRoutingConfigId = '3b5d7f9a-1c2e-4b3d-8f0a-6e7d8c9b0a1f';
 const invalidRoutingConfigId = 'not-a-uuid';
 
 describe('RoutingConfigurationApiClient', () => {
-  const axiosMock = new MockAdapter(axios);
+  const axiosMock = new MockAdapter(httpClient);
 
   beforeEach(() => {
     axiosMock.reset();
-    createAxiosClientMock.mockReturnValue(axios);
   });
 
   describe('get', () => {
@@ -40,8 +28,6 @@ describe('RoutingConfigurationApiClient', () => {
           details: { message: 'Routing configuration not found' },
         });
 
-      const client = new RoutingConfigurationApiClient();
-
       const response = await client.get('mock-token', notFoundRoutingConfigId);
 
       expect(response.error).toEqual({
@@ -56,8 +42,6 @@ describe('RoutingConfigurationApiClient', () => {
     });
 
     it('should return error for invalid routing config ID', async () => {
-      const client = new RoutingConfigurationApiClient();
-
       const response = await client.get('mock-token', invalidRoutingConfigId);
 
       expect(response.error).toEqual({
@@ -91,8 +75,6 @@ describe('RoutingConfigurationApiClient', () => {
           data,
         });
 
-      const client = new RoutingConfigurationApiClient();
-
       const response = await client.get('mock-token', validRoutingConfigId);
 
       expect(response.error).toBeUndefined();
@@ -111,8 +93,6 @@ describe('RoutingConfigurationApiClient', () => {
         },
       });
 
-      const client = new RoutingConfigurationApiClient();
-
       const result = await client.create(
         {
           name: 'test',
@@ -163,8 +143,6 @@ describe('RoutingConfigurationApiClient', () => {
         name: data.name,
       };
 
-      const client = new RoutingConfigurationApiClient();
-
       const result = await client.create(body, 'test-token');
 
       expect(axiosMock.history.post.length).toBe(1);
@@ -189,8 +167,6 @@ describe('RoutingConfigurationApiClient', () => {
           details: { message: 'Routing configuration not found' },
         });
 
-      const client = new RoutingConfigurationApiClient();
-
       const body = {
         id: notFoundRoutingConfigId,
         name: 'Test plan',
@@ -221,8 +197,6 @@ describe('RoutingConfigurationApiClient', () => {
     });
 
     it('should return error for invalid routing config ID', async () => {
-      const client = new RoutingConfigurationApiClient();
-
       const body = {
         id: invalidRoutingConfigId,
         name: 'Test plan',
@@ -255,7 +229,7 @@ describe('RoutingConfigurationApiClient', () => {
 
     it('should return updated routing configuration on success', async () => {
       const body = {
-        id: '4c6e8f0a-2b3d-4c5e-9a1b-7d8c9b0a1f2e',
+        id: validRoutingConfigId,
         name: 'Updated Plan',
         status: 'DRAFT' as RoutingConfigStatus,
         clientId: 'client-1',
@@ -266,15 +240,15 @@ describe('RoutingConfigurationApiClient', () => {
         cascadeGroupOverrides: [],
       };
 
-      axiosMock.onPut('/v1/routing-configuration/routing-config-2').reply(200, {
-        data: body,
-      });
-
-      const client = new RoutingConfigurationApiClient();
+      axiosMock
+        .onPut(`/v1/routing-configuration/${validRoutingConfigId}`)
+        .reply(200, {
+          data: body,
+        });
 
       const response = await client.update(
         'test-token',
-        '4c6e8f0a-2b3d-4c5e-9a1b-7d8c9b0a1f2e',
+        validRoutingConfigId,
         body
       );
 

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

@@ -9,9 +9,9 @@ export function isValidUuid(id: string): boolean {
   );
 }
 
-export class RoutingConfigurationApiClient {
-  private readonly httpClient = createAxiosClient();
+export const httpClient = createAxiosClient();
 
+class RoutingConfigurationApiClient {
   async get(token: string, id: string): Promise<Result<RoutingConfig>> {
     if (!isValidUuid(id)) {
       return {
@@ -28,7 +28,7 @@ export class RoutingConfigurationApiClient {
     const url = `/v1/routing-configuration/${id}`;
 
     const { data, error } = await catchAxiosError(
-      this.httpClient.get<RoutingConfigSuccess>(url, {
+      httpClient.get<RoutingConfigSuccess>(url, {
         headers: { Authorization: token },
       })
     );
@@ -48,7 +48,7 @@ export class RoutingConfigurationApiClient {
     token: string
   ): Promise<Result<RoutingConfig>> {
     const response = await catchAxiosError(
-      this.httpClient.post<RoutingConfigSuccess>(
+      httpClient.post<RoutingConfigSuccess>(
         '/v1/routing-configuration',
         routingConfig,
         {
@@ -91,7 +91,7 @@ export class RoutingConfigurationApiClient {
     const url = `/v1/routing-configuration/${id}`;
 
     const { data, error } = await catchAxiosError(
-      this.httpClient.put<RoutingConfigSuccess>(url, routingConfig, {
+      httpClient.put<RoutingConfigSuccess>(url, routingConfig, {
         headers: { Authorization: token },
       })
     );