Merge branch 'main' into fix_cache

Reviewed-on: #7

Makefile

@@ -19,8 +19,14 @@ front/MyINPulse-front/.installed:
 
 vite: ./front/MyINPulse-front/.installed
 
+keycloak: ./keycloak/.installed
 
-dev-front: clean vite
+keycloak/.installed:
+	@echo "running one time install"
+	@cd keycloak/CAS && sudo sh build.sh
+	@touch ./keycloak/.installed
+
+dev-front: clean vite keycloak
 	@cp config/frontdev.env front/MyINPulse-front/.env
 	@cp config/frontdev.env .env
 	@cp config/frontdev.env MyINPulse-back/.env
@@ -28,7 +34,7 @@ dev-front: clean vite
 	@docker compose up -d --build
 	@cd ./front/MyINPulse-front/ && npm run dev
 
-prod: clean
+prod: clean keycloak
 	@cp config/prod.env front/MyINPulse-front/.env
 	@cp config/prod.env .env
 	@cp config/prod.env .env
@@ -37,7 +43,7 @@ prod: clean
 
 
 
-dev-back:
+dev-back: keycloak
 	@cp config/backdev.env front/MyINPulse-front/.env
 	@cp config/backdev.env .env
 	@cp config/backdev.env MyINPulse-back/.env
@@ -46,7 +52,7 @@ dev-back:
 	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
 	@echo "./gradlew bootRun --args='--server.port=8081'"
 	
-dev: clean vite
+dev: clean vite keycloak
 	@cp config/dev.env front/MyINPulse-front/.env
 	@cp config/dev.env .env
 	@cp config/dev.env MyINPulse-back/.env
@@ -55,3 +61,13 @@ dev: clean vite
 	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
 	@echo "./gradlew bootRun --args='--server.port=8081'"
 	@cd ./front/MyINPulse-front/ && npm run dev &
+
+test-back: clean keycloak
+	@cp config/dev.env front/MyINPulse-front/.env
+	@cp config/dev.env .env
+	@cp config/dev.env MyINPulse-back/.env
+	@cp config/dev.docker-compose.yaml docker-compose.yaml
+	@docker compose up -d --build
+	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
+	@cd ./MyINPulse-back/ && ./gradlew test && ./gradlew jacocoTestReport
+	@firefox ./MyINPulse-back/build/jacocoHtml/index.html

MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java

@@ -1,6 +1,7 @@
 package enseirb.myinpulse.controller;
 
 import com.itextpdf.text.DocumentException;
+
 import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.SharedApiService;
 
@@ -10,7 +11,8 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URISyntaxException;
 
 @SpringBootApplication
 @RestController
@@ -83,10 +85,12 @@ public class SharedApi {
             @PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
         try {
             sharedApiService.getPDFReport(appointmentId, principal.getClaimAsString("email"));
-        } catch (FileNotFoundException e) {
-            System.out.println(e + "File not found");
         } catch (DocumentException e) {
             System.out.println(e + "Document exception");
+        } catch (URISyntaxException e) {
+            System.out.println(e + "Error with URI");
+        } catch (IOException e) {
+            System.out.println(e + "Failed to access file");
         }
     }
 

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

