fix: typo in typologie column name

anct-cartographie-nationale · Jul 3, 2023 · 99e9a1f · 99e9a1f
1 parent 2a580c1
commit 99e9a1f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/assets/input/france-tiers-lieux/france-tiers-lieux.config.json b/assets/input/france-tiers-lieux/france-tiers-lieux.config.json
@@ -29,7 +29,7 @@
   "presentation_detail": {
     "colonne": "description"
   },
-  "typologies": [
+  "typologie": [
     {
       "cible": "TIERS_LIEUX"
     }

diff --git a/assets/input/hinaura/hinaura.config.json b/assets/input/hinaura/hinaura.config.json
@@ -8,7 +8,7 @@
   "pivot": {
     "colonne": "bf_siret"
   },
-  "typologies": [
+  "typologie": [
     {
       "colonnes": ["checkboxListeTypelieu"],
       "termes": ["3", "4"],

diff --git a/src/transformer/fields/typologies/typologies.field.spec.ts b/src/transformer/fields/typologies/typologies.field.spec.ts
@@ -19,7 +19,7 @@ describe('typologie field', (): void => {
 
   it('should always get RFS as typologie', (): void => {
     const matching: LieuxMediationNumeriqueMatching = {
-      typologies: [{ cible: Typologie.RFS }]
+      typologie: [{ cible: Typologie.RFS }]
     } as LieuxMediationNumeriqueMatching;
 
     const source: DataSource = {};
@@ -32,7 +32,7 @@ describe('typologie field', (): void => {
   it('should always get RFS as typologie even if name could match something else', (): void => {
     const matching: LieuxMediationNumeriqueMatching = {
       nom: { colonne: 'name' },
-      typologies: [{ cible: Typologie.RFS }]
+      typologie: [{ cible: Typologie.RFS }]
     } as LieuxMediationNumeriqueMatching;
 
     const source: DataSource = {
@@ -45,7 +45,7 @@ describe('typologie field', (): void => {
 
   it('should always get TIERS_LIEUX as typologie', (): void => {
     const matching: LieuxMediationNumeriqueMatching = {
-      typologies: [{ cible: Typologie.TIERS_LIEUX }]
+      typologie: [{ cible: Typologie.TIERS_LIEUX }]
     } as LieuxMediationNumeriqueMatching;
 
     const source: DataSource = {};
@@ -1182,4 +1182,20 @@ describe('typologie field', (): void => {
 
     expect(typologie).toBe(Typologie.MDS);
   });
+
+  it('should get TIERS_LIEUX when this typologie is already present', (): void => {
+    const source: DataSource = {
+      nom: 'Holywood Atelier Bois Partagé',
+      typologie: 'TIERS_LIEUX'
+    };
+
+    const matching: LieuxMediationNumeriqueMatching = {
+      nom: { colonne: 'nom' },
+      typologie: [{ colonnes: ['typologie'], termes: ['TIERS_LIEUX'], cible: Typologie.TIERS_LIEUX }]
+    } as LieuxMediationNumeriqueMatching;
+
+    const [typologie]: Typologies = processTypologies(source, matching);
+
+    expect(typologie).toBe(Typologie.TIERS_LIEUX);
+  });
 });
diff --git a/src/transformer/fields/typologies/typologies.field.ts b/src/transformer/fields/typologies/typologies.field.ts
@@ -61,6 +61,6 @@ const inferTypologies = (source: DataSource, matching: LieuxMediationNumeriqueMa
     : TYPOLOGIE_MATCHERS.reduce(toTypologieMatchingName(source, matching), Typologies([]));
 
 export const processTypologies = (source: DataSource, matching: LieuxMediationNumeriqueMatching): Typologies =>
-  matching.typologies?.at(0)?.cible == null
+  matching.typologie?.at(0)?.cible == null
     ? inferTypologies(source, matching)
-    : Typologies(Array.from(new Set(matching.typologies.reduce(appendTypologies(source), []))));
+    : Typologies(Array.from(new Set(matching.typologie.reduce(appendTypologies(source), []))));
diff --git a/src/transformer/fields/typologies/typologies.spec.ts b/src/transformer/fields/typologies/typologies.spec.ts
@@ -16,7 +16,7 @@ describe('typologies field', (): void => {
   it('should get BIB typologie for Médiathèque', (): void => {
     const matching: LieuxMediationNumeriqueMatching = {
       nom: { colonne: 'name' },
-      typologies: [{ colonnes: ['checkboxListeTypelieu'], termes: ['5'], cible: Typologie.BIB }]
+      typologie: [{ colonnes: ['checkboxListeTypelieu'], termes: ['5'], cible: Typologie.BIB }]
     } as LieuxMediationNumeriqueMatching;
 
     const typologies: Typologies = processTypologies({ checkboxListeTypelieu: '5' }, matching);

diff --git a/src/transformer/input/lieux-mediation-numerique-matching.ts b/src/transformer/input/lieux-mediation-numerique-matching.ts
@@ -41,7 +41,7 @@ export type LieuxMediationNumeriqueMatching = {
   id?: Colonne;
   nom: Colonne;
   pivot?: Colonne;
-  typologies?: Choice<Typologie>[];
+  typologie?: Choice<Typologie>[];
   code_postal: Colonne;
   commune: Colonne;
   adresse: Jonction & Partial<Colonne>;