Skip to content

Commit 4447d76

Browse files
committed
CCM-11492 Refactor api client and remove redundant code
1 parent 9140568 commit 4447d76

File tree

5 files changed

+16
-166
lines changed

5 files changed

+16
-166
lines changed

frontend/src/components/forms/MessagePlan/server-action.ts

Lines changed: 0 additions & 122 deletions
This file was deleted.

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { ApplicationResult, failure, success } from '@backend-api/utils/result';
1+
import { failure } from '@backend-api/utils/result';
22
import {
33
$CreateUpdateRoutingConfig,
44
$ListRoutingConfigFilters,
5-
type CreateUpdateRoutingConfig,
65
ErrorCase,
76
type ListRoutingConfigFilters,
87
type Result,
@@ -213,26 +212,4 @@ export class RoutingConfigClient {
213212

214213
return query.count();
215214
}
216-
217-
private async validateCampaignId(
218-
clientId: string,
219-
data: CreateUpdateRoutingConfig
220-
): Promise<ApplicationResult<null>> {
221-
const clientConfigurationResult =
222-
await this.clientConfigRepository.get(clientId);
223-
224-
const { data: clientConfiguration, error: clientConfigurationError } =
225-
clientConfigurationResult;
226-
227-
if (clientConfigurationError) return clientConfigurationResult;
228-
229-
if (!clientConfiguration?.campaignIds?.includes(data.campaignId)) {
230-
return failure(
231-
ErrorCase.VALIDATION_FAILED,
232-
'Invalid campaign ID in request'
233-
);
234-
}
235-
236-
return success(null);
237-
}
238215
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import MockAdapter from 'axios-mock-adapter';
22
import {
33
isValidUuid,
44
routingConfigurationApiClient as client,
5-
axiosClient,
5+
httpClient,
66
} from '../routing-config-api-client';
77
import { RoutingConfig, RoutingConfigStatus } from '../types/generated';
88
import { ErrorCase } from '../types/error-cases';
@@ -12,7 +12,7 @@ const notFoundRoutingConfigId = '3b5d7f9a-1c2e-4b3d-8f0a-6e7d8c9b0a1f';
1212
const invalidRoutingConfigId = 'not-a-uuid';
1313

1414
describe('RoutingConfigurationApiClient', () => {
15-
const axiosMock = new MockAdapter(axiosClient);
15+
const axiosMock = new MockAdapter(httpClient);
1616

1717
beforeEach(() => {
1818
axiosMock.reset();

lambdas/backend-client/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export * from './client-configuration-api-client';
2-
export * from './routing-config-api-client';
31
export * from './schemas/client';
42
export * from './schemas/routing-config';
53
export * from './schemas/schema-for';

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export function isValidUuid(id: string): boolean {
2121
);
2222
}
2323

24-
export const axiosClient = createAxiosClient();
24+
export const httpClient = createAxiosClient();
2525

26-
class RoutingConfigurationApiClient {
26+
export const routingConfigurationApiClient = {
2727
async create(
2828
routingConfig: Pick<
2929
RoutingConfig,
@@ -35,7 +35,7 @@ class RoutingConfigurationApiClient {
3535
'/v1/routing-configuration' satisfies PostV1RoutingConfigurationData['url'];
3636

3737
const response = await catchAxiosError(
38-
axiosClient.post<RoutingConfigSuccess>(url, routingConfig, {
38+
httpClient.post<RoutingConfigSuccess>(url, routingConfig, {
3939
headers: {
4040
'Content-Type': 'application/json',
4141
Authorization: token,
@@ -52,7 +52,7 @@ class RoutingConfigurationApiClient {
5252
return {
5353
data: response.data.data,
5454
};
55-
}
55+
},
5656

5757
async count(
5858
token: string,
@@ -62,7 +62,7 @@ class RoutingConfigurationApiClient {
6262
'/v1/routing-configurations/count' satisfies GetV1RoutingConfigurationsCountData['url'];
6363

6464
const { data, error } = await catchAxiosError(
65-
axiosClient.get<CountSuccess>(url, {
65+
httpClient.get<CountSuccess>(url, {
6666
headers: { Authorization: token },
6767
params: { status },
6868
})
@@ -73,7 +73,7 @@ class RoutingConfigurationApiClient {
7373
}
7474

7575
return { ...data };
76-
}
76+
},
7777

7878
async get(
7979
token: string,
@@ -97,7 +97,7 @@ class RoutingConfigurationApiClient {
9797
>;
9898

9999
const { data, error } = await catchAxiosError(
100-
axiosClient.get<RoutingConfigSuccess>(url, {
100+
httpClient.get<RoutingConfigSuccess>(url, {
101101
headers: { Authorization: token },
102102
})
103103
);
@@ -107,14 +107,14 @@ class RoutingConfigurationApiClient {
107107
}
108108

109109
return { ...data };
110-
}
110+
},
111111

112112
async list(token: string): Promise<Result<RoutingConfig[]>> {
113113
const url =
114114
'/v1/routing-configurations' satisfies GetV1RoutingConfigurationsData['url'];
115115

116116
const { data, error } = await catchAxiosError(
117-
axiosClient.get<RoutingConfigSuccessList>(url, {
117+
httpClient.get<RoutingConfigSuccessList>(url, {
118118
headers: { Authorization: token },
119119
})
120120
);
@@ -124,7 +124,7 @@ class RoutingConfigurationApiClient {
124124
}
125125

126126
return { ...data };
127-
}
127+
},
128128

129129
async update(
130130
token: string,
@@ -148,7 +148,7 @@ class RoutingConfigurationApiClient {
148148
>;
149149

150150
const { data, error } = await catchAxiosError(
151-
axiosClient.put<RoutingConfigSuccess>(url, routingConfig, {
151+
httpClient.put<RoutingConfigSuccess>(url, routingConfig, {
152152
headers: { Authorization: token },
153153
})
154154
);
@@ -158,8 +158,5 @@ class RoutingConfigurationApiClient {
158158
}
159159

160160
return { ...data };
161-
}
162-
}
163-
164-
export const routingConfigurationApiClient =
165-
new RoutingConfigurationApiClient();
161+
},
162+
};

0 commit comments

Comments
 (0)