Merge branch 'backend-api' of ssh://gitea.piair.dev:2222/piair/MyINPulse into backend-api

MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java

@@ -11,6 +11,12 @@ import java.util.List;
 @Table(name = "project")
 public class Project {
 
+    @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Entrepreneur> listEntrepreneurParticipation = new ArrayList<>();
+
+    @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<SectionCell> listSectionCell = new ArrayList<>();
+
     @Id
     @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -20,7 +26,6 @@ public class Project {
     private String projectName;
 
     private byte[] logo;
-
     private LocalDate creationDate;
 
     @Column(length = 255)
@@ -30,15 +35,9 @@ public class Project {
     @JoinColumn(name = "idAdministrator")
     private Administrator projectAdministrator;
 
-    @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
-    private List<Entrepreneur> listEntrepreneurParticipation = new ArrayList<>();
-
     @OneToOne(mappedBy = "projectProposed", fetch = FetchType.LAZY, orphanRemoval = true)
     private Entrepreneur entrepreneurProposed;
 
-    @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
-    private List<SectionCell> listSectionCell = new ArrayList<>();
-
     public Project() {}
 
     public Project(
@@ -93,4 +92,8 @@ public class Project {
     public void setProjectStatus(String projectStatus) {
         this.projectStatus = projectStatus;
     }
+
+    public void setAdministrator(Administrator administrator) {
+        this.projectAdministrator = administrator;
+    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/ProjectDecision.java

@@ -1,7 +1,7 @@
 package enseirb.myinpulse.model;
 
 public class ProjectDecision {
-    int projectId;
-    int adminId;
-    int isAccepted;
+    public long projectId;
+    public long adminId;
+    public long isAccepted;
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java

@@ -20,7 +20,7 @@ public class User {
     private String userName;
 
     @Column(length = 255)
-    private String mainMail;
+    private String primaryMail;
 
     @Column(length = 255)
     private String secondaryMail;
@@ -34,13 +34,13 @@ public class User {
             Long idUser,
             String userSurname,
             String userName,
-            String mainMail,
+            String primaryMail,
             String secondaryMail,
             String phoneNumber) {
         this.idUser = idUser;
         this.userSurname = userSurname;
         this.userName = userName;
-        this.mainMail = mainMail;
+        this.primaryMail = primaryMail;
         this.secondaryMail = secondaryMail;
         this.phoneNumber = phoneNumber;
     }
@@ -69,12 +69,12 @@ public class User {
         userName = userName;
     }
 
-    public String getMainMail() {
-        return mainMail;
+    public String getPrimaryMail() {
+        return primaryMail;
     }
 
-    public void setMainMail(String mainMail) {
-        this.mainMail = mainMail;
+    public void setPrimaryMail(String mainMail) {
+        this.primaryMail = mainMail;
     }
 
     public String getSecondaryMail() {