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 d90e3aa..fcb4cdb 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Administrator.java @@ -13,14 +13,14 @@ import java.util.List; public class Administrator extends User { @OneToMany(mappedBy = "projectAdministrator", fetch = FetchType.LAZY, orphanRemoval = true) - private List listProject = new ArrayList<>(); + private final List listProject = new ArrayList<>(); /*@OneToMany(mappedBy = "administratorSectionCell", fetch = FetchType.LAZY, orphanRemoval = true) private List listSectionCell = new ArrayList<>();*/ // should now be useless @OneToMany(mappedBy = "administratorAnnotation", fetch = FetchType.LAZY, orphanRemoval = true) - private List listAnnotation = new ArrayList<>(); + private final List listAnnotation = new ArrayList<>(); /*@OneToMany(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true) private final List listAppointment = new ArrayList<>();*/ @@ -32,12 +32,11 @@ public class Administrator extends User { public Administrator() {} public Administrator( - Long idUser, String userSurname, String username, String mainMail, String secondaryMail, String phoneNumber) { - super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber); + super(null, userSurname, username, mainMail, secondaryMail, phoneNumber); } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java index fa73e0d..a7ba0d8 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Annotation.java @@ -1,14 +1,12 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; @Entity @Table(name = "annotation") public class Annotation { @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idAnnotation; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java index 67c0fd9..1540e39 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java @@ -1,7 +1,6 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.time.LocalTime; @@ -17,9 +16,6 @@ public class Appointment { new ArrayList<>(); */ // should now be useless - @OneToOne(mappedBy = "appointmentReport", fetch = FetchType.LAZY, orphanRemoval = true) - private Report report; - @ManyToMany( fetch = FetchType.LAZY, cascade = {CascadeType.ALL}) @@ -28,9 +24,9 @@ public class Appointment { joinColumns = @JoinColumn(name = "idAppointment"), inverseJoinColumns = @JoinColumn(name = "idSectionCell")) List listSectionCell = new ArrayList<>(); - + @OneToOne(mappedBy = "appointmentReport", fetch = FetchType.LAZY, orphanRemoval = true) + private Report report; @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idAppointment; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java index 91c97d5..aae4f18 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/MakeAppointment.java @@ -1,14 +1,12 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; @Entity @Table(name = "make_appointment") public class MakeAppointment { @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idMakeAppointment; 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 070efc6..38392c0 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java @@ -1,7 +1,6 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.util.ArrayList; @@ -18,7 +17,6 @@ public class Project { private final List listSectionCell = new ArrayList<>(); @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idProject; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java index 5ff5e82..055b134 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java @@ -4,14 +4,12 @@ import jakarta.persistence.*; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; @Entity @Table(name = "report") public class Report { @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idReport; diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java index d77faf6..0fb8c89 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/SectionCell.java @@ -1,7 +1,6 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; import java.util.ArrayList; @@ -18,7 +17,6 @@ public class SectionCell { private final List listAnnotation = new ArrayList<>(); @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idSectionCell; 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 c23b285..8dbe4e8 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java @@ -1,7 +1,6 @@ package enseirb.myinpulse.model; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; @Entity @Table(name = "user_inpulse") @@ -9,7 +8,6 @@ import jakarta.validation.constraints.NotNull; public class User { @Id - @NotNull @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idUser;