fix: refactor

anct-cartographie-nationale · Jul 25, 2023 · 21ef211 · 21ef211
1 parent adfb2eb
commit 21ef211
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/transformer/fields/typologies/typologies.field.ts b/src/transformer/fields/typologies/typologies.field.ts
@@ -63,13 +63,17 @@ const inferTypologies = (source: DataSource, matching: LieuxMediationNumeriqueMa
 const checkingTypologieSourceValues = (source: DataSource, matching: LieuxMediationNumeriqueMatching): boolean[] | undefined =>
   matching.typologie?.map(
     (typo: Choice<Typologie>): boolean =>
-      source[typo.colonnes as unknown as string] != null && source[typo.colonnes as unknown as string] !== ''
+      typo.colonnes != null &&
+      source[typo.colonnes[0] as keyof DataSource] != null &&
+      source[typo.colonnes[0] as keyof DataSource] !== ''
   );
 
+const typologiesArePreset = (matching: LieuxMediationNumeriqueMatching): boolean =>
+  !!matching.typologie?.[0]?.cible && !matching.typologie?.[0].colonnes && !matching.typologie?.[0].termes;
+
 export const processTypologies = (source: DataSource, matching: LieuxMediationNumeriqueMatching): Typologies =>
   ((checkingTypologieSourceValues(source, matching) ?? []).some((check: boolean): boolean => !check) &&
-    matching.typologie?.at(0)?.cible !== Typologie.RFS &&
-    matching.typologie?.at(0)?.cible !== Typologie.TIERS_LIEUX) ||
+    !typologiesArePreset(matching)) ||
   matching.typologie?.at(0)?.cible == null
     ? inferTypologies(source, matching)
     : Typologies(Array.from(new Set(matching.typologie.reduce(appendTypologies(source), []))));