feat: unique duplicate logic

Onlineberatung · Feb 28, 2024 · 623432a · 623432a
1 parent 2e02954
commit 623432a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 45 deletions.
diff --git a/src/api/apiAgencySelection.ts b/src/api/apiAgencySelection.ts
@@ -1,7 +1,7 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
 import { AgencyDataInterface } from '../globalState/interfaces';
-import { apiGetConsultingType } from './apiGetConsultingType';
+import { loadConsultingTypesForAgencies } from '../utils/loadConsultingTypesForAgencies';
 
 export const apiAgencySelection = async (
 	{
@@ -52,26 +52,6 @@ export const apiAgencySelection = async (
 				return agencies;
 			}
 
-			// Get unique consultingTypes to prevent multiple requests to api
-			const uniqueConsultingTypeIds = [
-				...new Set(
-					agencies.map((a) => a?.consultingType).filter(Boolean)
-				)
-			];
-
-			return Promise.all(
-				uniqueConsultingTypeIds.map((consultingTypeId) =>
-					apiGetConsultingType({
-						consultingTypeId
-					})
-				)
-			).then((consultingTypes) =>
-				agencies.map((a) => ({
-					...a,
-					consultingTypeRel: consultingTypes.find(
-						(c) => c.id === a.consultingType
-					)
-				}))
-			);
+			return loadConsultingTypesForAgencies(agencies);
 		});
 };
diff --git a/src/api/apiGetConsultant.ts b/src/api/apiGetConsultant.ts
@@ -1,7 +1,7 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_METHODS, FETCH_ERRORS } from './fetchData';
 import { ConsultantDataInterface } from '../globalState/interfaces';
-import { apiGetConsultingType } from './apiGetConsultingType';
+import { loadConsultingTypesForAgencies } from '../utils/loadConsultingTypesForAgencies';
 
 export const apiGetConsultant = async (
 	consultantId: string,
@@ -14,32 +14,14 @@ export const apiGetConsultant = async (
 		method: FETCH_METHODS.GET,
 		skipAuth: true,
 		responseHandling: [FETCH_ERRORS.CATCH_ALL]
-	}).then((user: ConsultantDataInterface) => {
+	}).then(async (user: ConsultantDataInterface) => {
 		if (!fetchConsultingTypeDetails) {
 			return user;
 		}
 
-		// Get unique consultingTypes to prevent multiple requests to api
-		const uniqueConsultingTypeIds = [
-			...new Set(
-				user.agencies.map((a) => a?.consultingType).filter(Boolean)
-			)
-		];
-
-		return Promise.all(
-			uniqueConsultingTypeIds.map((consultingTypeId) =>
-				apiGetConsultingType({
-					consultingTypeId
-				})
-			)
-		).then((consultingTypes) => ({
+		return {
 			...user,
-			agencies: user.agencies.map((a) => ({
-				...a,
-				consultingTypeRel: consultingTypes.find(
-					(c) => c.id === a.consultingType
-				)
-			}))
-		}));
+			agencies: await loadConsultingTypesForAgencies(user.agencies)
+		};
 	});
 };
diff --git a/src/utils/loadConsultingTypesForAgencies.ts b/src/utils/loadConsultingTypesForAgencies.ts
@@ -0,0 +1,26 @@
+import { apiGetConsultingType } from '../api';
+import { AgencyDataInterface } from '../globalState/interfaces';
+
+export const loadConsultingTypesForAgencies = async (
+	agencies: AgencyDataInterface[]
+): Promise<AgencyDataInterface[]> => {
+	// Get unique consultingTypes to prevent multiple requests to api
+	const uniqueConsultingTypeIds = [
+		...new Set(agencies.map((a) => a?.consultingType).filter(Boolean))
+	];
+
+	return Promise.all(
+		uniqueConsultingTypeIds.map((consultingTypeId) =>
+			apiGetConsultingType({
+				consultingTypeId
+			})
+		)
+	).then((consultingTypes) =>
+		agencies.map((a) => ({
+			...a,
+			consultingTypeRel: consultingTypes.find(
+				(c) => c.id === a.consultingType
+			)
+		}))
+	);
+};