merge

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

@@ -26,8 +26,7 @@ public class Project {
     private byte[] logo;
     private LocalDate creationDate;
 
-    @Column(length = 255)
-    private String projectStatus;
+    @Column private ProjectDecisionValue projectStatus;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "idAdministrator")
@@ -42,11 +41,12 @@ public class Project {
             String projectName,
             byte[] logo,
             LocalDate creationDate,
-            String projectStatus,
+            ProjectDecisionValue projectStatus,
             Administrator projectAdministrator) {
         this.projectName = projectName;
         this.logo = logo;
         this.creationDate = creationDate;
+        // this.projectStatus = (long) projectStatus.ordinal();
         this.projectStatus = projectStatus;
         this.projectAdministrator = projectAdministrator;
     }
@@ -83,11 +83,11 @@ public class Project {
         this.creationDate = creationDate;
     }
 
-    public String getProjectStatus() {
+    public ProjectDecisionValue getProjectStatus() {
         return projectStatus;
     }
 
-    public void setProjectStatus(String projectStatus) {
+    public void setProjectStatus(ProjectDecisionValue projectStatus) {
         this.projectStatus = projectStatus;
     }
 

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

@@ -4,4 +4,22 @@ public class ProjectDecision {
     public long projectId;
     public long adminId;
     public long isAccepted;
+
+    public ProjectDecision(long projectId, long adminId, long isAccepted) {
+        this.projectId = projectId;
+        this.adminId = adminId;
+        this.isAccepted = isAccepted;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectDecision{"
+                + "projectId="
+                + projectId
+                + ", adminId="
+                + adminId
+                + ", isAccepted="
+                + isAccepted
+                + '}';
+    }
 }

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.model;
+
+public enum ProjectDecisionValue {
+    PENDING,
+    ACTIVE,
+    ENDED,
+    ABORTED,
+    REJECTED,
+}