diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java index fcb4cdb..3b1ee7a 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java @@ -34,9 +34,9 @@ public class Administrator extends User { public Administrator( String userSurname, String username, - String mainMail, + String primaryMail, String secondaryMail, String phoneNumber) { - super(null, userSurname, username, mainMail, secondaryMail, phoneNumber); + super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java index d85c99d..7eb64d5 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java @@ -40,13 +40,13 @@ public class Entrepreneur extends User { Long idUser, String userSurname, String username, - String mainMail, + String primaryMail, String secondaryMail, String phoneNumber, String school, String course, boolean sneeStatus) { - super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber); + super(idUser, userSurname, username, primaryMail, secondaryMail, phoneNumber); this.school = school; this.course = course; this.sneeStatus = sneeStatus; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java index 38392c0..ac1c5df 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java @@ -39,16 +39,16 @@ public class Project { public Project() {} public Project( - Long idProject, String projectName, byte[] logo, LocalDate creationDate, - String projectStatus) { - this.idProject = idProject; + String projectStatus, + Administrator projectAdministrator) { this.projectName = projectName; this.logo = logo; this.creationDate = creationDate; this.projectStatus = projectStatus; + this.projectAdministrator = projectAdministrator; } public Long getIdProject() { diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java index 8dbe4e8..4d7f32f 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java @@ -71,8 +71,8 @@ public class User { return primaryMail; } - public void setPrimaryMail(String mainMail) { - this.primaryMail = mainMail; + public void setPrimaryMail(String primaryMail) { + this.primaryMail = primaryMail; } public String getSecondaryMail() {