MyINPulse-back/build.gradle

@@ -23,13 +23,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-rest'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
     implementation 'org.postgresql:postgresql'
-
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'com.h2database:h2'
-
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

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 final List<Project> listProject = new ArrayList<>();
+    private List<Project> listProject = new ArrayList<>();
 
     /*@OneToMany(mappedBy = "administratorSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
     private List<SectionCell> listSectionCell = new ArrayList<>();*/
     // should now be useless
 
     @OneToMany(mappedBy = "administratorAnnotation", fetch = FetchType.LAZY, orphanRemoval = true)
-    private final List<Annotation> listAnnotation = new ArrayList<>();
+    private List<Annotation> listAnnotation = new ArrayList<>();
 
     /*@OneToMany(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true)
     private final List<Appointment> listAppointment = new ArrayList<>();*/
@@ -32,11 +32,12 @@ public class Administrator extends User {
     public Administrator() {}
 
     public Administrator(
+            Long idUser,
             String userSurname,
             String username,
             String mainMail,
             String secondaryMail,
             String phoneNumber) {
-        super(null, userSurname, username, mainMail, secondaryMail, phoneNumber);
+        super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber);
     }
 }

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

@@ -1,12 +1,14 @@
 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;
 

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

@@ -1,6 +1,7 @@
 package enseirb.myinpulse.model;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -16,6 +17,9 @@ 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})
@@ -24,9 +28,9 @@ public class Appointment {
             joinColumns = @JoinColumn(name = "idAppointment"),
             inverseJoinColumns = @JoinColumn(name = "idSectionCell"))
     List<SectionCell> listSectionCell = new ArrayList<>();
-    @OneToOne(mappedBy = "appointmentReport", fetch = FetchType.LAZY, orphanRemoval = true)
-    private Report report;
+
     @Id
+    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idAppointment;
 

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

@@ -1,12 +1,14 @@
 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;
 

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

@@ -1,6 +1,7 @@
 package enseirb.myinpulse.model;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -17,6 +18,7 @@ public class Project {
     private final List<SectionCell> listSectionCell = new ArrayList<>();
 
     @Id
+    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idProject;
 

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

@@ -4,12 +4,14 @@ 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;
 

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

@@ -1,6 +1,7 @@
 package enseirb.myinpulse.model;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -17,6 +18,7 @@ public class SectionCell {
     private final List<Annotation> listAnnotation = new ArrayList<>();
 
     @Id
+    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idSectionCell;
 

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

@@ -1,6 +1,7 @@
 package enseirb.myinpulse.model;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "user_inpulse")
@@ -8,6 +9,7 @@ import jakarta.persistence.*;
 public class User {
 
     @Id
+    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idUser;
 

MyINPulse-back/src/main/resources/application.properties

@@ -1,6 +1,7 @@
 spring.application.name=myinpulse
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
 spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
+logging.level.org.springframework.security=DEBUG
 spring.datasource.url=jdbc:postgresql://${DATABASE_URL}/${BACKEND_DB}
 spring.datasource.username=${BACKEND_USER}
 spring.datasource.password=${BACKEND_PASSWORD}

MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java

@@ -1,51 +0,0 @@
-package enseirb.myinpulse;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import enseirb.myinpulse.model.Administrator;
-import enseirb.myinpulse.model.Project;
-import enseirb.myinpulse.service.AdminApiService;
-import enseirb.myinpulse.service.database.AdministratorService;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.server.ResponseStatusException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SpringBootTest
-@Transactional
-public class AdminApiServiceTest {
-    @Autowired private AdminApiService adminApiService;
-
-    @BeforeAll
-    static void setup(@Autowired AdministratorService administratorService) {
-        administratorService.addAdministrator(
-                new Administrator(
-                        "admin", "admin", "testAdmin@example.com", "testAdmin@example.com", ""));
-    }
-
-    @Test
-    void getProjectOfAdminIsEmpty() throws Exception {
-        Iterable<Project> projects = adminApiService.getProjectsOfAdmin("testAdmin@example.com");
-        List<Project> l = new ArrayList<>();
-        projects.forEach(l::add);
-        assertEquals(0, l.size());
-    }
-
-    @Test
-    void getProjectOfInexistantAdminFails() throws Exception {
-        String nonExistentAdminEmail = "testInexistantAdmin@example.com";
-
-        assertThrows(
-                ResponseStatusException.class,
-                () -> {
-                    adminApiService.getProjectsOfAdmin(nonExistentAdminEmail);
-                });
-    }
-}

MyINPulse-back/src/test/java/enseirb/myinpulse/MyinpulseApplicationTests.java

@@ -1,6 +1,5 @@
 package enseirb.myinpulse;
 
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -8,6 +7,5 @@ import org.springframework.boot.test.context.SpringBootTest;
 class MyinpulseApplicationTests {
 
     @Test
-    @DisplayName("contextLoad => Test if the context can load, i.e. the application can start")
     void contextLoads() {}
 }

MyINPulse-back/src/test/resources/application.properties

@@ -6,5 +6,6 @@ spring.sql.init.mode=never
 spring.application.name=myinpulse-test
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
 spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
+logging.level.org.springframework.security=DEBUG
 spring.jpa.hibernate.ddl-auto=update
-logging.pattern.console=%d{yyyy-MMM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n
+logging.pattern.console=%d{yyyy-MMM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n