fix: removed id + renamed mainEmail to primaryEmail everywhere
This commit is contained in:
parent
a2e2395cc2
commit
467babab79
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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() {
|
||||
|
@ -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() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user