fix(backend): fix subscribers

SocialGouv · Nov 26, 2024 · baafd6d · baafd6d
1 parent e1f93b3
commit baafd6d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/packages/backend/src/database/entities/structure/StructureSubscriber.typeorm.ts b/packages/backend/src/database/entities/structure/StructureSubscriber.typeorm.ts
@@ -14,10 +14,18 @@ export class StructureSubscriber
     return StructureTable;
   }
   public lowerAndTrim(entity: StructureTable) {
-    entity.email = entity.email.toLowerCase().trim();
-    entity.adresse = entity.adresse.trim();
-    entity.nom = entity.nom.trim();
-    entity.ville = entity.ville.trim();
+    if (entity?.email) {
+      entity.email = entity?.email.toLowerCase().trim();
+    }
+    if (entity?.adresse) {
+      entity.adresse = entity?.adresse.trim();
+    }
+    if (entity?.nom) {
+      entity.nom = entity?.nom.trim();
+    }
+    if (entity?.ville) {
+      entity.ville = entity?.ville.trim();
+    }
   }
 
   beforeInsert(event: InsertEvent<StructureTable>) {

diff --git a/packages/backend/src/database/entities/usager/UsagerSubscriber.typeorm.ts b/packages/backend/src/database/entities/usager/UsagerSubscriber.typeorm.ts
@@ -21,17 +21,19 @@ export class UsagerSubscriber
     }
 
     try {
-      entity.nom = entity.nom.trim();
-      entity.prenom = entity.prenom.trim();
+      if (entity?.nom && entity?.prenom) {
+        entity.nom = entity.nom.trim();
+        entity.prenom = entity.prenom.trim();
 
-      const parts = [
-        entity.nom,
-        entity.prenom,
-        entity.surnom,
-        entity?.customRef ?? entity?.ref,
-      ].filter(Boolean);
+        const parts = [
+          entity.nom,
+          entity.prenom,
+          entity.surnom,
+          entity?.customRef ?? entity?.ref,
+        ].filter(Boolean);
 
-      entity.nom_prenom_surnom_ref = normalizeString(parts.join(" "));
+        entity.nom_prenom_surnom_ref = normalizeString(parts.join(" "));
+      }
     } catch (error) {
       console.error("Erreur lors du traitement du nom:", error);
     }

diff --git a/packages/backend/src/database/entities/user-structure/UserStructureSubscriber.typeorm.ts b/packages/backend/src/database/entities/user-structure/UserStructureSubscriber.typeorm.ts
@@ -14,9 +14,15 @@ export class StructureSubscriber
     return UserStructureTable;
   }
   public lowerAndTrim(entity: UserStructureTable) {
-    entity.email = entity.email.toLowerCase().trim();
-    entity.nom = entity.nom.trim();
-    entity.prenom = entity.prenom.trim();
+    if (entity?.email) {
+      entity.email = entity.email.toLowerCase().trim();
+    }
+    if (entity?.nom) {
+      entity.nom = entity.nom.trim();
+    }
+    if (entity?.prenom) {
+      entity.prenom = entity.prenom.trim();
+    }
   }
 
   beforeInsert(event: InsertEvent<UserStructureTable>) {