backend-api #6
.gitea/workflows
.gitignoreMakefileMyINPulse-back
build.gradle
src
main
java
enseirb
myinpulse
MyinpulseApplication.java
api
config
controller
exception
model
Administrator.javaAnnotation.javaAppointment.javaEntrepreneur.javaMakeAppointment.javaProject.javaProjectDecision.javaReport.javaRoleRepresentation.javaSectionCell.javaUser.javaUserRepresentation.java
repository
AdministratorRepository.javaAnnotationRepository.javaAppointmentRepository.javaEntrepreneurRepository.javaMakeAppointmentRepository.javaProjectRepository.javaReportRepository.javaSectionCellRepository.javaUserRepository.java
security
service
resources
test
java
enseirb
resources
config
backdev.docker-compose.yamlbackdev.envbackdev.front.envbackdev.main.envdev.docker-compose.yamldev.envfrontdev.docker-compose.yamlfrontdev.envfrontdev.front.envfrontdev.main.envprod.docker-compose.yamlprod.envprod.front.envprod.main.env
front/MyINPulse-front/src
hooks
postgres
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user