@@ -37,7 +37,6 @@ public class Entrepreneur extends User {
     public Entrepreneur() {}
 
     public Entrepreneur(
-            Long idUser,
             String userSurname,
             String username,
             String primaryMail,
@@ -46,7 +45,7 @@ public class Entrepreneur extends User {
             String school,
             String course,
             boolean sneeStatus) {
-        super(idUser, userSurname, username, primaryMail, secondaryMail, phoneNumber);
+        super(userSurname, username, primaryMail, secondaryMail, phoneNumber);
         this.school = school;
         this.course = course;
         this.sneeStatus = sneeStatus;

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

@@ -28,6 +28,8 @@ public class User {
 
     public User() {}
 
+    // TODO: this should be removed as we shouldn't be able to chose the ID. Leaving it for
+    // compatibility purposes, as soon as it's not used anymore, delete it
     public User(
             Long idUser,
             String userSurname,
@@ -43,6 +45,19 @@ public class User {
         this.phoneNumber = phoneNumber;
     }
 
+    public User(
+            String userSurname,
+            String userName,
+            String primaryMail,
+            String secondaryMail,
+            String phoneNumber) {
+        this.userSurname = userSurname;
+        this.userName = userName;
+        this.primaryMail = primaryMail;
+        this.secondaryMail = secondaryMail;
+        this.phoneNumber = phoneNumber;
+    }
+
     public Long getIdUser() {
         return idUser;
     }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java

@@ -4,11 +4,7 @@ import static enseirb.myinpulse.model.ProjectDecisionValue.ACTIVE;
 import static enseirb.myinpulse.model.ProjectDecisionValue.REJECTED;
 
 import enseirb.myinpulse.model.*;
-import enseirb.myinpulse.service.database.AdministratorService;
+import enseirb.myinpulse.service.database.*;
-import enseirb.myinpulse.service.database.AppointmentService;
-import enseirb.myinpulse.service.database.ProjectService;
-import enseirb.myinpulse.service.database.ReportService;
-import enseirb.myinpulse.service.database.UserService;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -17,6 +13,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class AdminApiService {
 
@@ -28,6 +27,7 @@ public class AdminApiService {
     private final UtilsService utilsService;
     private final AppointmentService appointmentService;
     private final ReportService reportService;
+    private final SectionCellService sectionCellService;
 
     @Autowired
     AdminApiService(
@@ -36,13 +36,15 @@ public class AdminApiService {
             AdministratorService administratorService,
             UtilsService utilsService,
             AppointmentService appointmentService,
-            ReportService reportService) {
+            ReportService reportService,
+            SectionCellService sectionCellService) {
         this.projectService = projectService;
         this.userService = userService;
         this.administratorService = administratorService;
         this.utilsService = utilsService;
         this.appointmentService = appointmentService;
         this.reportService = reportService;
+        this.sectionCellService = sectionCellService;
     }
 
     // TODO: check if tests are sufficient - peer verification required
@@ -52,10 +54,36 @@ public class AdminApiService {
                         this.userService.getUserByEmail(mail).getIdUser()));
     }
 
-    // TODO
     public Iterable<Appointment> getUpcomingAppointments(String mail) {
         logger.info("User {} check their upcoming appointments", mail);
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+        User user = this.userService.getUserByEmail(mail);
+        List<Appointment> appointments = new ArrayList<>();
+        if (user instanceof Administrator) {
+            List<Project> projects = new ArrayList<>(((Administrator) user).getListProject());
+            projects.forEach(
+                    project -> {
+                        project.getListSectionCell()
+                                .forEach(
+                                        sectionCell -> {
+                                            appointments.addAll(
+                                                    this.sectionCellService
+                                                            .getAppointmentsBySectionCellId(
+                                                                    sectionCell
+                                                                            .getIdSectionCell()));
+                                        });
+                    });
+        }
+        if (user instanceof Entrepreneur) {
+            Project project = ((Entrepreneur) user).getProjectParticipation();
+            project.getListSectionCell()
+                    .forEach(
+                            sectionCell -> {
+                                appointments.addAll(
+                                        this.sectionCellService.getAppointmentsBySectionCellId(
+                                                sectionCell.getIdSectionCell()));
+                            });
+        }
+        return appointments;
     }
 
     // TODO: check if tests are sufficient - peer verification required
@@ -91,7 +119,9 @@ public class AdminApiService {
             newProject.getProjectAdministrator().updateListProject(newProject);
         }
         if (newProject.getEntrepreneurProposed() != null) {
-            newProject.getEntrepreneurProposed().setProjectProposed(newProject);
+            Entrepreneur proposed = newProject.getEntrepreneurProposed();
+            proposed.setProjectProposed(newProject);
+            proposed.setProjectParticipation(newProject);
         }
         newProject
                 .getListEntrepreneurParticipation()

MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java

@@ -13,8 +13,14 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.FileNotFoundException;
+import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -95,7 +101,6 @@ public class SharedApiService {
         return project.getProjectAdministrator();
     }
 
-    // TODO
     public Iterable<Appointment> getAppointmentsByProjectId(long projectId, String mail) {
         if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
             logger.warn(
@@ -123,9 +128,8 @@ public class SharedApiService {
         return appointments;
     }
 
-    //
     public void getPDFReport(long appointmentId, String mail)
-            throws FileNotFoundException, DocumentException {
+            throws DocumentException, URISyntaxException, IOException {
         long projectId =
                 this.appointmentService
                         .getAppointmentById(appointmentId)
@@ -202,9 +206,24 @@ public class SharedApiService {
         document.add(new Paragraph("\n"));
 
         document.close();
+
+        // Replace uri with website address
+        Files.copy(
+                new URI(
+                                "http://localhost:8080/shared/projects/appointments/report/"
+                                        + appointmentId)
+                        .toURL()
+                        .openStream(),
+                Paths.get("Report" + appointmentId + ".pdf"),
+                StandardCopyOption.REPLACE_EXISTING);
+
+        // delete file, we don't want to stock all reports on the server
+        File file = new File("Report" + appointmentId + ".pdf");
+        if (!file.delete()) {
+            logger.warn("Failed to delete report {}", file.getAbsolutePath());
+        }
     }
 
-    // TODO
     public void createAppointmentRequest(Appointment appointment, String mail) {
         long projectId =
                 appointment

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

@@ -5,10 +5,12 @@ import static enseirb.myinpulse.model.ProjectDecisionValue.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.model.Entrepreneur;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.model.ProjectDecision;
 import enseirb.myinpulse.service.AdminApiService;
 import enseirb.myinpulse.service.database.AdministratorService;
+import enseirb.myinpulse.service.database.EntrepreneurService;
 import enseirb.myinpulse.service.database.ProjectService;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -26,13 +28,16 @@ import java.util.List;
 @Transactional
 public class AdminApiServiceTest {
     private static long administratorid;
+    private static Administrator administrator;
+    private static Entrepreneur entrepreneur;
     @Autowired private AdminApiService adminApiService;
     @Autowired private ProjectService projectService;
 
     @BeforeAll
     static void setup(
             @Autowired AdministratorService administratorService,
-            @Autowired ProjectService projectService) {
+            @Autowired ProjectService projectService,
+            @Autowired EntrepreneurService entrepreneurService) {
         administratorService.addAdministrator(
                 new Administrator(
                         "admin",
@@ -40,7 +45,7 @@ public class AdminApiServiceTest {
                         "testAdminEmpty@example.com",
                         "testAdmin@example.com",
                         ""));
-        Administrator a =
+        administrator =
                 administratorService.addAdministrator(
                         new Administrator(
                                 "admin2",
@@ -48,7 +53,18 @@ public class AdminApiServiceTest {
                                 "testAdminFull@example.com",
                                 "testAdmin@example.com",
                                 ""));
-        administratorid = a.getIdUser();
+        administratorid = administrator.getIdUser();
+        entrepreneur =
+                new Entrepreneur(
+                        "JeSuisUnEntrepreneurDeCompet",
+                        "EtUé",
+                        "Entrepreneur@inpulse.com",
+                        "mail2",
+                        "phone",
+                        "Ensimag    nan jdeconne ENSEIRB (-matmeca mais on s'en fout)",
+                        "info ofc",
+                        false);
+        entrepreneurService.addEntrepreneur(entrepreneur);
         projectService.addNewProject(
                 new Project(
                         "sampleProjectAdminApiService",
@@ -161,6 +177,41 @@ public class AdminApiServiceTest {
         assertEquals(1, IterableToList(this.adminApiService.getPendingProjects()).size());
     }
 
+    @Test
+    void addProjectToAdmin() {
+        assertEquals(0, administrator.getListProject().size());
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(1, administrator.getListProject().size());
+    }
+
+    @Test
+    void addProjectToUser() {
+        assertNull(entrepreneur.getProjectParticipation());
+        Project p1 =
+                new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(p1, entrepreneur.getProjectParticipation());
+    }
+
+    @Test
+    void addProjectWithManyUsers() {
+        Entrepreneur e1 = new Entrepreneur();
+        Entrepreneur e2 = new Entrepreneur();
+        Entrepreneur e3 = new Entrepreneur();
+        assertNull(e1.getProjectParticipation());
+        assertNull(e2.getProjectParticipation());
+        assertNull(e3.getProjectParticipation());
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
+        p1.updateListEntrepreneurParticipation(e1);
+        p1.updateListEntrepreneurParticipation(e2);
+        p1.updateListEntrepreneurParticipation(e3);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(p1, e1.getProjectParticipation());
+        assertEquals(p1, e2.getProjectParticipation());
+        assertEquals(p1, e3.getProjectParticipation());
+    }
+
     @Test
     void addDuplicateProject() {
         Project p1 =