From ef964c4d35963c3843bbcf350af8565aad089af3 Mon Sep 17 00:00:00 2001
From: Pierre Tellier <piair338@gmail.com>
Date: Tue, 11 Mar 2025 13:02:17 +0100
Subject: [PATCH] fix: removed id + renamed mainEmail to primaryEmail
 everywhere

---
 .../service/database/AdministratorService.java        | 11 +++++++++++
 .../myinpulse/service/database/UserService.java       |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java
index 0f595a0..b3d91bc 100644
--- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java
+++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java
@@ -37,6 +37,17 @@ public class AdministratorService {
         return administrator.get();
     }
 
+    public Administrator getAdministratorByPrimaryMain(String primaryMail) {
+        Optional<Administrator> administrator =
+                this.administratorRepository.findByPrimaryMail(primaryMail);
+        if (administrator.isEmpty()) {
+            logger.error("No administrator found with the mail {}", primaryMail);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
+        }
+        return administrator.get();
+    }
+
     public Administrator addAdministrator(Administrator administrator) {
         return this.administratorRepository.save(administrator);
     }
diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java
index cf24fa3..45a4eac 100644
--- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java
+++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java
@@ -53,7 +53,7 @@ public class UserService {
             @PathVariable Long id,
             String userSurname,
             String userName,
-            String mainMail,
+            String primaryMail,
             String secondaryMail,
             String phoneNumber) {
         Optional<User> user = userRepository.findById(id);
@@ -67,8 +67,8 @@ public class UserService {
         if (userSurname != null) {
             user.get().setUserSurname(userSurname);
         }
-        if (mainMail != null) {
-            user.get().setPrimaryMail(mainMail);
+        if (primaryMail != null) {
+            user.get().setPrimaryMail(primaryMail);
         }
         if (secondaryMail != null) {
             user.get().setSecondaryMail(secondaryMail);