fix: same id for different sources (#71)

anct-cartographie-nationale · May 4, 2023 · d89c43e · d89c43e
1 parent 4d9b3cc
commit d89c43e
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 19 deletions.
diff --git a/src/data-inclusion/data-inclusion-merged.ts b/src/data-inclusion/data-inclusion-merged.ts
@@ -67,7 +67,7 @@ const dataInclusionMergedGeneral = (
   structure: SchemaStructureDataInclusion,
   service: SchemaServiceDataInclusion
 ): DataInclusionMergedGeneral => ({
-  id: structure.id,
+  id: `${structure.source}-${structure.id}`,
   nom: structure.nom,
   pivot: structure.siret ?? '',
   ...(structure.structure_parente == null ? {} : { structure_parente: structure.structure_parente }),
@@ -101,7 +101,7 @@ const dataInclusionMergedContact = (
 
 const dataInclusionMergedCollecte = (structure: SchemaStructureDataInclusion): DataInclusionMergedCollecte => ({
   date_maj: new Date(structure.date_maj).toISOString(),
-  source: 'Hubik'
+  source: structure.source ?? ''
 });
 
 const dataInclusionMergedPresentation = (structure: SchemaStructureDataInclusion): DataInclusionMergedPresentation => ({

diff --git a/src/data-inclusion/merge-services-in-structure.spec.ts b/src/data-inclusion/merge-services-in-structure.spec.ts
@@ -20,13 +20,13 @@ describe('merge services in structure', (): void => {
       id: 'structure-1',
       nom: 'Médiation république',
       siret: '43493312300029',
-      source: 'Hubik'
+      source: 'cnfs'
     };
 
     const service: SchemaServiceDataInclusion = {
       id: 'structure-1-mediation-numerique',
       nom: 'Médiation numérique',
-      source: 'Hubik',
+      source: 'cnfs',
       structure_id: 'structure-1',
       thematiques: ['numerique--devenir-autonome-dans-les-demarches-administratives']
     };
@@ -39,11 +39,11 @@ describe('merge services in structure', (): void => {
         commune: 'Paris',
         adresse: '51 rue de la république',
         date_maj: '2022-11-07T00:00:00.000Z',
-        id: 'structure-1',
+        id: 'cnfs-structure-1',
         nom: 'Médiation république',
         pivot: '43493312300029',
         thematiques: 'numerique--devenir-autonome-dans-les-demarches-administratives',
-        source: 'Hubik'
+        source: 'cnfs'
       }
     ]);
   });
@@ -132,7 +132,7 @@ describe('merge services in structure', (): void => {
         telephone: '+33180059880',
         site_web: 'https://www.laquincaillerie.tl/;https://m.facebook.com/laquincaillerienumerique/',
         date_maj: '2022-10-10T00:00:00.000Z',
-        id: 'structure-1',
+        id: 'Hubik-structure-1',
         nom: 'Anonymal',
         pivot: '43493312300029',
         thematiques:
@@ -205,30 +205,115 @@ describe('merge services in structure', (): void => {
     expect(dataInclusionMerged).toStrictEqual<DataInclusionMerged[]>([]);
   });
 
+  it('should not merge when the id are the same but the sources are different', (): void => {
+    const structure1: SchemaStructureDataInclusion = {
+      id: '3',
+      source: 'mediation-numerique-cd87',
+      longitude: 1.222764,
+      latitude: 45.829986,
+      labels_nationaux: ['aptic'],
+      nom: 'ALSEA Service INTERVAL',
+      commune: 'Limoges',
+      adresse: '1 bis Rue du Maréchal Juin 87100 Limoges',
+      code_postal: '87100',
+      date_maj: '2022-11-07'
+    };
+
+    const structure2: SchemaStructureDataInclusion = {
+      id: '3',
+      source: 'mediation-numerique-angers',
+      longitude: -0.5578638,
+      latitude: 47.4681383,
+      date_maj: '2023-02-12',
+      nom: "Centre d'Information et d'Orientation d'Angers - Segré",
+      commune: 'Angers',
+      adresse: '12 boulevard du Roi René',
+      code_postal: '49000'
+    };
+
+    const service1: SchemaServiceDataInclusion = {
+      id: '3-mediation-numerique',
+      source: 'mediation-numerique-cd87',
+      nom: 'Médiation numérique',
+      structure_id: '3',
+      thematiques: ['numerique', 'numerique--acceder-a-une-connexion-internet']
+    };
+
+    const service2: SchemaServiceDataInclusion = {
+      id: '3-mediation-numerique',
+      source: 'mediation-numerique-angers',
+      nom: 'Médiation numérique',
+      types: ['accompagnement'],
+      frais: ['pass-numerique'],
+      profils: ['jeunes-16-26', 'familles-enfants', 'adultes', 'seniors-65'],
+      structure_id: '3',
+      thematiques: ['numerique', 'numerique--utiliser-le-numerique-au-quotidien']
+    };
+
+    const dataInclusionMerged: DataInclusionMerged[] = structuresWithServicesNumeriques(
+      [structure1, structure2],
+      [service1, service2]
+    );
+
+    expect(dataInclusionMerged).toStrictEqual<DataInclusionMerged[]>([
+      {
+        adresse: '1 bis Rue du Maréchal Juin 87100 Limoges',
+        code_postal: '87100',
+        commune: 'Limoges',
+        date_maj: '2022-11-07T00:00:00.000Z',
+        id: 'mediation-numerique-cd87-3',
+        latitude: 45.829986,
+        longitude: 1.222764,
+        nom: 'ALSEA Service INTERVAL',
+        pivot: '',
+        source: 'mediation-numerique-cd87',
+        labels_nationaux: 'aptic',
+        thematiques: 'numerique,numerique--acceder-a-une-connexion-internet'
+      },
+      {
+        adresse: '12 boulevard du Roi René',
+        code_postal: '49000',
+        commune: 'Angers',
+        date_maj: '2023-02-12T00:00:00.000Z',
+        id: 'mediation-numerique-angers-3',
+        latitude: 47.4681383,
+        longitude: -0.5578638,
+        nom: "Centre d'Information et d'Orientation d'Angers - Segré",
+        pivot: '',
+        source: 'mediation-numerique-angers',
+        profils: 'jeunes-16-26,familles-enfants,adultes,seniors-65',
+        frais: 'pass-numerique',
+        types: 'accompagnement',
+        thematiques: 'numerique,numerique--utiliser-le-numerique-au-quotidien'
+      }
+    ]);
+  });
+
   it('should merge two services with the same structure id', (): void => {
     const structure: SchemaStructureDataInclusion = {
       adresse: '51 rue de la république',
       code_postal: '75013',
       commune: 'Paris',
       date_maj: '2022-11-07',
-      id: 'structure-1',
+      id: '1',
       nom: 'Médiation république',
-      siret: '43493312300029'
+      siret: '43493312300029',
+      source: 'Hubik'
     };
 
     const service1: SchemaServiceDataInclusion = {
       id: 'structure-1-mediation-numerique',
       nom: 'Médiation numérique',
       source: 'Hubik',
-      structure_id: 'structure-1',
+      structure_id: '1',
       thematiques: ['numerique--devenir-autonome-dans-les-demarches-administratives']
     };
 
     const service2: SchemaServiceDataInclusion = {
       id: 'structure-1-mediation-numerique',
       nom: 'Médiation numérique',
       source: 'Hubik',
-      structure_id: 'structure-1',
+      structure_id: '1',
       thematiques: ['numerique--prendre-en-main-un-smartphone-ou-une-tablette']
     };
 
@@ -240,7 +325,7 @@ describe('merge services in structure', (): void => {
         commune: 'Paris',
         adresse: '51 rue de la république',
         date_maj: '2022-11-07T00:00:00.000Z',
-        id: 'structure-1',
+        id: 'Hubik-1',
         nom: 'Médiation république',
         pivot: '43493312300029',
         source: 'Hubik',
@@ -258,11 +343,12 @@ describe('merge services in structure', (): void => {
       date_maj: '2022-11-07',
       id: 'structure-1',
       nom: 'Médiation république',
-      siret: '43493312300029'
+      siret: '43493312300029',
+      source: 'Hubik'
     };
 
     const service1: SchemaServiceDataInclusion = {
-      id: 'structure-1-mediation-numerique',
+      id: 'service-1',
       nom: 'Médiation numérique',
       source: 'Hubik',
       structure_id: 'structure-1',
@@ -272,7 +358,7 @@ describe('merge services in structure', (): void => {
     const service2: Partial<SchemaStructureDataInclusionAdresseFields> &
       SchemaServiceDataInclusion &
       SchemaStructureDataInclusionLocalisationFields = {
-      id: 'structure-1-mediation-numerique',
+      id: 'service-2',
       nom: 'Médiation numérique',
       source: 'Hubik',
       structure_id: 'structure-1',
@@ -292,7 +378,7 @@ describe('merge services in structure', (): void => {
         commune: 'Paris',
         adresse: '51 rue de la république',
         date_maj: '2022-11-07T00:00:00.000Z',
-        id: 'structure-1',
+        id: 'Hubik-structure-1',
         nom: 'Médiation république',
         pivot: '43493312300029',
         source: 'Hubik',
@@ -305,7 +391,7 @@ describe('merge services in structure', (): void => {
         latitude: 4.8375548,
         longitude: 45.7665478,
         date_maj: '2022-11-07T00:00:00.000Z',
-        id: 'structure-1-mediation-numerique',
+        id: 'Hubik-service-2',
         nom: 'Médiation numérique',
         pivot: '43493312300029',
         source: 'Hubik',

diff --git a/src/data-inclusion/merge-services-in-structure.ts b/src/data-inclusion/merge-services-in-structure.ts
@@ -21,7 +21,7 @@ const onlyWithNumeriqueServices = (service: SchemaServiceDataInclusion): boolean
 const matchingService =
   (service: SchemaServiceDataInclusion) =>
   (structure: SchemaStructureDataInclusion): boolean =>
-    structure.id === service.structure_id;
+    structure.id === service.structure_id && structure.source === service.source;
 
 const toDataInclusionMerged = (dataInclusionStructureAndServices: DataInclusionStructureAndServices): DataInclusionMerged =>
   mergeStructureAndService(
@@ -32,7 +32,8 @@ const toDataInclusionMerged = (dataInclusionStructureAndServices: DataInclusionS
 const onlyWithSameIdAs =
   (structure?: SchemaStructureDataInclusion) =>
   (dataInclusionStructureAndServices: DataInclusionStructureAndServices): boolean =>
-    dataInclusionStructureAndServices.structure.id === structure?.id;
+    dataInclusionStructureAndServices.structure.id === structure?.id &&
+    dataInclusionStructureAndServices.structure.source === structure.source;
 
 const toDataInclusionStructuresWithNewService =
   (service: SchemaServiceDataInclusion, structure: SchemaStructureDataInclusion) =>