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 = + 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 = 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);