From 1ff51f6b42e105288ead1f395f0b49028f9350b0 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Wed, 22 Feb 2023 13:10:59 +0000
Subject: [PATCH] fix: mediation display uppercase

---
 src/mailer/mail-templates/sosTechEmail.ejs      | 2 +-
 src/online-mediation/dto/onlineMediation.dto.ts | 2 +-
 src/online-mediation/onlineMediation.service.ts | 1 +
 src/users/services/users.service.ts             | 8 +++++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/mailer/mail-templates/sosTechEmail.ejs b/src/mailer/mail-templates/sosTechEmail.ejs
index 512c3ceaa..52efb5047 100644
--- a/src/mailer/mail-templates/sosTechEmail.ejs
+++ b/src/mailer/mail-templates/sosTechEmail.ejs
@@ -7,8 +7,8 @@ Veuillez trouver ci-joint la liste des demandes d'aide en ligne du jour :
 <table style="border: solid 1px">
   <thead>
     <tr>
-      <th style="padding: 8px">Nom</th>
       <th style="padding: 8px">Prénom</th>
+      <th style="padding: 8px">Nom</th>
       <th style="padding: 8px">Téléphone</th>
       <th style="padding: 8px">Besoin(s)</th>
       <th style="padding: 8px">Créneau</th>
diff --git a/src/online-mediation/dto/onlineMediation.dto.ts b/src/online-mediation/dto/onlineMediation.dto.ts
index 240bda361..a86c74475 100644
--- a/src/online-mediation/dto/onlineMediation.dto.ts
+++ b/src/online-mediation/dto/onlineMediation.dto.ts
@@ -8,7 +8,7 @@ export class OnlineMediationDto {
 
   @IsNotEmpty()
   @ApiProperty({ type: String })
-  readonly surname: string;
+  surname: string;
 
   @IsNotEmpty()
   @ApiProperty({ type: String })
diff --git a/src/online-mediation/onlineMediation.service.ts b/src/online-mediation/onlineMediation.service.ts
index f0fc5a8f8..8341c348d 100644
--- a/src/online-mediation/onlineMediation.service.ts
+++ b/src/online-mediation/onlineMediation.service.ts
@@ -24,6 +24,7 @@ export class OnlineMediationService {
    */
   public async create(newMediation: OnlineMediationDto): Promise<IOnlineMediation> {
     try {
+      newMediation.surname = newMediation.surname.toUpperCase();
       return await this.OnlineMediationModel.create(newMediation);
     } catch (err) {
       this.logger.error(`Creation Error : ${err}`);
diff --git a/src/users/services/users.service.ts b/src/users/services/users.service.ts
index 2f43e6543..08a2ebfa2 100644
--- a/src/users/services/users.service.ts
+++ b/src/users/services/users.service.ts
@@ -53,7 +53,13 @@ export class UsersService {
       );
     }
     let createUser = new this.userModel(createUserDto);
-    createUser.structuresLink = createUser.structuresLink.map((id) => new Types.ObjectId(id));
+    createUser.surname = createUser.surname.toUpperCase();
+    createUser.structuresLink = [];
+    if (createUserDto.structuresLink) {
+      createUserDto.structuresLink.forEach((structureId) => {
+        createUser.structuresLink.push(new Types.ObjectId(structureId));
+      });
+    }
     createUser.password = await this.hashPassword(createUser.password);
     createUser.unattachedSince = DateTime.local();
     // Send verification email
-- 
GitLab