From 2f7126104acd54c296db1f7b1671e21953e700a3 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 12 May 2021 11:05:28 +0200
Subject: [PATCH] fix: use id instead of name on formated structure.

---
 .../categoriesAccompagnement.schema.ts        |  3 +++
 .../schemas/categoriesFormations.schema.ts    |  3 +++
 .../schemas/categoriesOthers.schema.ts        |  3 +++
 src/structures/services/structures.service.ts | 22 +++++++++----------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/categories/schemas/categoriesAccompagnement.schema.ts b/src/categories/schemas/categoriesAccompagnement.schema.ts
index 162073ab3..6e3bd1c26 100644
--- a/src/categories/schemas/categoriesAccompagnement.schema.ts
+++ b/src/categories/schemas/categoriesAccompagnement.schema.ts
@@ -11,6 +11,9 @@ export class CategoriesAccompagnement {
 
   @Prop()
   modules: CategoriesModule[];
+
+  @Prop()
+  id: string;
 }
 
 export const CategoriesAccompagnementSchema = SchemaFactory.createForClass(CategoriesAccompagnement);
diff --git a/src/categories/schemas/categoriesFormations.schema.ts b/src/categories/schemas/categoriesFormations.schema.ts
index 0ef918dcf..cb1819041 100644
--- a/src/categories/schemas/categoriesFormations.schema.ts
+++ b/src/categories/schemas/categoriesFormations.schema.ts
@@ -11,6 +11,9 @@ export class CategoriesFormations {
 
   @Prop()
   modules: CategoriesFormationsModule[];
+
+  @Prop()
+  id: string;
 }
 
 export const CategoriesFormationsSchema = SchemaFactory.createForClass(CategoriesFormations);
diff --git a/src/categories/schemas/categoriesOthers.schema.ts b/src/categories/schemas/categoriesOthers.schema.ts
index 239706b0d..688a31d5b 100644
--- a/src/categories/schemas/categoriesOthers.schema.ts
+++ b/src/categories/schemas/categoriesOthers.schema.ts
@@ -11,6 +11,9 @@ export class CategoriesOthers {
 
   @Prop()
   modules: CategoriesModule[];
+
+  @Prop()
+  id: string;
 }
 
 export const CategoriesOthersSchema = SchemaFactory.createForClass(CategoriesOthers);
diff --git a/src/structures/services/structures.service.ts b/src/structures/services/structures.service.ts
index aec2207c6..8e582acc9 100644
--- a/src/structures/services/structures.service.ts
+++ b/src/structures/services/structures.service.ts
@@ -193,47 +193,47 @@ export class StructuresService {
     ).map((structure) => {
       structure.proceduresAccompaniment = this.mapModules(
         structure.proceduresAccompaniment,
-        accompagnementCategories.find((category) => category.name === 'Accompagnement des démarches').modules
+        accompagnementCategories.find((category) => category.id === 'proceduresAccompaniment').modules
       );
       structure.labelsQualifications = this.mapModules(
         structure.labelsQualifications,
-        otherCategories.find((category) => category.name === 'Labels et qualifications').modules
+        otherCategories.find((category) => category.id === 'labelsQualifications').modules
       );
       structure.publics = this.mapModules(
         structure.publics,
-        otherCategories.find((category) => category.name === 'Publics acceptés').modules
+        otherCategories.find((category) => category.id === 'publics').modules
       );
       structure.accessModality = this.mapModules(
         structure.accessModality,
-        otherCategories.find((category) => category.name === "Modalités d'accès").modules
+        otherCategories.find((category) => category.id === 'accessModality').modules
       );
       structure.publicsAccompaniment = this.mapModules(
         structure.publicsAccompaniment,
-        otherCategories.find((category) => category.name === 'Accompagnement des publics spécifique').modules
+        otherCategories.find((category) => category.id === 'publicsAccompaniment').modules
       );
       structure.equipmentsAndServices = this.mapModules(
         structure.equipmentsAndServices,
-        otherCategories.find((category) => category.name === 'Équipements et services proposés').modules
+        otherCategories.find((category) => category.id === 'equipmentsAndServices').modules
       );
       structure.baseSkills = this.mapFormationModules(
         structure.baseSkills,
-        formationCategories.find((category) => category.name === 'Les compétences de base').modules
+        formationCategories.find((category) => category.id === 'baseSkills').modules
       );
       structure.accessRight = this.mapFormationModules(
         structure.accessRight,
-        formationCategories.find((category) => category.name === 'Accès aux droits').modules
+        formationCategories.find((category) => category.id === 'accessRight').modules
       );
       structure.socialAndProfessional = this.mapFormationModules(
         structure.socialAndProfessional,
-        formationCategories.find((category) => category.name === 'Insertion sociale et professionnelle').modules
+        formationCategories.find((category) => category.id === 'socialAndProfessional').modules
       );
       structure.parentingHelp = this.mapFormationModules(
         structure.parentingHelp,
-        formationCategories.find((category) => category.name === 'Aide à la parentalité').modules
+        formationCategories.find((category) => category.id === 'parentingHelp').modules
       );
       structure.digitalCultureSecurity = this.mapFormationModules(
         structure.digitalCultureSecurity,
-        formationCategories.find((category) => category.name === 'Culture et sécurité numérique').modules
+        formationCategories.find((category) => category.id === 'digitalCultureSecurity').modules
       );
       return structure;
     });
-- 
GitLab