backend-api #6

Merged
piair merged 107 commits from backend-api into main 2025-03-26 19:04:09 +01:00
2 changed files with 14 additions and 3 deletions
Showing only changes of commit ef964c4d35 - Show all commits

View File

@ -37,6 +37,17 @@ public class AdministratorService {
return administrator.get(); 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) { public Administrator addAdministrator(Administrator administrator) {
return this.administratorRepository.save(administrator); return this.administratorRepository.save(administrator);
} }

View File

@ -53,7 +53,7 @@ public class UserService {
@PathVariable Long id, @PathVariable Long id,
String userSurname, String userSurname,
String userName, String userName,
String mainMail, String primaryMail,
String secondaryMail, String secondaryMail,
String phoneNumber) { String phoneNumber) {
Optional<User> user = userRepository.findById(id); Optional<User> user = userRepository.findById(id);
@ -67,8 +67,8 @@ public class UserService {
if (userSurname != null) { if (userSurname != null) {
user.get().setUserSurname(userSurname); user.get().setUserSurname(userSurname);
} }
if (mainMail != null) { if (primaryMail != null) {
user.get().setPrimaryMail(mainMail); user.get().setPrimaryMail(primaryMail);
} }
if (secondaryMail != null) { if (secondaryMail != null) {
user.get().setSecondaryMail(secondaryMail); user.get().setSecondaryMail(secondaryMail);