fix: update doc to encompose all response codes hopefully

.gitea/workflows/build-back.yaml

@@ -27,6 +27,7 @@ jobs:
       uses: gradle/actions/setup-gradle@v4
       with:
         cache-disabled: true # Once the code has been pushed once in main, this should be reenabled. 
+
     - name: init gradle
       working-directory: ./MyINPulse-back/
       run: ./gradlew build # todo: run test, currently fail because no database is present 

.gitignore

@@ -1,7 +1,6 @@
 .env
 .idea
 keycloak/CAS/target
-keycloak/.installed
 docker-compose.yaml
 node_modules
 .vscode

Makefile

@@ -33,8 +33,6 @@ dev-front: clean vite keycloak
 	@cp config/frontdev.docker-compose.yaml docker-compose.yaml
 	@docker compose up -d --build
 	@cd ./front/MyINPulse-front/ && npm run dev
-	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
-	@echo "./gradlew bootRun --args='--server.port=8081'"
 
 prod: clean keycloak
 	@cp config/prod.env front/MyINPulse-front/.env
@@ -45,7 +43,6 @@ prod: clean keycloak
 
 
 
-
 dev-back: keycloak
 	@cp config/backdev.env front/MyINPulse-front/.env
 	@cp config/backdev.env .env

MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java

@@ -61,6 +61,8 @@ public class WebSecurityCustomConfiguration {
                                         .requestMatchers("/admin/**", "/shared/**")
                                         .access(hasRole("REALM_MyINPulse-admin"))
                                         .requestMatchers("/unauth/**")
+                                        .permitAll()
+                                        .anyRequest()
                                         .authenticated())
                 .oauth2ResourceServer(
                         oauth2 ->

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

@@ -57,7 +57,7 @@ public class AdminApi {
      *
      * @return the status code of the request
      */
-    @PostMapping("/admin/projects/pending/decision")
+    @PostMapping("/admin/projects/decision")
     public void validateProject(@RequestBody ProjectDecision decision) {
         adminApiService.validateProject(decision);
     }
@@ -67,7 +67,7 @@ public class AdminApi {
      *
      * @return the status code of the request
      */
-    @PostMapping("/admin/project")
+    @PostMapping("/admin/project/add")
     public void addNewProject(@RequestBody Project project) {
         adminApiService.addNewProject(project);
     }
@@ -79,7 +79,7 @@ public class AdminApi {
      *
      * @return the status code of the request
      */
-    @PostMapping("/admin/appointments/report/{appointmentId}")
+    @PostMapping("/admin/appoitements/report/{appointmentId}")
     public void createAppointmentReport(
             @PathVariable long appointmentId,
             @RequestBody Report report,
@@ -95,24 +95,8 @@ public class AdminApi {
      *
      * @return the status code of the request
      */
-    @DeleteMapping("/admin/projects/{projectId}")
+    @DeleteMapping("/admin/projects/remove/{projectId}")
     public void deleteProject(@PathVariable long projectId) {
         adminApiService.deleteProject(projectId);
     }
-
-    @PostMapping("/admin/make-admin/{userId}")
-    public void setAdmin(@PathVariable long userId, @AuthenticationPrincipal Jwt principal) {
-        this.adminApiService.setAdmin(userId, principal.getTokenValue());
-    }
-
-    @PostMapping("/admin/accounts/validate/{userId}")
-    public void validateEntrepreneurAcc(
-            @PathVariable long userId, @AuthenticationPrincipal Jwt principal) {
-        this.adminApiService.validateEntrepreneurAccount(userId, principal.getTokenValue());
-    }
-
-    @GetMapping("/admin/pending-accounts")
-    public Iterable<User> validateEntrepreneurAcc() {
-        return this.adminApiService.getPendingUsers();
-    }
 }

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

@@ -1,19 +1,14 @@
 package enseirb.myinpulse.controller;
 
+import enseirb.myinpulse.model.SectionCell;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.service.EntrepreneurApiService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import enseirb.myinpulse.model.Project;
-import enseirb.myinpulse.model.SectionCell;
-import enseirb.myinpulse.service.EntrepreneurApiService;
 
 @SpringBootApplication
 @RestController
@@ -33,13 +28,13 @@ public class EntrepreneurApi {
      *
      * @return status code
      */
-    @PutMapping("/entrepreneur/sectionCells/{sectionCellId}")
+    @PutMapping("/entrepreneur/lcsection/modify/{sectionId}")
     public void editSectionCell(
-            @PathVariable Long sectionCellId,
+            @PathVariable Long sectionId,
-            @RequestBody String content,
+            @RequestBody SectionCell sectionCell,
             @AuthenticationPrincipal Jwt principal) {
         entrepreneurApiService.editSectionCell(
-                sectionCellId, content, principal.getClaimAsString("email"));
+                sectionId, sectionCell, principal.getClaimAsString("email"));
     }
 
     /**
@@ -49,11 +44,10 @@ public class EntrepreneurApi {
      *
      * @return status code
      */
-    @DeleteMapping("/entrepreneur/sectionCells/{sectionCellId}")
+    @DeleteMapping("/entrepreneur/lcsection/remove/{sectionId}")
     public void removeSectionCell(
-            @PathVariable Long sectionCellId, @AuthenticationPrincipal Jwt principal) {
+            @PathVariable Long sectionId, @AuthenticationPrincipal Jwt principal) {
-        entrepreneurApiService.removeSectionCell(
+        entrepreneurApiService.removeSectionCell(sectionId, principal.getClaimAsString("email"));
-                sectionCellId, principal.getClaimAsString("email"));
     }
 
     /**
@@ -63,7 +57,7 @@ public class EntrepreneurApi {
      *
      * @return status code
      */
-    @PostMapping("/entrepreneur/sectionCells")
+    @PostMapping("/entrepreneur/lcsection/add") // remove id from doc aswell
     public void addLCSection(
             @RequestBody SectionCell sectionCell, @AuthenticationPrincipal Jwt principal) {
         entrepreneurApiService.addSectionCell(sectionCell, principal.getClaimAsString("email"));
@@ -76,7 +70,7 @@ public class EntrepreneurApi {
      *
      * @return status code
      */
-    @PostMapping("/entrepreneur/projects/request")
+    @PostMapping("/entrepreneur/project/request")
     public void requestNewProject(
             @RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
         entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));

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

@@ -30,7 +30,7 @@ public class SharedApi {
      *
      * @return a list of lean canvas sections
      */
-    @GetMapping("/shared/projects/sectionCells/{projectId}/{sectionId}/{date}")
+    @GetMapping("/shared/project/lcsection/{projectId}/{sectionId}/{date}")
     public Iterable<SectionCell> getLCSection(
             @PathVariable("projectId") Long projectId,
             @PathVariable("sectionId") Long sectionId,
@@ -45,7 +45,7 @@ public class SharedApi {
      *
      * @return a list of all entrepreneurs in a project
      */
-    @GetMapping("/shared/projects/entrepreneurs/{projectId}")
+    @GetMapping("/shared/entrepreneurs/{projectId}")
     public Iterable<Entrepreneur> getEntrepreneursByProjectId(
             @PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
         return sharedApiService.getEntrepreneursByProjectId(
@@ -80,7 +80,7 @@ public class SharedApi {
      *
      * @return a PDF file? TODO: how does that works ?
      */
-    @GetMapping("/shared/appointments/report/{appointmentId}")
+    @GetMapping("/shared/projects/appointments/report/{appointmentId}")
     public void getPDFReport(
             @PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
         try {
@@ -97,7 +97,7 @@ public class SharedApi {
     /**
      * @return TODO
      */
-    @PostMapping("/shared/appointments/request")
+    @PostMapping("/shared/appointment/request")
     public void createAppointmentRequest(
             @RequestBody Appointment appointment, @AuthenticationPrincipal Jwt principal) {
         sharedApiService.createAppointmentRequest(appointment, principal.getClaimAsString("email"));

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

@@ -1,51 +0,0 @@
-package enseirb.myinpulse.controller;
-
-import enseirb.myinpulse.model.Entrepreneur;
-import enseirb.myinpulse.service.EntrepreneurApiService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.web.bind.annotation.*;
-
-@SpringBootApplication
-@RestController
-public class UnauthApi {
-
-    private final EntrepreneurApiService entrepreneurApiService;
-
-    @Autowired
-    UnauthApi(EntrepreneurApiService entrepreneurApiService) {
-        this.entrepreneurApiService = entrepreneurApiService;
-    }
-
-    @GetMapping("/unauth/finalize")
-    public void createAccount(@AuthenticationPrincipal Jwt principal) {
-        boolean sneeStatus;
-        if (principal.getClaimAsString("sneeStatus") != null) {
-            sneeStatus = principal.getClaimAsString("sneeStatus").equals("true");
-        } else {
-            sneeStatus = false;
-        }
-        String userSurname = principal.getClaimAsString("userSurname");
-        String username = principal.getClaimAsString("preferred_username");
-        String primaryMail = principal.getClaimAsString("email");
-        String secondaryMail = principal.getClaimAsString("secondaryMail");
-        String phoneNumber = principal.getClaimAsString("phoneNumber");
-        String school = principal.getClaimAsString("school");
-        String course = principal.getClaimAsString("course");
-        Entrepreneur e =
-                new Entrepreneur(
-                        userSurname,
-                        username,
-                        primaryMail,
-                        secondaryMail,
-                        phoneNumber,
-                        school,
-                        course,
-                        sneeStatus,
-                        true);
-        entrepreneurApiService.createAccount(e);
-    }
-}

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

@@ -37,7 +37,7 @@ public class Administrator extends User {
             String primaryMail,
             String secondaryMail,
             String phoneNumber) {
-        super(userSurname, username, primaryMail, secondaryMail, phoneNumber, false);
+        super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber);
     }
 
     public List<Project> getListProject() {

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

@@ -36,22 +36,6 @@ public class Entrepreneur extends User {
 
     public Entrepreneur() {}
 
-    public Entrepreneur(
-            String userSurname,
-            String username,
-            String primaryMail,
-            String secondaryMail,
-            String phoneNumber,
-            String school,
-            String course,
-            boolean sneeStatus,
-            boolean pending) {
-        super(userSurname, username, primaryMail, secondaryMail, phoneNumber, pending);
-        this.school = school;
-        this.course = course;
-        this.sneeStatus = sneeStatus;
-    }
-
     public Entrepreneur(
             String userSurname,
             String username,
@@ -61,13 +45,14 @@ public class Entrepreneur extends User {
             String school,
             String course,
             boolean sneeStatus) {
-        super(userSurname, username, primaryMail, secondaryMail, phoneNumber, true);
+        super(userSurname, username, primaryMail, secondaryMail, phoneNumber);
         this.school = school;
         this.course = course;
         this.sneeStatus = sneeStatus;
     }
 
     public Entrepreneur(
+            Long idUser,
             String userSurname,
             String userName,
             String primaryMail,
@@ -78,9 +63,8 @@ public class Entrepreneur extends User {
             boolean sneeStatus,
             Project projectParticipation,
             Project projectProposed,
-            MakeAppointment makeAppointment,
+            MakeAppointment makeAppointment) {
-            boolean pending) {
+        super(idUser, userSurname, userName, primaryMail, secondaryMail, phoneNumber);
-        super(userSurname, userName, primaryMail, secondaryMail, phoneNumber, pending);
         this.school = school;
         this.course = course;
         this.sneeStatus = sneeStatus;

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

@@ -66,15 +66,6 @@ public class Project {
         this.entrepreneurProposed = entrepreneurProposed;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        }
-        Project project = (Project) o;
-        return this.idProject == project.idProject;
-    }
-
     public Long getIdProject() {
         return idProject;
     }

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

@@ -2,9 +2,6 @@ package enseirb.myinpulse.model;
 
 import jakarta.persistence.*;
 
-import org.hibernate.annotations.Generated;
-import org.hibernate.generator.EventType;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,10 +20,6 @@ public class SectionCell {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idSectionCell;
 
-    @Column(columnDefinition = "serial")
-    @Generated(event = EventType.INSERT)
-    private Long idReference;
-
     @Column() private long sectionId;
     private String contentSectionCell;
 
@@ -63,14 +56,6 @@ public class SectionCell {
         this.idSectionCell = idSectionCell;
     }
 
-    public Long getIdReference() {
-        return idReference;
-    }
-
-    public void setIdReference(Long idReference) {
-        this.idReference = idReference;
-    }
-
     public Long getSectionId() {
         return sectionId;
     }

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

@@ -26,23 +26,36 @@ public class User {
     @Column(length = 20)
     private String phoneNumber;
 
-    @Column private boolean pending;
-
     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,
+            String userName,
+            String primaryMail,
+            String secondaryMail,
+            String phoneNumber) {
+        this.idUser = idUser;
+        this.userSurname = userSurname;
+        this.userName = userName;
+        this.primaryMail = primaryMail;
+        this.secondaryMail = secondaryMail;
+        this.phoneNumber = phoneNumber;
+    }
+
     public User(
             String userSurname,
             String userName,
             String primaryMail,
             String secondaryMail,
-            String phoneNumber,
+            String phoneNumber) {
-            boolean pending) {
         this.userSurname = userSurname;
         this.userName = userName;
         this.primaryMail = primaryMail;
         this.secondaryMail = secondaryMail;
         this.phoneNumber = phoneNumber;
-        this.pending = pending;
     }
 
     public Long getIdUser() {
@@ -92,12 +105,4 @@ public class User {
     public void setPhoneNumber(String phoneNumber) {
         phoneNumber = phoneNumber;
     }
-
-    public boolean isPending() {
-        return pending;
-    }
-
-    public void setPending(boolean pending) {
-        this.pending = pending;
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java

@@ -9,9 +9,8 @@ import java.util.Optional;
 
 @RepositoryRestResource
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByPrimaryMail(String primaryMail);
+    Optional<User> findByPrimaryMail(String email);
 
-    Iterable<User> findAllByPendingEquals(boolean pending);
     /* @Query("SELECT u from User u")
     User findAllUser(); */
 

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

@@ -24,7 +24,6 @@ public class AdminApiService {
     private final ProjectService projectService;
     private final UserService userService;
     private final AdministratorService administratorService;
-    private final EntrepreneurService entrepreneurService;
     private final UtilsService utilsService;
     private final AppointmentService appointmentService;
     private final ReportService reportService;
@@ -36,7 +35,6 @@ public class AdminApiService {
             UserService userService,
             AdministratorService administratorService,
             UtilsService utilsService,
-            EntrepreneurService entrepreneurService,
             AppointmentService appointmentService,
             ReportService reportService,
             SectionCellService sectionCellService) {
@@ -47,7 +45,6 @@ public class AdminApiService {
         this.appointmentService = appointmentService;
         this.reportService = reportService;
         this.sectionCellService = sectionCellService;
-        this.entrepreneurService = entrepreneurService;
     }
 
     // TODO: check if tests are sufficient - peer verification required
@@ -78,12 +75,6 @@ public class AdminApiService {
         }
         if (user instanceof Entrepreneur) {
             Project project = ((Entrepreneur) user).getProjectParticipation();
-            if (project == null) {
-                throw new ResponseStatusException(
-                        HttpStatus.NOT_FOUND,
-                        "The user has no project, thus no appointments. No users should have no project");
-            }
-
             project.getListSectionCell()
                     .forEach(
                             sectionCell -> {
@@ -106,14 +97,13 @@ public class AdminApiService {
                 decision.projectId,
                 null,
                 null,
+                null,
                 (decision.isAccepted == 1) ? ACTIVE : REJECTED,
-                null,
-                null,
                 this.administratorService.getAdministratorById(decision.adminId));
     }
 
     // TODO: check if tests are sufficient - peer verification required
-    public Project addNewProject(Project project) {
+    public void addNewProject(Project project) {
         project.setIdProject(null);
         // We remove the ID from the request to be sure that it will be auto generated
         try {
@@ -145,7 +135,6 @@ public class AdminApiService {
                         sectionCell -> {
                             sectionCell.setProjectSectionCell(newProject);
                         });
-        return newProject;
     }
 
     public void createAppointmentReport(long appointmentId, Report report, String mail) {
@@ -174,36 +163,4 @@ public class AdminApiService {
     public void deleteProject(long projectId) {
         this.projectService.deleteProjectById(projectId);
     }
-
-    public void setAdmin(long userId, String token) {
-        Entrepreneur e = this.entrepreneurService.getEntrepreneurById(userId);
-        Administrator a =
-                new Administrator(
-                        e.getUserSurname(),
-                        e.getUserName(),
-                        e.getPrimaryMail(),
-                        e.getSecondaryMail(),
-                        e.getPhoneNumber());
-        this.entrepreneurService.deleteEntrepreneur(e);
-        this.administratorService.addAdministrator(a);
-        try {
-            KeycloakApi.setRoleToUser(a.getUserName(), "MyINPulse-admin", token);
-        } catch (Exception err) {
-            logger.error(err);
-        }
-    }
-
-    public void validateEntrepreneurAccount(long userId, String token) {
-        Entrepreneur e = this.entrepreneurService.getEntrepreneurById(userId);
-        try {
-            KeycloakApi.setRoleToUser(e.getUserName(), "MyINPulse-entrepreneur", token);
-        } catch (Exception err) {
-            logger.error(err);
-        }
-        this.entrepreneurService.validateEntrepreneurById(userId);
-    }
-
-    public Iterable<User> getPendingUsers() {
-        return this.userService.getPendingAccounts();
-    }
 }

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

@@ -2,10 +2,10 @@ package enseirb.myinpulse.service;
 
 import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
 
-import enseirb.myinpulse.model.Entrepreneur;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.model.SectionCell;
-import enseirb.myinpulse.service.database.*;
+import enseirb.myinpulse.service.database.ProjectService;
+import enseirb.myinpulse.service.database.SectionCellService;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -14,8 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.time.LocalDateTime;
-
 @Service
 public class EntrepreneurApiService {
 
@@ -24,39 +22,24 @@ public class EntrepreneurApiService {
     private final SectionCellService sectionCellService;
     private final ProjectService projectService;
     private final UtilsService utilsService;
-    private final UserService userService;
-    private final EntrepreneurService entrepreneurService;
-    private final AdministratorService administratorService;
-    private final AppointmentService appointmentService;
-    private final AnnotationService annotationService;
 
     @Autowired
     EntrepreneurApiService(
             SectionCellService sectionCellService,
             ProjectService projectService,
-            UtilsService utilsService,
+            UtilsService utilsService) {
-            UserService userService,
-            EntrepreneurService entrepreneurService,
-            AdministratorService administratorService,
-            AppointmentService appointmentService,
-            AnnotationService annotationService) {
         this.sectionCellService = sectionCellService;
         this.projectService = projectService;
         this.utilsService = utilsService;
-        this.userService = userService;
-        this.entrepreneurService = entrepreneurService;
-        this.administratorService = administratorService;
-        this.appointmentService = appointmentService;
-        this.annotationService = annotationService;
     }
 
-    public void editSectionCell(Long sectionCellId, String content, String mail) {
+    public void editSectionCell(Long sectionCellId, SectionCell sectionCell, String mail) {
-        if (sectionCellId == null) {
+        SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
-            logger.warn("Trying to edit unknown section cell");
+        if (editSectionCell == null) {
+            System.err.println("Trying to edit unknown section cell");
             throw new ResponseStatusException(
                     HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
         }
-        SectionCell sectionCell = sectionCellService.getSectionCellById(sectionCellId);
         if (!utilsService.isAllowedToCheckProject(
                 mail, this.sectionCellService.getProjectId(sectionCellId))) {
             logger.warn(
@@ -72,45 +55,27 @@ public class EntrepreneurApiService {
                 mail,
                 sectionCellId,
                 this.sectionCellService.getProjectId(sectionCellId));
-        SectionCell newSectionCell =
+        sectionCellService.updateSectionCell(
-                new SectionCell(
+                sectionCellId,
-                        null,
+                sectionCell.getSectionId(),
-                        sectionCell.getSectionId(),
+                sectionCell.getContentSectionCell(),
-                        content,
+                sectionCell.getModificationDate());
-                        LocalDateTime.now(),
-                        sectionCell.getProjectSectionCell());
-        newSectionCell.setIdReference(sectionCell.getIdReference());
-        this.addSectionCell(newSectionCell, mail);
-        sectionCell
-                .getAppointmentSectionCell()
-                .forEach(
-                        appointment -> {
-                            this.appointmentService.updateAppointmentListSectionCell(
-                                    appointment.getIdAppointment(), newSectionCell);
-                        });
-        sectionCell
-                .getListAnnotation()
-                .forEach(
-                        annotation -> {
-                            this.annotationService.updateAnnotationSectionCell(
-                                    annotation.getIdAnnotation(), newSectionCell);
-                        });
     }
 
     public void removeSectionCell(Long sectionCellId, String mail) {
-        if (sectionCellId == null) {
+        SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
-            logger.warn("Trying to remove unknown section cell");
+        if (editSectionCell == null) {
+            System.err.println("Trying to remove unknown section cell");
             throw new ResponseStatusException(
                     HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
         }
-        SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
         if (!utilsService.isAllowedToCheckProject(
                 mail, this.sectionCellService.getProjectId(sectionCellId))) {
             logger.warn(
                     "User {} tried to remove section cells {} of the project {} but is not allowed to.",
                     mail,
                     sectionCellId,
-                    this.sectionCellService.getProjectId(sectionCellId));
+                    this.sectionCellService.getSectionCellById(sectionCellId));
             throw new ResponseStatusException(
                     HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
         }
@@ -119,104 +84,52 @@ public class EntrepreneurApiService {
                 mail,
                 sectionCellId,
                 this.sectionCellService.getProjectId(sectionCellId));
-        SectionCell removedSectionCell =
+        sectionCellService.removeSectionCellById(sectionCellId);
-                new SectionCell(
-                        null,
-                        -1L,
-                        "",
-                        LocalDateTime.now(),
-                        this.projectService.getProjectById(
-                                editSectionCell.getProjectSectionCell().getIdProject()));
-        sectionCellService.addNewSectionCell(removedSectionCell);
-        this.sectionCellService.updateSectionCellReferenceId(
-                removedSectionCell.getIdSectionCell(), editSectionCell.getIdReference());
-        projectService.updateProjectListSectionCell(
-                sectionCellService.getProjectId(sectionCellId), removedSectionCell);
-        // sectionCellService.removeSectionCellById(sectionCellId);
     }
 
     public void addSectionCell(SectionCell sectionCell, String mail) {
         if (sectionCell == null) {
-            logger.warn("Trying to create an empty section cell");
+            System.err.println("Trying to create an empty section cell");
             throw new ResponseStatusException(
                     HttpStatus.BAD_REQUEST, "La cellule de section fournie est vide");
         }
-        if (sectionCell.getSectionId() == -1) {
-            logger.warn("Trying to create an illegal section cell");
-            throw new ResponseStatusException(
-                    HttpStatus.BAD_REQUEST, "La cellule de section fournie n'est pas valide");
-        }
         if (!utilsService.isAllowedToCheckProject(
-                mail, sectionCell.getProjectSectionCell().getIdProject())) {
+                mail, this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()))) {
             logger.warn(
                     "User {} tried to add a section cell to the project {} but is not allowed to.",
                     mail,
-                    sectionCell.getProjectSectionCell().getIdProject());
+                    this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
             throw new ResponseStatusException(
                     HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
         }
         logger.info(
-                "User {} added a new section cell {} to the project {}",
+                "User {} added a new section cell {} to the project with id {}",
                 mail,
                 sectionCell.getIdSectionCell(),
-                sectionCell.getProjectSectionCell().getIdProject());
+                this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
-        SectionCell newSectionCell =
+        SectionCell newSectionCell = sectionCellService.addNewSectionCell(sectionCell);
-                sectionCellService.addNewSectionCell(
-                        sectionCell); // if here, logger fails cause id is null (not added yet)
         newSectionCell.getProjectSectionCell().updateListSectionCell(newSectionCell);
         newSectionCell
                 .getAppointmentSectionCell()
                 .forEach(
                         appointment -> {
-                            this.appointmentService.updateAppointmentListSectionCell(
+                            appointment.updateListSectionCell(newSectionCell);
-                                    appointment.getIdAppointment(), newSectionCell);
                         });
         newSectionCell
                 .getListAnnotation()
                 .forEach(
                         annotation -> {
-                            this.annotationService.updateAnnotationSectionCell(
+                            annotation.setSectionCellAnnotation(newSectionCell);
-                                    annotation.getIdAnnotation(), newSectionCell);
                         });
     }
 
     public void requestNewProject(Project project, String mail) {
         if (project == null) {
-            logger.warn("Trying to request the creation of a null project");
+            logger.error("Trying to request the creation of a null project");
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Le projet fourni est vide");
         }
-        logger.info("User {} created a new project named {}", mail, project.getProjectName());
+        logger.info("User {} created a new project with id {}", mail, project.getIdProject());
-        project.setEntrepreneurProposed((Entrepreneur) this.userService.getUserByEmail(mail));
+        project.setProjectStatus(PENDING);
         projectService.addNewProject(project);
-        this.projectService.updateProjectStatus(project.getIdProject(), PENDING);
-        if (project.getProjectAdministrator() != null) {
-            this.administratorService.updateAdministratorListProject(
-                    project.getProjectAdministrator().getIdUser(), project);
-        }
-        this.entrepreneurService.updateEntrepreneurProjectProposed(
-                this.userService.getUserByEmail(mail).getIdUser(), project);
-        this.entrepreneurService.updateEntrepreneurProjectParticipation(
-                this.userService.getUserByEmail(mail).getIdUser(), project);
-        project.getListEntrepreneurParticipation()
-                .forEach(
-                        entrepreneur ->
-                                this.entrepreneurService.updateEntrepreneurProjectParticipation(
-                                        entrepreneur.getIdUser(), project));
-        project.getListSectionCell()
-                .forEach(
-                        sectionCell ->
-                                this.sectionCellService.updateSectionCellProject(
-                                        sectionCell.getIdSectionCell(), project));
-    }
-
-    public void createAccount(Entrepreneur e) {
-        try {
-            userService.getUserByEmail(e.getPrimaryMail());
-            logger.error("The user {} already exists in the system", e.getPrimaryMail());
-        } catch (ResponseStatusException err) {
-            this.entrepreneurService.addEntrepreneur(e);
-            return;
-        }
-        throw new ResponseStatusException(HttpStatus.CONFLICT, "User already exists in the system");
     }
 }

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

@@ -6,17 +6,12 @@ import enseirb.myinpulse.exception.UserNotFoundException;
 import enseirb.myinpulse.model.RoleRepresentation;
 import enseirb.myinpulse.model.UserRepresentation;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.web.client.RestClient;
 
-import java.util.List;
-
 import javax.management.relation.RoleNotFoundException;
 
 public class KeycloakApi {
 
-    protected static final Logger logger = LogManager.getLogger();
     static final String keycloakUrl;
     static final String realmName;
 
@@ -34,48 +29,44 @@ public class KeycloakApi {
         realmName = System.getenv("VITE_KEYCLOAK_REALM");
     }
 
-    static String toBearer(String b) {
-        return "Bearer " + b;
-    }
-
     /**
      * Uses Keycloak API to retrieve a role representation of a role by its name
      *
      * @param roleName name of the role
-     * @param token authorization header used by the client to authenticate to keycloak
+     * @param bearer authorization header used by the client to authenticate to keycloak
      */
-    public static RoleRepresentation getRoleRepresentationByName(String roleName, String token)
+    public static RoleRepresentation getRoleRepresentationByName(String roleName, String bearer)
             throws RoleNotFoundException {
-        RoleRepresentation response =
+        RoleRepresentation[] response =
                 RestClient.builder()
                         .baseUrl(keycloakUrl)
-                        .defaultHeader("Authorization", toBearer(token))
+                        .defaultHeader("Authorization", bearer)
                         .build()
                         .get()
                         .uri("/admin/realms/{realmName}/roles/{roleName}", realmName, roleName)
                         .retrieve()
-                        .body(RoleRepresentation.class);
+                        .body(RoleRepresentation[].class);
-        /*
+
-        {"id":"7a845f2e-c832-4465-8cd8-894d72bc13f1","name":"MyINPulse-entrepreneur","description":"Role for entrepreneur","composite":false,"clientRole":false,"containerId":"0d6f691b-e328-471a-b89e-c30bd7e5b6b0","attributes":{}}
+        if (response == null || response.length == 0) {
-         */
+            throw new RoleNotFoundException("Role not found");
-        // TODO: check what happens when role does not exist
+        }
-        return response;
+        return response[0];
     }
 
     /**
      * Use keycloak API to to retreive a userID via his name or email.
      *
      * @param username username or mail of the user
-     * @param token bearer of the user, allowing access to database
+     * @param bearer bearer of the user, allowing access to database
      * @return the userid, as a String
      * @throws UserNotFoundException
      */
-    public static String getUserIdByName(String username, String token)
+    public static String getUserIdByName(String username, String bearer)
             throws UserNotFoundException {
         UserRepresentation[] response =
                 RestClient.builder()
                         .baseUrl(keycloakUrl)
-                        .defaultHeader("Authorization", toBearer(token))
+                        .defaultHeader("Authorization", bearer)
                         .build()
                         .get()
                         .uri(
@@ -100,26 +91,27 @@ public class KeycloakApi {
      *
      * @param username
      * @param roleName
-     * @param token
+     * @param bearer
      * @throws RoleNotFoundException
      * @throws UserNotFoundException
      */
-    public static void setRoleToUser(String username, String roleName, String token)
+    public static void setRoleToUser(String username, String roleName, String bearer)
             throws RoleNotFoundException, UserNotFoundException {
-        RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, token);
+        RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, bearer);
-        String userId = getUserIdByName(username, token);
+        String userId = getUserIdByName(username, bearer);
-        List<RoleRepresentation> rolesToAdd = List.of(roleRepresentation);
+
-        logger.debug("Adding role {} to user {}", roleRepresentation.id, userId);
         RestClient.builder()
                 .baseUrl(keycloakUrl)
-                .defaultHeader("Authorization", toBearer(token))
+                .defaultHeader("Authorization", bearer)
                 .build()
                 .post()
-                .uri("/admin/realms/" + realmName + "/users/" + userId + "/role-mappings/realm")
+                .uri(
-                .body(rolesToAdd)
+                        "/admin/realms/${realmName}/users/${userId}/role-mappings/realm",
+                        realmName,
+                        userId)
+                .body(roleRepresentation)
                 .contentType(APPLICATION_JSON)
-                .retrieve()
+                .retrieve();
-                .toBodilessEntity();
     }
 
     /**

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

@@ -2,8 +2,7 @@ package enseirb.myinpulse.service;
 
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.PdfWriter;
-import enseirb.myinpulse.controller.AdminApi;
+
-import enseirb.myinpulse.controller.EntrepreneurApi;
 import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.database.*;
 
@@ -26,15 +25,10 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 @Service
 public class SharedApiService {
 
-    private final AdminApi adminApi;
-
-    private final EntrepreneurApi entrepreneurApi;
-
     protected static final Logger logger = LogManager.getLogger();
 
     private final ProjectService projectService;
@@ -50,16 +44,12 @@ public class SharedApiService {
             EntrepreneurService entrepreneurService,
             SectionCellService sectionCellService,
             AppointmentService appointmentService,
-            UtilsService utilsService,
+            UtilsService utilsService) {
-            EntrepreneurApi entrepreneurApi,
-            AdminApi adminApi) {
         this.projectService = projectService;
         this.entrepreneurService = entrepreneurService;
         this.sectionCellService = sectionCellService;
         this.appointmentService = appointmentService;
         this.utilsService = utilsService;
-        this.entrepreneurApi = entrepreneurApi;
-        this.adminApi = adminApi;
     }
 
     // TODO filter this with date
@@ -83,45 +73,6 @@ public class SharedApiService {
                 project, sectionId, dateTime);
     }
 
-    // Retrieve all up to date (for every sectionId) sectionCells of a project
-    public Iterable<SectionCell> getAllSectionCells(long projectId, String mail) {
-        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
-            logger.warn(
-                    "User {} tried to check section cells of the project {} but is not allowed to.",
-                    mail,
-                    projectId);
-            throw new ResponseStatusException(
-                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
-        }
-
-        Project project = this.projectService.getProjectById(projectId);
-        List<SectionCell> allSectionCells = new ArrayList<SectionCell>();
-        project.getListSectionCell()
-                .forEach(
-                        projectCell -> {
-                            AtomicBoolean sameReferenceId =
-                                    new AtomicBoolean(false); // side effect lambdas
-                            allSectionCells.forEach(
-                                    selectedCell -> {
-                                        if (projectCell
-                                                .getIdReference()
-                                                .equals(selectedCell.getIdReference())) {
-                                            sameReferenceId.set(true);
-                                            if (projectCell
-                                                    .getModificationDate()
-                                                    .isAfter(selectedCell.getModificationDate())) {
-                                                allSectionCells.remove(selectedCell);
-                                                allSectionCells.add(projectCell);
-                                            }
-                                        }
-                                    });
-                            if (!sameReferenceId.get()) {
-                                allSectionCells.add(projectCell);
-                            }
-                        });
-        return allSectionCells;
-    }
-
     // TODO: test
     public Iterable<Entrepreneur> getEntrepreneursByProjectId(long projectId, String mail) {
         if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
@@ -296,13 +247,6 @@ public class SharedApiService {
                         sectionCell -> {
                             sectionCell.updateAppointmentSectionCell(newAppointment);
                         });
-
+        newAppointment.getAppointmentReport().setAppointmentReport(newAppointment);
-        /*
-         * On initial insertion, the resport value is null unless that report does already exist in the db somewhere
-         * If a non null value is passed and it does not exist in db it will throw an exception
-         */
-        if (newAppointment.getAppointmentReport() != null) {
-            newAppointment.getAppointmentReport().setAppointmentReport(newAppointment);
-        }
     }
 }

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

@@ -15,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.util.Objects;
-
 @Service
 public class UtilsService {
 
@@ -46,29 +44,18 @@ public class UtilsService {
         }
         User user = this.userService.getUserByEmail(mail);
         Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(user.getIdUser());
-        if (entrepreneur == null) {
-            logger.debug("testing access with an unknown Entrepreneur");
-            return false;
-        }
-        if (entrepreneur.getProjectParticipation() == null) {
-            logger.debug("testing access with an user with no project participation");
-            return false;
-        }
         Project project = this.projectService.getProjectById(projectId);
-        // We compare the ID instead of the project themselves
+        return entrepreneur.getProjectParticipation() == project;
-        return Objects.equals(
-                entrepreneur.getProjectParticipation().getIdProject(), project.getIdProject());
     }
 
     // TODO: test
-    public Boolean isAnAdmin(String mail) {
+    Boolean isAnAdmin(String mail) {
         try {
             long userId = this.userService.getUserByEmail(mail).getIdUser();
             Administrator a = this.administratorService.getAdministratorById(userId);
             return true;
         } catch (ResponseStatusException e) {
             logger.info(e);
-
             return false;
         }
     }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java

@@ -1,9 +1,6 @@
 package enseirb.myinpulse.service.database;
 
 import enseirb.myinpulse.model.Administrator;
-import enseirb.myinpulse.model.Annotation;
-import enseirb.myinpulse.model.MakeAppointment;
-import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.repository.AdministratorRepository;
 
 import org.apache.logging.log4j.LogManager;
@@ -55,49 +52,6 @@ public class AdministratorService {
         return this.administratorRepository.save(administrator);
     }
 
-    public void updateAdministratorListProject(long idAdministrator, Project project) {
-        Administrator administrator = getAdministratorById(idAdministrator);
-        administrator.updateListProject(project);
-        this.administratorRepository.save(administrator);
-    }
-
-    public void updateAdministratorListAnnotation(long idAdministrator, Annotation annotation) {
-        Administrator administrator = getAdministratorById(idAdministrator);
-        administrator.updateListAnnotation(annotation);
-        this.administratorRepository.save(administrator);
-    }
-
-    public void updateAdministratorMakeAppointment(
-            long idAdministrator, MakeAppointment makeAppointment) {
-        Administrator administrator = getAdministratorById(idAdministrator);
-        administrator.setMakeAppointment(makeAppointment);
-        this.administratorRepository.save(administrator);
-    }
-
-    public Administrator updateAdministrator(
-            Long idAdministrator,
-            Project project,
-            Annotation annotation,
-            MakeAppointment makeAppointment) {
-        Optional<Administrator> administrator = administratorRepository.findById(idAdministrator);
-        if (administrator.isEmpty()) {
-            logger.error(
-                    "updateAdministrator : No administrator found with id {}", idAdministrator);
-            throw new ResponseStatusException(
-                    HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
-        }
-        if (project != null) {
-            administrator.get().updateListProject(project);
-        }
-        if (annotation != null) {
-            administrator.get().updateListAnnotation(annotation);
-        }
-        if (makeAppointment != null) {
-            administrator.get().setMakeAppointment(makeAppointment);
-        }
-        return this.administratorRepository.save(administrator.get());
-    }
-
     /*
     public Administrator getAdministratorByProject(Project project) {
         r

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AnnotationService.java

@@ -1,8 +1,6 @@
 package enseirb.myinpulse.service.database;
 
-import enseirb.myinpulse.model.Administrator;
 import enseirb.myinpulse.model.Annotation;
-import enseirb.myinpulse.model.SectionCell;
 import enseirb.myinpulse.repository.AnnotationRepository;
 
 import org.apache.logging.log4j.LogManager;
@@ -48,12 +46,6 @@ public class AnnotationService {
         this.annotationRepository.deleteById(id);
     }
 
-    public void updateAnnotationComment(long idAnnotation, String comment) {
-        Annotation annotation = getAnnotationById(idAnnotation);
-        annotation.setComment(comment);
-        this.annotationRepository.save(annotation);
-    }
-
     public Annotation updateAnnotation(Long id, String comment) {
         Optional<Annotation> annotation = annotationRepository.findById(id);
         if (annotation.isEmpty()) {
@@ -66,16 +58,4 @@ public class AnnotationService {
         }
         return this.annotationRepository.save(annotation.get());
     }
-
-    public void updateAnnotationSectionCell(long idAnnotation, SectionCell sectionCell) {
-        Annotation annotation = getAnnotationById(idAnnotation);
-        annotation.setSectionCellAnnotation(sectionCell);
-        this.annotationRepository.save(annotation);
-    }
-
-    public void updateAnnotationAdministrator(long idAnnotation, Administrator administrator) {
-        Annotation annotation = getAnnotationById(idAnnotation);
-        annotation.setAdministratorAnnotation(administrator);
-        this.annotationRepository.save(annotation);
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AppointmentService.java

@@ -1,7 +1,6 @@
 package enseirb.myinpulse.service.database;
 
 import enseirb.myinpulse.model.Appointment;
-import enseirb.myinpulse.model.SectionCell;
 import enseirb.myinpulse.repository.AppointmentRepository;
 
 import org.apache.logging.log4j.LogManager;
@@ -48,50 +47,13 @@ public class AppointmentService {
         this.appointmentRepository.deleteById(id);
     }
 
-    public void updateAppointmentDate(long idAppointment, LocalDate date) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.setAppointmentDate(date);
-        this.appointmentRepository.save(appointment);
-    }
-
-    public void updateAppointmentTime(long idAppointment, LocalTime time) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.setAppointmentTime(time);
-        this.appointmentRepository.save(appointment);
-    }
-
-    public void updateAppointmentDuration(long idAppointment, LocalTime duration) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.setAppointmentDuration(duration);
-        this.appointmentRepository.save(appointment);
-    }
-
-    public void updateAppointmentPlace(long idAppointment, String place) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.setAppointmentPlace(place);
-        this.appointmentRepository.save(appointment);
-    }
-
-    public void updateAppointmentSubject(long idAppointment, String subject) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.setAppointmentSubject(subject);
-        this.appointmentRepository.save(appointment);
-    }
-
-    public void updateAppointmentListSectionCell(long idAppointment, SectionCell sectionCell) {
-        Appointment appointment = getAppointmentById(idAppointment);
-        appointment.updateListSectionCell(sectionCell);
-        this.appointmentRepository.save(appointment);
-    }
-
     public Appointment updateAppointment(
             Long id,
             LocalDate appointmentDate,
             LocalTime appointmentTime,
             LocalTime appointmentDuration,
             String appointmentPlace,
-            String appointmentSubject,
+            String appointmentSubject) {
-            SectionCell sectionCell) {
         Optional<Appointment> appointment = this.appointmentRepository.findById(id);
         if (appointment.isEmpty()) {
             logger.error("updateAppointment : No appointment found with id {}", id);
@@ -112,9 +74,6 @@ public class AppointmentService {
         if (appointmentSubject != null) {
             appointment.get().setAppointmentSubject(appointmentSubject);
         }
-        if (sectionCell != null) {
-            appointment.get().updateListSectionCell(sectionCell);
-        }
         return this.appointmentRepository.save(appointment.get());
     }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/EntrepreneurService.java

@@ -1,7 +1,6 @@
 package enseirb.myinpulse.service.database;
 
 import enseirb.myinpulse.model.Entrepreneur;
-import enseirb.myinpulse.model.MakeAppointment;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.repository.EntrepreneurRepository;
 
@@ -42,52 +41,8 @@ public class EntrepreneurService {
         return this.entrepreneurRepository.save(entrepreneur);
     }
 
-    public void updateEntrepreneurSchool(long idEntrepreneur, String school) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setSchool(school);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
-    public void updateEntrepreneurCourse(long idEntrepreneur, String course) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setCourse(course);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
-    public void updateEntrepreneurSneeStatus(long idEntrepreneur, boolean status) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setSneeStatus(status);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
-    public void updateEntrepreneurProjectParticipation(
-            long idEntrepreneur, Project projectParticipation) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setProjectParticipation(projectParticipation);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
-    public void updateEntrepreneurProjectProposed(long idEntrepreneur, Project projectProposed) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setProjectParticipation(projectProposed);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
-    public void updateEntrepreneurMakeAppointment(
-            long idEntrepreneur, MakeAppointment makeAppointment) {
-        Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
-        entrepreneur.setMakeAppointment(makeAppointment);
-        this.entrepreneurRepository.save(entrepreneur);
-    }
-
     public Entrepreneur updateEntrepreneur(
-            Long id,
+            Long id, String school, String course, Boolean sneeStatus) {
-            String school,
-            String course,
-            Boolean sneeStatus,
-            Project projectParticipation,
-            Project projectProposed,
-            MakeAppointment makeAppointment) {
         Optional<Entrepreneur> entrepreneur = entrepreneurRepository.findById(id);
         if (entrepreneur.isEmpty()) {
             logger.error("updateEntrepreneur : No entrepreneur found with id {}", id);
@@ -103,33 +58,10 @@ public class EntrepreneurService {
         if (sneeStatus != null) {
             entrepreneur.get().setSneeStatus(sneeStatus);
         }
-        if (projectParticipation != null) {
-            entrepreneur.get().setProjectParticipation(projectParticipation);
-        }
-        if (projectProposed != null) {
-            entrepreneur.get().setProjectParticipation(projectProposed);
-        }
-        if (makeAppointment != null) {
-            entrepreneur.get().setMakeAppointment(makeAppointment);
-        }
         return this.entrepreneurRepository.save(entrepreneur.get());
     }
 
     public Iterable<Entrepreneur> GetEntrepreneurByProject(Project project) {
         return this.entrepreneurRepository.getEntrepreneurByProjectParticipation(project);
     }
-
-    public void deleteEntrepreneur(Entrepreneur e) {
-        this.entrepreneurRepository.delete(e);
-    }
-
-    public void validateEntrepreneurById(Long id) {
-        System.out.println("\nVALIDATING\n");
-        Optional<Entrepreneur> e = this.entrepreneurRepository.findById(id);
-        if (e.isEmpty()) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Entrepreneur n'existe pas");
-        }
-        e.get().setPending(false);
-        this.entrepreneurRepository.save(e.get());
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ProjectService.java

@@ -2,7 +2,9 @@ package enseirb.myinpulse.service.database;
 
 import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
 
-import enseirb.myinpulse.model.*;
+import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.ProjectDecisionValue;
 import enseirb.myinpulse.repository.ProjectRepository;
 
 import org.apache.logging.log4j.LogManager;
@@ -12,6 +14,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -49,50 +52,12 @@ public class ProjectService {
         return this.projectRepository.save(project);
     }
 
-    public void updateProjectName(long idProject, String name) {
-        Project project = getProjectById(idProject);
-        project.setProjectName(name);
-        this.projectRepository.save(project);
-    }
-
-    public void updateProjectLogo(long idProject, byte[] logo) {
-        Project project = getProjectById(idProject);
-        project.setLogo(logo);
-        this.projectRepository.save(project);
-    }
-
-    public void updateProjectStatus(long idProject, ProjectDecisionValue status) {
-        Project project = getProjectById(idProject);
-        project.setProjectStatus(status);
-        this.projectRepository.save(project);
-    }
-
-    public void updateProjectEntrepreneurParticipation(
-            long idProject, Entrepreneur entrepreneurParticipation) {
-        Project project = getProjectById(idProject);
-        project.updateListEntrepreneurParticipation(entrepreneurParticipation);
-        this.projectRepository.save(project);
-    }
-
-    public void updateProjectListSectionCell(long idProject, SectionCell sectionCell) {
-        Project project = getProjectById(idProject);
-        project.updateListSectionCell(sectionCell);
-        this.projectRepository.save(project);
-    }
-
-    public void updateProjectAdministrator(long idProject, Administrator administrator) {
-        Project project = getProjectById(idProject);
-        project.setProjectAdministrator(administrator);
-        this.projectRepository.save(project);
-    }
-
     public Project updateProject(
             Long id,
             String projectName,
             byte[] logo,
+            LocalDate creationDate,
             ProjectDecisionValue projectStatus,
-            Entrepreneur entrepreneurParticipation,
-            SectionCell sectionCell,
             Administrator administrator) {
         Optional<Project> project = this.projectRepository.findById(id);
 
@@ -108,6 +73,11 @@ public class ProjectService {
         if (logo != null) {
             project.get().setLogo(logo);
         }
+
+        if (creationDate != null) {
+            project.get().setCreationDate(creationDate);
+        }
+
         if (projectStatus != null) {
             // TODO: check if this is really useful
             /*
@@ -119,12 +89,7 @@ public class ProjectService {
             */
             project.get().setProjectStatus(projectStatus);
         }
-        if (entrepreneurParticipation != null) {
+
-            project.get().updateListEntrepreneurParticipation(entrepreneurParticipation);
-        }
-        if (sectionCell != null) {
-            project.get().updateListSectionCell(sectionCell);
-        }
         if (administrator != null) {
             project.get().setProjectAdministrator(administrator);
         }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ReportService.java

@@ -1,6 +1,5 @@
 package enseirb.myinpulse.service.database;
 
-import enseirb.myinpulse.model.Appointment;
 import enseirb.myinpulse.model.Report;
 import enseirb.myinpulse.repository.ReportRepository;
 
@@ -47,19 +46,7 @@ public class ReportService {
         this.reportRepository.deleteById(id);
     }
 
-    public void updateReportContent(long idReport, String content) {
+    public Report updateReport(Long id, String reportContent) {
-        Report report = getReportById(idReport);
-        report.setReportContent(content);
-        this.reportRepository.save(report);
-    }
-
-    public void updateReportAppointment(long idReport, Appointment appointment) {
-        Report report = getReportById(idReport);
-        report.setAppointmentReport(appointment);
-        this.reportRepository.save(report);
-    }
-
-    public Report updateReport(Long id, String reportContent, Appointment appointment) {
         Optional<Report> report = this.reportRepository.findById(id);
         if (report.isEmpty()) {
             logger.error("updateReport : No report found with id {}", id);
@@ -68,9 +55,6 @@ public class ReportService {
         if (reportContent != null) {
             report.get().setReportContent(reportContent);
         }
-        if (appointment != null) {
-            report.get().setAppointmentReport(appointment);
-        }
         return this.reportRepository.save(report.get());
     }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java

@@ -1,6 +1,5 @@
 package enseirb.myinpulse.service.database;
 
-import enseirb.myinpulse.model.Annotation;
 import enseirb.myinpulse.model.Appointment;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.model.SectionCell;
@@ -51,63 +50,22 @@ public class SectionCellService {
         this.sectionCellRepository.deleteById(id);
     }
 
-    public void updateSectionCellReferenceId(Long idSectionCell, Long referenceId) {
-        SectionCell sectionCell = this.getSectionCellById(idSectionCell);
-        sectionCell.setIdReference(referenceId);
-        this.sectionCellRepository.save(sectionCell);
-    }
-
-    public void updateSectionCellContent(long idSectionCell, String content) {
-        SectionCell sectionCell = getSectionCellById(idSectionCell);
-        sectionCell.setContentSectionCell(content);
-        this.sectionCellRepository.save(sectionCell);
-    }
-
-    public void updateSectionCellListAppointment(long idSectionCell, Appointment appointment) {
-        SectionCell sectionCell = getSectionCellById(idSectionCell);
-        sectionCell.updateAppointmentSectionCell(appointment);
-        this.sectionCellRepository.save(sectionCell);
-    }
-
-    public void updateSectionCellListAnnotation(long idSectionCell, Annotation annotation) {
-        SectionCell sectionCell = getSectionCellById(idSectionCell);
-        sectionCell.updateListAnnotation(annotation);
-        this.sectionCellRepository.save(sectionCell);
-    }
-
-    public void updateSectionCellProject(long idSectionCell, Project project) {
-        SectionCell sectionCell = getSectionCellById(idSectionCell);
-        sectionCell.setProjectSectionCell(project);
-        this.sectionCellRepository.save(sectionCell);
-    }
-
     public SectionCell updateSectionCell(
-            Long id,
+            Long id, Long sectionId, String contentSectionCell, LocalDateTime modificationDate) {
-            String contentSectionCell,
-            Appointment appointment,
-            Annotation annotation,
-            Project project) {
         Optional<SectionCell> sectionCell = this.sectionCellRepository.findById(id);
         if (sectionCell.isEmpty()) {
             logger.error("updateSectionCell : No sectionCell found with id {}", id);
             throw new ResponseStatusException(
                     HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
         }
+        if (sectionId != null) {
+            sectionCell.get().setSectionId(sectionId);
+        }
         if (contentSectionCell != null) {
             sectionCell.get().setContentSectionCell(contentSectionCell);
-            sectionCell.get().setModificationDate(LocalDateTime.now());
         }
-        if (appointment != null) {
+        if (modificationDate != null) {
-            sectionCell.get().updateAppointmentSectionCell(appointment);
+            sectionCell.get().setModificationDate(modificationDate);
-            sectionCell.get().setModificationDate(LocalDateTime.now());
-        }
-        if (annotation != null) {
-            sectionCell.get().updateListAnnotation(annotation);
-            sectionCell.get().setModificationDate(LocalDateTime.now());
-        }
-        if (project != null) {
-            sectionCell.get().setProjectSectionCell(project);
-            sectionCell.get().setModificationDate(LocalDateTime.now());
         }
         return this.sectionCellRepository.save(sectionCell.get());
     }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java

@@ -30,15 +30,6 @@ public class UserService {
         return this.userRepository.findAll();
     }
 
-    public User getUserById(long id) {
-        Optional<User> user = this.userRepository.findById(id);
-        if (user.isEmpty()) {
-            logger.error("getUserById : No user found with id {}", id);
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
-        }
-        return user.get();
-    }
-
     // TODO
     public User getUserByEmail(String email) {
         Optional<User> opt_user = this.userRepository.findByPrimaryMail(email);
@@ -58,36 +49,6 @@ public class UserService {
         return this.userRepository.save(user);
     }
 
-    public void updateUserSurname(long idUser, String surname) {
-        User user = getUserById(idUser);
-        user.setUserSurname(surname);
-        this.userRepository.save(user);
-    }
-
-    public void updateUserName(long idUser, String name) {
-        User user = getUserById(idUser);
-        user.setUserName(name);
-        this.userRepository.save(user);
-    }
-
-    public void updateUserPrimaryMail(long idUser, String primaryMail) {
-        User user = getUserById(idUser);
-        user.setPrimaryMail(primaryMail);
-        this.userRepository.save(user);
-    }
-
-    public void updateUserSecondaryMail(long idUser, String secondaryMail) {
-        User user = getUserById(idUser);
-        user.setSecondaryMail(secondaryMail);
-        this.userRepository.save(user);
-    }
-
-    public void updateUserPhoneNumber(long idUser, String phoneNumber) {
-        User user = getUserById(idUser);
-        user.setPhoneNumber(phoneNumber);
-        this.userRepository.save(user);
-    }
-
     public User updateUser(
             @PathVariable Long id,
             String userSurname,
@@ -117,8 +78,4 @@ public class UserService {
         }
         return this.userRepository.save(user.get());
     }
-
-    public Iterable<User> getPendingAccounts() {
-        return this.userRepository.findAllByPendingEquals(true);
-    }
 }

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

@@ -4,10 +4,14 @@ import static enseirb.myinpulse.model.ProjectDecisionValue.*;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import enseirb.myinpulse.model.*;
+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.UtilsService;
+import enseirb.myinpulse.service.database.AdministratorService;
-import enseirb.myinpulse.service.database.*;
+import enseirb.myinpulse.service.database.EntrepreneurService;
+import enseirb.myinpulse.service.database.ProjectService;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -17,8 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,22 +30,14 @@ public class AdminApiServiceTest {
     private static long administratorid;
     private static Administrator administrator;
     private static Entrepreneur entrepreneur;
-    private static Appointment appt;
-    private static Project p;
     @Autowired private AdminApiService adminApiService;
     @Autowired private ProjectService projectService;
-    @Autowired private EntrepreneurService entrepreneurService;
-    @Autowired private SectionCellService sectionCellService;
-    @Autowired private AppointmentService appointmentService;
-    @Autowired private UtilsService utilsService;
 
     @BeforeAll
     static void setup(
             @Autowired AdministratorService administratorService,
             @Autowired ProjectService projectService,
-            @Autowired EntrepreneurService entrepreneurService,
+            @Autowired EntrepreneurService entrepreneurService) {
-            @Autowired AppointmentService appoitmentService,
-            @Autowired SectionCellService sectionCellService) {
         administratorService.addAdministrator(
                 new Administrator(
                         "admin",
@@ -60,7 +54,6 @@ public class AdminApiServiceTest {
                                 "testAdmin@example.com",
                                 ""));
         administratorid = administrator.getIdUser();
-
         entrepreneur =
                 new Entrepreneur(
                         "JeSuisUnEntrepreneurDeCompet",
@@ -72,32 +65,14 @@ public class AdminApiServiceTest {
                         "info ofc",
                         false);
         entrepreneurService.addEntrepreneur(entrepreneur);
-
+        projectService.addNewProject(
-        Entrepreneur entrepreneur2 =
+                new Project(
-                new Entrepreneur(
+                        "sampleProjectAdminApiService",
-                        "GDProjets", "", "Entrepreneur2@inpulse.com", "", "", "", "info ofc", true);
-        entrepreneurService.addEntrepreneur(entrepreneur2);
-
-        p =
-                projectService.addNewProject(
-                        new Project(
-                                "sampleProjectAdminApiService",
-                                null,
-                                LocalDate.now(),
-                                ACTIVE,
-                                administratorService.getAdministratorByPrimaryMain(
-                                        "testAdminFull@example.com")));
-
-        entrepreneurService.updateEntrepreneurProjectParticipation(entrepreneur2.getIdUser(), p);
-
-        appt =
-                new Appointment(
                         null,
                         LocalDate.now(),
-                        LocalTime.now(),
+                        ACTIVE,
-                        LocalTime.now(),
+                        administratorService.getAdministratorByPrimaryMain(
-                        "Salle TD 03",
+                                "testAdminFull@example.com")));
-                        "Discussion importante");
     }
 
     private <T> List<T> IterableToList(Iterable<T> iterable) {
@@ -131,7 +106,7 @@ public class AdminApiServiceTest {
         List<Project> l = IterableToList(projects);
         assertEquals(1, l.size());
         Project p = l.getFirst();
-        assertEquals("sampleProjectAdminApiService", p.getProjectName());
+        assertEquals(p.getProjectName(), "sampleProjectAdminApiService");
     }
 
     @Test
@@ -205,7 +180,7 @@ public class AdminApiServiceTest {
     @Test
     void addProjectToAdmin() {
         assertEquals(0, administrator.getListProject().size());
-        Project p1 = new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
         this.adminApiService.addNewProject(p1);
         assertEquals(1, administrator.getListProject().size());
     }
@@ -214,7 +189,7 @@ public class AdminApiServiceTest {
     void addProjectToUser() {
         assertNull(entrepreneur.getProjectParticipation());
         Project p1 =
-                new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
+                new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
         this.adminApiService.addNewProject(p1);
         assertEquals(p1, entrepreneur.getProjectParticipation());
     }
@@ -227,7 +202,7 @@ public class AdminApiServiceTest {
         assertNull(e1.getProjectParticipation());
         assertNull(e2.getProjectParticipation());
         assertNull(e3.getProjectParticipation());
-        Project p1 = new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
         p1.updateListEntrepreneurParticipation(e1);
         p1.updateListEntrepreneurParticipation(e2);
         p1.updateListEntrepreneurParticipation(e3);
@@ -246,86 +221,4 @@ public class AdminApiServiceTest {
         this.adminApiService.addNewProject(p1);
         assertThrows(ResponseStatusException.class, () -> this.adminApiService.addNewProject(p2));
     }
-
-    // We could do a delete active project, but it's not really useful.
-    @Test
-    void deletePendingProject() {
-        int oldsize = IterableToList(this.adminApiService.getPendingProjects()).size();
-        Project p1 =
-                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
-        Project p2 = this.adminApiService.addNewProject(p1);
-
-        assertEquals(oldsize + 1, IterableToList(this.adminApiService.getPendingProjects()).size());
-        this.adminApiService.deleteProject(p2.getIdProject());
-
-        assertEquals(oldsize, IterableToList(this.adminApiService.getPendingProjects()).size());
-        for (int i = 0; i < oldsize; i++) {
-            assertNotEquals(
-                    p1.getIdProject(),
-                    IterableToList(this.adminApiService.getPendingProjects())
-                            .get(i)
-                            .getIdProject());
-        }
-    }
-
-    @Test
-    void getUpcommingAppointmentUnkwnownUser() {
-        assertThrows(
-                ResponseStatusException.class,
-                () -> {
-                    Iterable<Appointment> a =
-                            this.adminApiService.getUpcomingAppointments(
-                                    "entrepreneur-inexistent@mail.fr");
-                });
-    }
-
-    @Test
-    void getUpcommingAppointmentNoProject() {
-        assertThrows(
-                ResponseStatusException.class,
-                () -> {
-                    Iterable<Appointment> a =
-                            this.adminApiService.getUpcomingAppointments(
-                                    "Entrepreneur@inpulse.com");
-                });
-    }
-
-    @Test
-    void getUpcommingAppointmentEmpty() {
-        Iterable<Appointment> a =
-                this.adminApiService.getUpcomingAppointments("Entrepreneur2@inpulse.com");
-        assertEquals(0, IterableToList(a).size());
-    }
-
-    @Test
-    void validateEntrepreneurAccount() {
-        assertTrue(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending());
-        assertEquals(2, IterableToList(adminApiService.getPendingUsers()).size());
-        adminApiService.validateEntrepreneurAccount(entrepreneur.getIdUser(), "");
-        assertFalse(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending());
-        assertEquals(1, IterableToList(adminApiService.getPendingUsers()).size());
-    }
-
-    @Test
-    void testCreateApptRepport() {
-        System.err.println(appt.getIdAppointment());
-        SectionCell s =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(null, 1L, "jaja", LocalDateTime.now(), p));
-        appointmentService.addNewAppointment(appt);
-
-        appointmentService.updateAppointmentListSectionCell(appt.getIdAppointment(), s);
-        projectService.updateProjectListSectionCell(p.getIdProject(), s);
-        this.adminApiService.createAppointmentReport(
-                appt.getIdAppointment(),
-                new Report(null, "je rapporte de fou"),
-                "testAdminFull@example.com");
-    }
-
-    @Test
-    void testSetAdmin() {
-        assertFalse(utilsService.isAnAdmin(entrepreneur.getPrimaryMail()));
-        adminApiService.setAdmin(entrepreneur.getIdUser(), "");
-        assertTrue(utilsService.isAnAdmin(entrepreneur.getPrimaryMail()));
-    }
 }

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

@@ -1,324 +0,0 @@
-package enseirb.myinpulse;
-
-import static enseirb.myinpulse.model.ProjectDecisionValue.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import enseirb.myinpulse.model.*;
-import enseirb.myinpulse.service.EntrepreneurApiService;
-import enseirb.myinpulse.service.database.*;
-
-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.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@SpringBootTest
-@Transactional
-public class EntrepreneurApiServiceTest {
-    private static Entrepreneur entrepreneur;
-    private static Project project;
-    private static Iterable<SectionCell> sectionCells2;
-    private static Iterable<SectionCell> sectionCells3;
-    @Autowired private EntrepreneurApiService entrepreneurApiService;
-    @Autowired private EntrepreneurService entrepreneurService;
-    @Autowired private ProjectService projectService;
-    @Autowired private SectionCellService sectionCellService;
-    @Autowired private AnnotationService annotationService;
-    @Autowired private AppointmentService appointmentService;
-
-    @BeforeAll
-    static void setup(
-            @Autowired EntrepreneurService entrepreneurService,
-            @Autowired ProjectService projectService,
-            @Autowired SectionCellService sectionCellService) {
-        entrepreneur =
-                entrepreneurService.addEntrepreneur(
-                        new Entrepreneur(
-                                "entre",
-                                "preneur",
-                                "entrepreneur@mail.fr",
-                                "entrepreneur2@mail.fr",
-                                "01 45 71 25 48",
-                                "ENSEIRB",
-                                "Info",
-                                false));
-        entrepreneurService.addEntrepreneur(
-                new Entrepreneur(
-                        "entre2",
-                        "preneur2",
-                        "testentrepreneur@mail.fr",
-                        "testentrepreneur2@mail.fr",
-                        "",
-                        "ENSEGID",
-                        "",
-                        true));
-        project =
-                projectService.addNewProject(
-                        new Project("Project", null, LocalDate.now(), ACTIVE, null, entrepreneur));
-        entrepreneurService.updateEntrepreneurProjectProposed(entrepreneur.getIdUser(), project);
-        entrepreneurService.updateEntrepreneurProjectParticipation(
-                entrepreneur.getIdUser(), project);
-        SectionCell s1 =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(
-                                null,
-                                2L,
-                                "contenu très intéressant",
-                                LocalDateTime.now(),
-                                project));
-
-        SectionCell s2 =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(
-                                null,
-                                3L,
-                                "contenu très intéressant2",
-                                LocalDateTime.now(),
-                                project));
-        sectionCells2 = sectionCellService.getSectionCellsByProject(project, 2L);
-        sectionCells3 = sectionCellService.getSectionCellsByProject(project, 3L);
-    }
-
-    private <T> List<T> IterableToList(Iterable<T> iterable) {
-        List<T> l = new ArrayList<>();
-        iterable.forEach(l::add);
-        return l;
-    }
-
-    @Test
-    void editValidSectionCell() {
-        System.out.println("editValidSectionCell : ");
-        SectionCell modified = IterableToList(sectionCells2).getLast();
-        this.sectionCellService.updateSectionCellListAnnotation(
-                modified.getIdSectionCell(),
-                annotationService.addNewAnnotation(new Annotation(null, "oui j'annote encore")));
-        this.sectionCellService.updateSectionCellListAppointment(
-                modified.getIdSectionCell(),
-                appointmentService.addNewAppointment(
-                        new Appointment(
-                                null,
-                                LocalDate.now(),
-                                LocalTime.now(),
-                                LocalTime.of(2, 5),
-                                "TD14",
-                                "clément s'est plaint")));
-        entrepreneurApiService.editSectionCell(
-                modified.getIdSectionCell(), "modified content", "entrepreneur@mail.fr");
-        // We get the data from the database again.
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
-        assertEquals("modified content", s.getContentSectionCell());
-        assertEquals(
-                2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
-    }
-
-    @Test
-    void editInvalidSectionCell() {
-        System.out.println("editInvalidSectionCell : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () ->
-                        entrepreneurApiService.editSectionCell(
-                                -1L, "should not be modified", "entrepreneur@mail.fr"));
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
-        assertEquals("contenu très intéressant", s.getContentSectionCell());
-        assertEquals(
-                1, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
-    }
-
-    @Test
-    void editSectionCellInvalidAccess() {
-        System.out.println("editSectionCellInvalidAccess : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () ->
-                        entrepreneurApiService.editSectionCell(
-                                IterableToList(sectionCells3).getFirst().getIdSectionCell(),
-                                "should not be modified",
-                                "testentrepreneur@mail.fr"));
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getFirst();
-
-        assertEquals("contenu très intéressant", s.getContentSectionCell());
-    }
-
-    @Test
-    void editNullSectionCell() {
-        System.out.println("editNullSectionCell : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () ->
-                        entrepreneurApiService.editSectionCell(
-                                null, "modified content", "entrepreneur@mail.fr"));
-    }
-
-    @Test
-    void removeValidSectionCell() {
-        System.out.println("removeValidSectionCell : ");
-        SectionCell tmpCell =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(
-                                null, 2L, "contenu temporaire", LocalDateTime.now(), project));
-        assertEquals(
-                2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
-        assertDoesNotThrow(
-                () ->
-                        entrepreneurApiService.removeSectionCell(
-                                tmpCell.getIdSectionCell(), "entrepreneur@mail.fr"));
-        assertEquals(
-                tmpCell.getIdReference(),
-                IterableToList(sectionCellService.getSectionCellsByProject(project, -1L))
-                        .getLast()
-                        .getIdReference());
-    }
-
-    @Test
-    void removeInvalidSectionCell() {
-        System.out.println("removeInvalidSectionCell : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.removeSectionCell(-1L, "entrepreneur@mail.fr"));
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getFirst();
-
-        assertEquals("contenu très intéressant", s.getContentSectionCell());
-    }
-
-    @Test
-    void removeNullSectionCell() {
-        System.out.println("removeNullSectionCell : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.removeSectionCell(null, "entrepreneur@mail.fr"));
-    }
-
-    @Test
-    void addValidSectionCell() {
-        System.out.println("addValidSectionCell : ");
-        SectionCell added =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(null, 2L, "contenu ajouté", LocalDateTime.now(), project));
-        added.updateListAnnotation(
-                annotationService.addNewAnnotation(new Annotation(null, "oui j'annote")));
-        added.updateAppointmentSectionCell(
-                appointmentService.addNewAppointment(
-                        new Appointment(
-                                null,
-                                LocalDate.now(),
-                                LocalTime.now(),
-                                LocalTime.of(2, 5),
-                                "TD15",
-                                "clément qui se plaint")));
-        entrepreneurApiService.addSectionCell(added, "entrepreneur@mail.fr");
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
-        assertEquals("contenu ajouté", s.getContentSectionCell());
-        assertEquals(
-                2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
-    }
-
-    @Test
-    void addSectionCellInvalidAccess() {
-        System.out.println("addSectionCellInvalidAccess : ");
-        SectionCell added =
-                new SectionCell(null, 2L, "contenu ajouté", LocalDateTime.now(), project);
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.addSectionCell(added, "fauxentrepreneur@mail.fr"));
-        SectionCell s =
-                IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
-        assertEquals(
-                1, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
-        assertEquals("contenu très intéressant", s.getContentSectionCell());
-    }
-
-    @Test
-    void addInvalidSectionCell() {
-        System.out.println("addInvalidSectionCell : ");
-        SectionCell added =
-                sectionCellService.addNewSectionCell(
-                        new SectionCell(null, -1L, "contenu ajouté", LocalDateTime.now(), project));
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.addSectionCell(added, "entrepreneur@mail.fr"));
-    }
-
-    @Test
-    void addNullSectionCell() {
-        System.out.println("addNullSectionCell : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.addSectionCell(null, "entrepreneur@mail.fr"));
-    }
-
-    @Test
-    void requestValidProject() {
-        System.out.println("requestValidProject : ");
-        int nb_project = IterableToList(this.projectService.getAllProjects()).size();
-        Project validProject =
-                new Project("validProject", null, LocalDate.now(), ACTIVE, null, entrepreneur);
-        validProject.updateListEntrepreneurParticipation(
-                IterableToList(entrepreneurService.getAllEntrepreneurs()).getLast());
-        validProject.updateListSectionCell((IterableToList(sectionCells2).getFirst()));
-        entrepreneurApiService.requestNewProject(validProject, "entrepreneur@mail.fr");
-        assertEquals(PENDING, validProject.getProjectStatus());
-        assertEquals((nb_project + 1), IterableToList(this.projectService.getAllProjects()).size());
-        assertEquals(
-                IterableToList(entrepreneurService.getAllEntrepreneurs()).getLast(),
-                validProject.getListEntrepreneurParticipation().getLast());
-        assertEquals(
-                IterableToList(sectionCells2).getFirst().getIdSectionCell(),
-                validProject.getListSectionCell().getFirst().getIdSectionCell());
-    }
-
-    @Test
-    void requestNullProject() {
-        System.out.println("requestNullProject : ");
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.requestNewProject(null, "entrepreneur@mail.fr"));
-    }
-
-    @Test
-    void createNewValidAccount() {
-        System.out.println("createNewValidAccount : ");
-        int nb_entrepreneur = IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size();
-        Entrepreneur newEntrepreneur =
-                new Entrepreneur(
-                        "New",
-                        "Test",
-                        "mailtest@test.fr",
-                        "mailtest2@test.fr",
-                        "0888888888",
-                        "ENSEIRB",
-                        "ELEC",
-                        false,
-                        true);
-        assertDoesNotThrow(() -> entrepreneurApiService.createAccount(newEntrepreneur));
-        assertEquals(
-                (nb_entrepreneur + 1),
-                IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size());
-    }
-
-    @Test
-    void createExistingAccount() {
-        System.out.println("createExistingAccount : ");
-        int nb_entrepreneur = IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size();
-        assertThrows(
-                ResponseStatusException.class,
-                () -> entrepreneurApiService.createAccount(entrepreneur));
-        assertEquals(
-                nb_entrepreneur,
-                IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size());
-    }
-}

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

@@ -1,986 +0,0 @@
-package enseirb.myinpulse;
-
-import static enseirb.myinpulse.model.ProjectDecisionValue.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
-
-import enseirb.myinpulse.model.*;
-import enseirb.myinpulse.service.SharedApiService;
-import enseirb.myinpulse.service.database.*;
-import enseirb.myinpulse.service.UtilsService;
-
-import com.itextpdf.text.DocumentException;
-import org.junit.jupiter.api.BeforeAll; // Use BeforeAll for static setup
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test; // Keep this import
-import org.mockito.MockitoAnnotations;
-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 org.springframework.http.HttpStatus;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-// Helper to easily convert Iterable to List
-class TestUtils {
-    static <T> List<T> toList(Iterable<T> iterable) {
-        List<T> list = new ArrayList<>();
-        if (iterable != null) {
-            iterable.forEach(list::add);
-        }
-        return list;
-    }
-}
-
-@SpringBootTest
-@Transactional // Each @Test method runs in a transaction that is rolled back
-public class SharedApiServiceTest {
-
-    @Autowired private SharedApiService sharedApiService;
-
-    // Autowire actual services to use in setup and test verification
-    @Autowired private ProjectService projectService;
-    @Autowired private AdministratorService administratorService;
-    @Autowired private EntrepreneurService entrepreneurService;
-    @Autowired private SectionCellService sectionCellService;
-    @Autowired private AppointmentService appointmentService;
-
-    // Mock UtilsService to control authorization logic
-    @MockitoBean private UtilsService mockUtilsService;
-
-    // Static variables for data created once before all tests
-    private static Project staticAuthorizedProject;
-    private static String staticAuthorizedMail;
-    private static Administrator staticAuthorizedAdmin;
-
-    private static Project staticUnauthorizedProject;
-    private static String staticUnauthorizedMail;
-
-    // --- Static Setup (Runs once before all tests) ---
-    // Use @BeforeAll static method with injected services
-    @BeforeAll
-    static void setupOnce(
-            @Autowired AdministratorService administratorService,
-            @Autowired ProjectService projectService,
-            @Autowired EntrepreneurService entrepreneurService) {
-
-        // Create and Save core test data here using injected services
-        staticAuthorizedAdmin =
-                administratorService.addAdministrator(getTestAdmin("static_authorized_admin"));
-        staticAuthorizedMail = staticAuthorizedAdmin.getPrimaryMail();
-
-        staticUnauthorizedProject =
-                projectService.addNewProject(
-                        getTestProject(
-                                "static_unauthorized_project",
-                                administratorService.addAdministrator(
-                                        getTestAdmin("static_unauthorized_admin"))));
-        staticUnauthorizedMail =
-                administratorService
-                        .addAdministrator(getTestAdmin("static_unauthorized_user"))
-                        .getPrimaryMail(); // User who is NOT admin of the unauthorized project
-
-        staticAuthorizedProject =
-                projectService.addNewProject(
-                        getTestProject("static_authorized_project", staticAuthorizedAdmin));
-
-        // Link a static entrepreneur to the authorized project if needed for some tests
-        // Entrepreneur staticLinkedEntrepreneur =
-        // entrepreneurService.addEntrepreneur(getTestEntrepreneur("static_linked_entrepreneur"));
-        // staticAuthorizedProject.updateListEntrepreneurParticipation(staticLinkedEntrepreneur);
-        // projectService.addNewProject(staticAuthorizedProject); // Re-save the project after
-        // updating lists
-    }
-
-    // --- Per-Test Setup (Runs before each test method) ---
-    @BeforeEach
-    void setupForEach() {
-        // Reset mock expectations before each test
-        MockitoAnnotations.openMocks(
-                this); // Needed for mocks if not using @ExtendWith(MockitoExtension.class)
-
-        // --- Configure the mock UtilsService based on the actual authorization rules ---
-
-        // Rule: Any admin can check any project.
-        // Assuming staticAuthorizedMail is an admin:
-        when(mockUtilsService.isAllowedToCheckProject(eq(staticAuthorizedMail), anyLong()))
-                .thenReturn(true); // Admin allowed for ANY project ID
-
-        // Rule: An entrepreneur can only check their own stuff.
-        // Assuming staticUnauthorizedMail is an entrepreneur NOT linked to staticAuthorizedProject
-        // or staticUnauthorizedProject:
-        when(mockUtilsService.isAllowedToCheckProject(eq(staticUnauthorizedMail), anyLong()))
-                .thenReturn(false); // Unauthorized entrepreneur NOT allowed for ANY project ID by
-        // default
-
-        // Add more specific mock setups here if needed for entrepreneur tests
-        // E.g., If you have a test specifically for an entrepreneur accessing THEIR project:
-        // Entrepreneur testEntrepreneur =
-        // entrepreneurService.addEntrepreneur(getTestEntrepreneur("specific_linked_entrepreneur"));
-        // Project linkedProject =
-        // projectService.addNewProject(getTestProject("specific_linked_project",
-        // staticAuthorizedAdmin));
-        // // Link testEntrepreneur to linkedProject in the database setup...
-        // when(mockUtilsService.isAllowedToCheckProject(eq(testEntrepreneur.getPrimaryMail()),
-        // eq(linkedProject.getIdProject()))).thenReturn(true);
-        // when(mockUtilsService.isAllowedToCheckProject(eq(testEntrepreneur.getPrimaryMail()),
-        // anyLong())).thenReturn(false); // Deny for other projects
-
-    }
-
-    // --- Helper Methods (Can remain non-static or static as needed) ---
-    private static Administrator getTestAdmin(String name) {
-        return new Administrator(
-                name + "_surname",
-                name,
-                name + "@example.com",
-                "secondary_" + name + "@example.com",
-                "0123456789");
-    }
-
-    private static Entrepreneur getTestEntrepreneur(String name) {
-        return new Entrepreneur(
-                name + "_surname",
-                name,
-                name + "@example.com",
-                "secondary_" + name + "@example.com",
-                "0123456789",
-                "Test School",
-                "Test Course",
-                false);
-    }
-
-    private static Project getTestProject(String name, Administrator admin) {
-        Project project = new Project(name, null, LocalDate.now(), ACTIVE, admin);
-        return project;
-    }
-
-    private static SectionCell getTestSectionCell(
-            Project project, Long sectionId, String content, LocalDateTime date) {
-        SectionCell sectionCell = new SectionCell();
-        sectionCell.setProjectSectionCell(project);
-        sectionCell.setSectionId(sectionId);
-        sectionCell.setContentSectionCell(content);
-        sectionCell.setModificationDate(date);
-        return sectionCell;
-    }
-
-    private static Appointment getTestAppointment(
-            LocalDate date,
-            LocalTime time,
-            LocalTime duration,
-            String place,
-            String subject,
-            List<SectionCell> sectionCells,
-            Report report) {
-        Appointment appointment = new Appointment();
-        appointment.setAppointmentDate(date);
-        appointment.setAppointmentTime(time);
-        appointment.setAppointmentDuration(duration);
-        appointment.setAppointmentPlace(place);
-        appointment.setAppointmentSubject(subject);
-
-        if (sectionCells != null) {
-            sectionCells.forEach(appointment::updateListSectionCell);
-        }
-
-        if (report != null) {
-            appointment.setAppointmentReport(report);
-            report.setAppointmentReport(appointment);
-        }
-
-        return appointment;
-    }
-
-    private static Report getTestReport(String content) {
-        Report report = new Report();
-        report.setReportContent(content);
-        return report;
-    }
-
-    /*
-     *        _____         _   ____            _   _              ____     _ _
-     *       |_   _|__  ___| |_/ ___|  ___  ___| |_(_) ___  _ __  / ___|___| | |
-     *         | |/ _ \/ __| __\___ \ / _ \/ __| __| |/ _ \| '_ \| |   / _ \ | |
-     *         | |  __/\__ \ |_ ___) |  __/ (__| |_| | (_) | | | | |__|  __/ | |
-     *         |_|\___||___/\__|____/ \___|\___|\__|_|\___/|_| |_|\____\___|_|_|
-     */
-
-    /*
-     * Tests retrieving section cells for a specific project and section ID before a given date
-     * when the user is authorized but no matching cells exist.
-     * Verifies that an empty list is returned.
-     */
-    @Test
-    void testGetSectionCells_Authorized_NotFound() {
-        // Arrange: No specific section cells needed for this test, rely on clean @BeforeEach state
-        Long targetSectionId = 1L;
-        LocalDateTime dateFilter = LocalDateTime.now().plusDays(1);
-
-        // Act
-        Iterable<SectionCell> result =
-                sharedApiService.getSectionCells(
-                        staticAuthorizedProject.getIdProject(),
-                        targetSectionId,
-                        dateFilter.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")),
-                        staticAuthorizedMail);
-
-        List<SectionCell> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertTrue(resultList.isEmpty());
-    }
-
-    /*
-     * Tests retrieving section cells when the user is not authorized for the project.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    @Test
-    void testGetSectionCells_Unauthorized() {
-        // Arrange: mockUtilsService configured in BeforeEach
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getSectionCells(
-                                    staticAuthorizedProject
-                                            .getIdProject(), // Project static user is not
-                                    // authorized for
-                                    1L,
-                                    LocalDateTime.now()
-                                            .format(
-                                                    DateTimeFormatter.ofPattern(
-                                                            "yyyy-MM-dd HH:mm")),
-                                    staticUnauthorizedMail); // Static unauthorized user mail
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-     * Tests retrieving all section cells for a project when the user is authorized
-     * but the project has no section cells.
-     * Verifies that an empty list is returned.
-     */
-    @Test
-    void testGetAllSectionCells_Authorized_NoCells() {
-        // Arrange: staticAuthorizedProject has no section cells initially in BeforeAll
-        // Act
-        Iterable<SectionCell> result =
-                sharedApiService.getAllSectionCells(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        List<SectionCell> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertTrue(resultList.isEmpty());
-    }
-
-    /*
-     * Tests retrieving all section cells when the user is not authorized for the project.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    @Test
-    void testGetAllSectionCells_Unauthorized() {
-        // Arrange: mockUtilsService configured in BeforeEach
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getAllSectionCells(
-                                    staticAuthorizedProject.getIdProject(), staticUnauthorizedMail);
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-     *        _____         _    ____      _   ____            _           _   ____
-     *       |_   _|__  ___| |_ / ___| ___| |_|  _ \ _ __ ___ (_) ___  ___| |_| __ ) _   _
-     *         | |/ _ \/ __| __| |  _ / _ \ __| |_) | '__/ _ \| |/ _ \/ __| __|  _ \| | | |
-     *         | |  __/\__ \ |_| |_| |  __/ |_|  __/| | | (_) | |  __/ (__| |_| |_) | |_| |
-     *        _|_|\___||___/\__|\____|\___|\__|_|   |_|  \___// |\___|\___|\__|____/ \__, |
-     *       |_ _|  _ \                                     |__/                     |___/
-     *        | || | | |
-     *        | || |_| |
-     *       |___|____/
-     */
-
-    /*
-     * Tests retrieving entrepreneurs linked to a project when the user is authorized
-     * but no entrepreneurs are linked.
-     * Verifies that an empty list is returned.
-     */
-    @Test
-    void testGetEntrepreneursByProjectId_Authorized_NotFound() {
-        // Arrange: staticAuthorizedProject has no entrepreneurs linked initially in BeforeAll
-        // Act
-        Iterable<Entrepreneur> result =
-                sharedApiService.getEntrepreneursByProjectId(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        List<Entrepreneur> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertTrue(resultList.isEmpty());
-    }
-
-    /*
-     * Tests retrieving entrepreneurs linked to a project when the user is not authorized.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    @Test
-    void testGetEntrepreneursByProjectId_Unauthorized() {
-        // Arrange: mockUtilsService configured in BeforeEach
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getEntrepreneursByProjectId(
-                                    staticAuthorizedProject.getIdProject(), staticUnauthorizedMail);
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-     *    _____         _    ____      _      _       _           _       ____
-     *   |_   _|__  ___| |_ / ___| ___| |_   / \   __| |_ __ ___ (_)_ __ | __ ) _   _
-     *     | |/ _ \/ __| __| |  _ / _ \ __| / _ \ / _` | '_ ` _ \| | '_ \|  _ \| | | |
-     *     | |  __/\__ \ |_| |_| |  __/ |_ / ___ \ (_| | | | | | | | | | | |_) | |_| |
-     *    _|_|\___||___/\__|\____|\___|\__/_/   \_\__,_|_| |_| |_|_|_| |_|____/ \__, |
-     *   |_ _|  _ \                                                             |___/
-     *    | || | | |
-     *    | || |_| |
-     *   |___|____/
-     *
-     */
-
-    /*
-     * Tests retrieving appointments linked to a project's section cells when the user is authorized
-     * but no such appointments exist.
-     * Verifies that an empty list is returned.
-     */
-    @Test
-    void testGetAppointmentsByProjectId_Authorized_NotFound() {
-        // Arrange: staticAuthorizedProject has no linked section cells or appointments initially
-        // Act
-        Iterable<Appointment> result =
-                sharedApiService.getAppointmentsByProjectId(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        List<Appointment> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertTrue(resultList.isEmpty());
-    }
-
-    /*
-     * Tests retrieving the administrator linked to a project when the user is authorized
-     * and an administrator is linked.
-     * Verifies that the correct administrator is returned.
-     */
-    // Tests getAdminByProjectId
-    @Test
-    void testGetAdminByProjectId_Authorized_Found() {
-        // Arrange: staticAuthorizedProject is created with staticAuthorizedAdmin in BeforeAll
-        // Act
-        Administrator result =
-                sharedApiService.getAdminByProjectId(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        // Assert
-        assertNotNull(result);
-        assertEquals(staticAuthorizedAdmin.getIdUser(), result.getIdUser());
-    }
-
-    /*
-     * Tests retrieving the administrator linked to a project when the user is not authorized.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    @Test
-    void testGetAdminByProjectId_Unauthorized() {
-        // Arrange: mockUtilsService configured in BeforeEach
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getAdminByProjectId(
-                                    staticAuthorizedProject.getIdProject(), staticUnauthorizedMail);
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-     *    _____         _
-     *   |_   _|__  ___| |_
-     *     | |/ _ \/ __| __|
-     *     | |  __/\__ \ |_
-     *     |_|\___||___/\__|        _       _                            _
-     *      / \   _ __  _ __   ___ (_)_ __ | |_ ___ _ __ ___   ___ _ __ | |_ ___
-     *     / _ \ | '_ \| '_ \ / _ \| | '_ \| __/ _ \ '_ ` _ \ / _ \ '_ \| __/ __|
-     *    / ___ \| |_) | |_) | (_) | | | | | ||  __/ | | | | |  __/ | | | |_\__ \
-     *   /_/   \_\ .__/| .__/ \___/|_|_| |_|\__\___|_| |_| |_|\___|_| |_|\__|___/
-     *           |_|   |_|
-     */
-
-    /*
-     * Tests retrieving appointments linked to a project's section cells when the user is not authorized.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    @Test
-    void testGetAppointmentsByProjectId_Unauthorized() {
-        // Arrange: mockUtilsService configured in BeforeEach
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getAppointmentsByProjectId(
-                                    staticAuthorizedProject.getIdProject(), staticUnauthorizedMail);
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-     * Tests creating a new appointment request when the user is authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that the appointment and its relationships are saved correctly in the database.
-     */
-    // Tests createAppointmentRequest
-    @Test
-    // Commenting out failing test
-    void testCreateAppointmentRequest_Authorized_Success() {
-        // Arrange: Create transient appointment linked to a cell in the static authorized project
-        LocalDate date = LocalDate.parse("2026-01-01");
-        LocalTime time = LocalTime.parse("10:00:00");
-        LocalTime duration = LocalTime.parse("00:30:00");
-        String place = "Meeting Room Integrated";
-        String subject = "Discuss Project Integrated";
-
-        SectionCell linkedCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject,
-                                0L,
-                                "Related Section Content Integrated",
-                                LocalDateTime.now()));
-
-        Report newReport = null; // getTestReport(reportContent); // Uses no-arg constructor
-
-        Appointment newAppointment =
-                getTestAppointment(
-                        date, time, duration, place, subject, List.of(linkedCell), newReport);
-
-        // mockUtilsService is configured in BeforeEach to allow staticAuthorizedMail for
-        // staticAuthorizedProject
-
-        // Act
-        // Allow the service method to call the actual appointmentService.addNewAppointment
-        assertDoesNotThrow(
-                () ->
-                        sharedApiService.createAppointmentRequest(
-                                newAppointment, staticAuthorizedMail));
-
-        // Assert: Retrieve the appointment from the DB and verify it and its relationships were
-        // saved
-        // We find it by looking for appointments linked to the authorized project's cells
-        Iterable<SectionCell> projectCells =
-                sectionCellService.getSectionCellsByProject(
-                        staticAuthorizedProject, linkedCell.getSectionId()); // Fetch relevant cells
-        List<Appointment> projectAppointmentsList = new ArrayList<>();
-        projectCells.forEach(
-                cell ->
-                        projectAppointmentsList.addAll(
-                                sectionCellService.getAppointmentsBySectionCellId(
-                                        cell.getIdSectionCell()))); // Get appointments for
-        // those cells
-
-        Optional<Appointment> createdAppointmentOpt =
-                projectAppointmentsList.stream()
-                        .filter(
-                                a ->
-                                        a.getAppointmentDate().equals(date)
-                                                && a.getAppointmentTime().equals(time)
-                                                && a.getAppointmentPlace().equals(place)
-                                                && a.getAppointmentSubject().equals(subject))
-                        .findFirst();
-
-        assertTrue(createdAppointmentOpt.isPresent());
-        Appointment createdAppointment = createdAppointmentOpt.get();
-
-        // FIX: Corrected bidirectional link check
-        assertEquals(1, createdAppointment.getAppointmentListSectionCell().size());
-        assertTrue(
-                createdAppointment.getAppointmentListSectionCell().stream()
-                        .anyMatch(
-                                sc -> sc.getIdSectionCell().equals(linkedCell.getIdSectionCell())));
-
-        List<Appointment> appointmentsLinkedToCell =
-                TestUtils.toList(
-                        sectionCellService.getAppointmentsBySectionCellId(
-                                linkedCell.getIdSectionCell()));
-        assertTrue(
-                appointmentsLinkedToCell.stream()
-                        .anyMatch(
-                                a ->
-                                        a.getIdAppointment()
-                                                .equals(createdAppointment.getIdAppointment())));
-    }
-
-    /*
-     * Tests creating a new appointment request when the user is not authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that an Unauthorized ResponseStatusException is thrown and the appointment is not saved.
-     */
-    @Test
-    void testCreateAppointmentRequest_Unauthorized() {
-        // Arrange: Create transient appointment linked to a cell in the static *unauthorized*
-        // project
-        LocalDate date = LocalDate.parse("2026-01-01");
-        LocalTime time = LocalTime.parse("10:00:00");
-        LocalTime duration = LocalTime.parse("00:30:00");
-        String place = "Meeting Room";
-        String subject = "Discuss Project";
-        String reportContent = "Initial Report";
-
-        SectionCell linkedCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticUnauthorizedProject,
-                                1L,
-                                "Related Section Content",
-                                LocalDateTime.now()));
-
-        Report newReport = getTestReport(reportContent);
-        Appointment newAppointment =
-                getTestAppointment(
-                        date, time, duration, place, subject, List.of(linkedCell), newReport);
-
-        // mockUtilsService is configured in BeforeEach to deny staticUnauthorizedMail for
-        // staticUnauthorizedProject
-
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.createAppointmentRequest(
-                                    newAppointment,
-                                    staticUnauthorizedMail); // Unauthorized user mail
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-
-             _____     _ _          _
-            |  ___|_ _(_) | ___  __| |
-            | |_ / _` | | |/ _ \/ _` |
-            |  _| (_| | | |  __/ (_| |
-            |_|  \__,_|_|_|\___|\__,_|
-             _____ _____ ____ _____
-            |_   _| ____/ ___|_   _|
-              | | |  _| \___ \ | |
-              | | | |___ ___) || |
-              |_| |_____|____/ |_|
-
-    */
-
-    /* these tests fail because of the use of mockito's eq(),
-     *  and since thee instances are technically not the same as
-     *  as the classes used to turn them into persistant data
-     * (for e.g id are set by DB) so I have to add some equal functions
-     * probably and look at peer tests to see what they have done but for now
-     * I pushed this half-human code.
-     */
-
-    // --- Test Methods (Use static data from @BeforeAll where possible) ---
-
-    /*
-     * Tests retrieving section cells for a specific project and section ID before a given date
-     * when the user is authorized and matching cells exist.
-     * Verifies that only the correct cells are returned.
-     */
-    /*@Test*/
-    // Commenting out failing test
-    void testGetSectionCells_Authorized_Found() {
-        // Arrange: Create specific SectionCells for this test scenario
-        Long targetSectionId = 1L;
-        LocalDateTime dateFilter = LocalDateTime.now().plusDays(1);
-
-        sectionCellService.addNewSectionCell(
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Old Content",
-                        LocalDateTime.now().minusDays(2)));
-        SectionCell recentCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject,
-                                targetSectionId,
-                                "Recent Content",
-                                LocalDateTime.now().minusDays(1)));
-        sectionCellService.addNewSectionCell(
-                getTestSectionCell(
-                        staticAuthorizedProject, 2L, "Other Section", LocalDateTime.now()));
-        sectionCellService.addNewSectionCell(
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Future Content",
-                        LocalDateTime.now().plusDays(2)));
-
-        // Act
-        Iterable<SectionCell> result =
-                sharedApiService.getSectionCells(
-                        staticAuthorizedProject.getIdProject(), // Use static project ID
-                        targetSectionId,
-                        dateFilter.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")),
-                        staticAuthorizedMail); // Use static authorized mail
-
-        List<SectionCell> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(1, resultList.size());
-        assertEquals(recentCell.getIdSectionCell(), resultList.get(0).getIdSectionCell());
-    }
-
-    /*
-     * Tests retrieving the most recent section cell for each unique idReference
-     * within a project when the user is authorized and cells exist.
-     * Verifies that only the latest version of each referenced cell is returned.
-     */
-    // Tests getAllSectionCells
-    /*@Test*/
-    // Commenting out failing test
-    void testGetAllSectionCells_Authorized_FoundLatest() {
-        // Arrange: Create specific SectionCells for this test
-        Long refId1 = 101L;
-        Long refId2 = 102L;
-
-        SectionCell tempOldCell1 =
-                getTestSectionCell(
-                        staticAuthorizedProject, 1L, "Ref1 Old", LocalDateTime.now().minusDays(3));
-        tempOldCell1.setIdReference(refId1);
-        final SectionCell oldCell1 = sectionCellService.addNewSectionCell(tempOldCell1);
-
-        SectionCell tempNewerCell1 =
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        1L,
-                        "Ref1 Newer",
-                        LocalDateTime.now().minusDays(2));
-        tempNewerCell1.setIdReference(refId1);
-        final SectionCell newerCell1 = sectionCellService.addNewSectionCell(tempNewerCell1);
-
-        SectionCell tempOldCell2 =
-                getTestSectionCell(
-                        staticAuthorizedProject, 2L, "Ref2 Old", LocalDateTime.now().minusDays(1));
-        tempOldCell2.setIdReference(refId2);
-        final SectionCell oldCell2 = sectionCellService.addNewSectionCell(tempOldCell2);
-
-        SectionCell tempNewerCell2 =
-                getTestSectionCell(staticAuthorizedProject, 2L, "Ref2 Newer", LocalDateTime.now());
-        tempNewerCell2.setIdReference(refId2);
-        final SectionCell newerCell2 = sectionCellService.addNewSectionCell(tempNewerCell2);
-
-        Project otherProject =
-                projectService.addNewProject(
-                        getTestProject(
-                                "other_project_for_cell_test",
-                                administratorService.addAdministrator(
-                                        getTestAdmin("other_admin_cell_test"))));
-        SectionCell tempOtherProjectCell =
-                getTestSectionCell(otherProject, 1L, "Other Project Cell", LocalDateTime.now());
-        tempOtherProjectCell.setIdReference(103L);
-        final SectionCell otherProjectCell =
-                sectionCellService.addNewSectionCell(tempOtherProjectCell);
-
-        // Act
-        Iterable<SectionCell> result =
-                sharedApiService.getAllSectionCells(
-                        staticAuthorizedProject.getIdProject(), // Use static project ID
-                        staticAuthorizedMail); // Use static authorized mail
-
-        List<SectionCell> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(2, resultList.size()); // Expect 2 cells (one per idReference)
-
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(newerCell1.getIdSectionCell())));
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(newerCell2.getIdSectionCell())));
-
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(oldCell1.getIdSectionCell())));
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(oldCell2.getIdSectionCell())));
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(otherProjectCell.getIdSectionCell())));
-    }
-
-    /*
-     * Tests retrieving entrepreneurs linked to a project when the user is authorized
-     * and entrepreneurs are linked.
-     * Verifies that the correct entrepreneurs are returned.
-     */
-    // Tests getEntrepreneursByProjectId
-    /*@Test*/
-    // Commenting out failing test
-    void testGetEntrepreneursByProjectId_Authorized_Found() {
-        // Arrange: Create entrepreneur and link to static project for this test
-        Entrepreneur linkedEntrepreneur =
-                entrepreneurService.addEntrepreneur(
-                        getTestEntrepreneur("linked_entrepreneur_test"));
-        // Fetch the static project to update its list
-        Project projectToUpdate =
-                projectService.getProjectById(staticAuthorizedProject.getIdProject());
-        projectToUpdate.updateListEntrepreneurParticipation(linkedEntrepreneur);
-        projectService.addNewProject(projectToUpdate); // Save the updated project
-
-        Entrepreneur otherEntrepreneur =
-                entrepreneurService.addEntrepreneur(getTestEntrepreneur("other_entrepreneur_test"));
-
-        // Act
-        Iterable<Entrepreneur> result =
-                sharedApiService.getEntrepreneursByProjectId(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        List<Entrepreneur> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(1, resultList.size());
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(e -> e.getIdUser().equals(linkedEntrepreneur.getIdUser())));
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(e -> e.getIdUser().equals(otherEntrepreneur.getIdUser())));
-    }
-
-    /*
-     * Tests retrieving appointments linked to a project's section cells when the user is authorized
-     * and such appointments exist.
-     * Verifies that the correct appointments are returned.
-     */
-    // Tests getAppointmentsByProjectId
-    /*@Test*/
-    // Commenting out failing test
-    void testGetAppointmentsByProjectId_Authorized_Found() {
-        // Arrange: Create specific SectionCells and Appointments for this test
-        SectionCell cell1 =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject, 1L, "Cell 1 Test", LocalDateTime.now()));
-        SectionCell cell2 =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject, 2L, "Cell 2 Test", LocalDateTime.now()));
-        Project otherProject =
-                projectService.addNewProject(
-                        getTestProject(
-                                "other_project_app_test",
-                                administratorService.addAdministrator(
-                                        getTestAdmin("other_admin_app_test"))));
-        SectionCell otherProjectCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                otherProject,
-                                1L,
-                                "Other Project Cell App Test",
-                                LocalDateTime.now()));
-
-        Appointment app1 =
-                getTestAppointment(
-                        LocalDate.now().plusDays(10),
-                        LocalTime.NOON,
-                        LocalTime.of(0, 30),
-                        "Place 1 App Test",
-                        "Subject 1 App Test",
-                        List.of(cell1),
-                        null);
-        Appointment savedApp1 = appointmentService.addNewAppointment(app1);
-
-        Appointment app2 =
-                getTestAppointment(
-                        LocalDate.now().plusDays(11),
-                        LocalTime.NOON.plusHours(1),
-                        LocalTime.of(1, 0),
-                        "Place 2 App Test",
-                        "Subject 2 App Test",
-                        List.of(cell1, cell2),
-                        null);
-        Appointment savedApp2 = appointmentService.addNewAppointment(app2);
-
-        Appointment otherApp =
-                getTestAppointment(
-                        LocalDate.now().plusDays(12),
-                        LocalTime.MIDNIGHT,
-                        LocalTime.of(0, 15),
-                        "Other Place App Test",
-                        "Other Subject App Test",
-                        List.of(otherProjectCell),
-                        null);
-        appointmentService.addNewAppointment(otherApp);
-
-        // Act
-        Iterable<Appointment> result =
-                sharedApiService.getAppointmentsByProjectId(
-                        staticAuthorizedProject.getIdProject(), // Use static project ID
-                        staticAuthorizedMail); // Use static authorized mail
-
-        List<Appointment> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(2, resultList.size());
-
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(a -> a.getIdAppointment().equals(savedApp1.getIdAppointment())));
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(a -> a.getIdAppointment().equals(savedApp2.getIdAppointment())));
-
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                a ->
-                                        a.getIdAppointment()
-                                                .equals(otherApp.getIdAppointment()))); // Ensure
-        // appointment from other project is not included
-    }
-
-    /*
-     * Tests generating a PDF report for an appointment when the user is authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that no authorization exception is thrown. (Note: File I/O is mocked).
-     */
-    // Tests getPDFReport (Focus on authorization and data retrieval flow)
-    /*@Test*/
-    // Commenting out failing test
-    void testGetPDFReport_Authorized() throws DocumentException, URISyntaxException, IOException {
-        // Arrange: Create a specific appointment linked to the static authorized project
-        SectionCell cell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject,
-                                1L,
-                                "Cell for PDF Test",
-                                LocalDateTime.now()));
-        Report report =
-                new Report(null, "PDF Report Content // Point 2 PDF Content"); // ID set by DB
-        Appointment appointment =
-                getTestAppointment(
-                        LocalDate.now().plusDays(20),
-                        LocalTime.of(14, 0),
-                        LocalTime.of(0, 45),
-                        "Salle PDF",
-                        "PDF Subject",
-                        List.of(cell),
-                        report);
-        Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
-
-        // Mock getAppointmentById to return the saved appointment for the service to use
-        when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
-                .thenReturn(savedAppointment);
-        // mockUtilsService is configured in BeforeEach to allow staticAuthorizedMail for
-        // staticAuthorizedProject
-
-        // Act & Assert (Just assert no authorization exception is thrown)
-        assertDoesNotThrow(
-                () ->
-                        sharedApiService.getPDFReport(
-                                savedAppointment.getIdAppointment(), staticAuthorizedMail));
-
-        // Note: Actual PDF generation and file operations are not tested here,
-        // as that requires mocking external libraries and file system operations.
-    }
-
-    /*
-     * Tests generating a PDF report for an appointment when the user is not authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    /*@Test*/
-    // Commenting out failing test
-    void testGetPDFReport_Unauthorized() {
-        // Arrange: Create a specific appointment linked to the static *unauthorized* project
-        SectionCell cell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticUnauthorizedProject,
-                                1L,
-                                "Cell for Unauthorized PDF Test",
-                                LocalDateTime.now()));
-        Report report = new Report(null, "Unauthorized PDF Report Content");
-        Appointment appointment =
-                getTestAppointment(
-                        LocalDate.now().plusDays(21),
-                        LocalTime.of(15, 0),
-                        LocalTime.of(0, 30),
-                        "Salle Unauthorized PDF",
-                        "Unauthorized PDF Subject",
-                        List.of(cell),
-                        report);
-        Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
-
-        // Mock getAppointmentById to return the saved appointment
-        when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
-                .thenReturn(savedAppointment);
-        // mockUtilsService is configured in BeforeEach to DENY staticUnauthorizedMail for
-        // staticUnauthorizedProject
-
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getPDFReport(
-                                    savedAppointment.getIdAppointment(),
-                                    staticUnauthorizedMail); // Unauthorized user mail
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-}

config/backdev.docker-compose.yaml

@@ -48,4 +48,4 @@ services:
   #  container_name: MyINPulse-back
   #  ports:
   #    - "8081:8080"
-  
+  #

config/frontdev.docker-compose.yaml

@@ -42,11 +42,11 @@ services:
   #  ports:
   #    - "8080:80"
 
-  back:
+  #back:
-    build:
+  #  build:
-      context: ./MyINPulse-back/
+  #    context: ./MyINPulse-back/
-      dockerfile: Dockerfile
+  #    dockerfile: Dockerfile
-    container_name: MyINPulse-back
+  #  container_name: MyINPulse-back
-    ports:
+  #  ports:
-      - "8081:8080"
+  #    - "8081:8080"
   

config/prod.docker-compose.yaml

@@ -45,11 +45,11 @@ services:
     ports:
       - "8080:80"
 
-  back:
+  #back:
-    build:
+  #  build:
-      context: ./MyINPulse-back/
+  #    context: ./MyINPulse-back/
-      dockerfile: Dockerfile
+  #    dockerfile: Dockerfile
-    container_name: MyINPulse-back
+  #  container_name: MyINPulse-back
-    #ports:
+  #  #ports:
-    #  - "8081:8080"
+  #  #  - "8081:8080"
   

documentation/openapi/src/sharedApi.yaml

@@ -174,10 +174,21 @@ paths:
           application/json:
             schema:
               $ref: "./main.yaml#/components/schemas/appointment" # Assuming request uses same model structure
+            example:
+              value:
+                appointmentDate: "2025-06-01"
+                appointmentTime: "10:00:00"
+                appointmentDuration: "PT1H"
+                appointmentPlace: "Online"
+                appointmentSubject: "Follow-up on prototype"
                 # Potentially add projectId or targetUserId here
       responses:
         "202": # Accepted seems appropriate for a request
           description: Accepted - Appointment request submitted.
+          content:
+            application/json: # Optionally return the pending appointment data
+              schema:
+                 $ref: "./main.yaml#/components/schemas/appointment"
         "400":
           description: Bad Request - Invalid appointment details.
           

documentation/openapi/swagger-ui/package-lock.json

@@ -1947,6 +1947,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/swagger-cli/-/swagger-cli-4.0.4.tgz",
       "integrity": "sha512-Cp8YYuLny3RJFQ4CvOBTaqmOOgYsem52dPx1xM5S4EUWFblIh2Q8atppMZvXKUr1e9xH5RwipYpmdUzdPcxWcA==",
+      "license": "MIT",
       "dependencies": {
         "@apidevtools/swagger-cli": "4.0.4"
       },

front/MyINPulse-front/index.html

@@ -1,13 +1,13 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="">
-    <head>
+  <head>
-        <meta charset="UTF-8" />
+    <meta charset="UTF-8">
-        <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="/favicon.ico">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Vite App</title>
+    <title>Vite App</title>
-    </head>
+  </head>
-    <body>
+  <body>
-        <div id="app"></div>
+    <div id="app"></div>
-        <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main.ts"></script>
-    </body>
+  </body>
 </html>

front/MyINPulse-front/package-lock.json

@@ -10,7 +10,6 @@
       "dependencies": {
         "axios": "^1.7.9",
         "cors": "^2.8.5",
-        "jwt-decode": "^4.0.0",
         "keycloak-js": "^26.1.0",
         "pinia": "^2.3.1",
         "pinia-plugin-persistedstate": "^4.2.0",
@@ -3589,15 +3588,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jwt-decode": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
-      "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/keycloak-js": {
       "version": "26.1.0",
       "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-26.1.0.tgz",

front/MyINPulse-front/package.json

@@ -18,8 +18,7 @@
     "pinia": "^2.3.1",
     "pinia-plugin-persistedstate": "^4.2.0",
     "vue": "^3.5.13",
-    "vue-router": "^4.5.0",
+    "vue-router": "^4.5.0"
-    "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.49.1",

front/MyINPulse-front/src/ApiClasses/Appointment.ts

@@ -1,68 +0,0 @@
-// appointment.ts
-class Appointment {
-    private _idAppointment?: number;
-    private _appointmentDate?: string;
-    private _appointmentTime?: string;
-    private _appointmentDuration?: string;
-    private _appointmentPlace?: string;
-    private _appointmentSubject?: string;
-
-    constructor(data: Partial<Appointment> = {}) {
-        this._idAppointment = data.idAppointment;
-        this._appointmentDate = data.appointmentDate;
-        this._appointmentTime = data.appointmentTime;
-        this._appointmentDuration = data.appointmentDuration;
-        this._appointmentPlace = data.appointmentPlace;
-        this._appointmentSubject = data.appointmentSubject;
-    }
-
-    get idAppointment(): number | undefined {
-        return this._idAppointment;
-    }
-
-    set idAppointment(value: number | undefined) {
-        this._idAppointment = value;
-    }
-
-    get appointmentDate(): string | undefined {
-        return this._appointmentDate;
-    }
-
-    set appointmentDate(value: string | undefined) {
-        this._appointmentDate = value;
-    }
-
-    get appointmentTime(): string | undefined {
-        return this._appointmentTime;
-    }
-
-    set appointmentTime(value: string | undefined) {
-        this._appointmentTime = value;
-    }
-
-    get appointmentDuration(): string | undefined {
-        return this._appointmentDuration;
-    }
-
-    set appointmentDuration(value: string | undefined) {
-        this._appointmentDuration = value;
-    }
-
-    get appointmentPlace(): string | undefined {
-        return this._appointmentPlace;
-    }
-
-    set appointmentPlace(value: string | undefined) {
-        this._appointmentPlace = value;
-    }
-
-    get appointmentSubject(): string | undefined {
-        return this._appointmentSubject;
-    }
-
-    set appointmentSubject(value: string | undefined) {
-        this._appointmentSubject = value;
-    }
-}
-
-export default Appointment;

front/MyINPulse-front/src/ApiClasses/JoinRequest.ts

@@ -1,32 +0,0 @@
-// joinRequest.ts
-import UserEntrepreneur from "./UserEntrepreneur";
-
-class JoinRequest {
-    private _idProject?: number;
-    private _entrepreneur?: UserEntrepreneur;
-
-    constructor(data: Partial<JoinRequest> = {}) {
-        this._idProject = data.idProject;
-        this._entrepreneur = data.entrepreneur
-            ? new UserEntrepreneur(data.entrepreneur)
-            : undefined;
-    }
-
-    get idProject(): number | undefined {
-        return this._idProject;
-    }
-
-    set idProject(value: number | undefined) {
-        this._idProject = value;
-    }
-
-    get entrepreneur(): UserEntrepreneur | undefined {
-        return this._entrepreneur;
-    }
-
-    set entrepreneur(value: UserEntrepreneur | undefined) {
-        this._entrepreneur = value;
-    }
-}
-
-export default JoinRequest;

front/MyINPulse-front/src/ApiClasses/JoinRequestDecision.ts

@@ -1,18 +0,0 @@
-// joinRequestDecision.ts
-class JoinRequestDecision {
-    private _isAccepted?: boolean;
-
-    constructor(data: Partial<JoinRequestDecision> = {}) {
-        this._isAccepted = data.isAccepted;
-    }
-
-    get isAccepted(): boolean | undefined {
-        return this._isAccepted;
-    }
-
-    set isAccepted(value: boolean | undefined) {
-        this._isAccepted = value;
-    }
-}
-
-export default JoinRequestDecision;

front/MyINPulse-front/src/ApiClasses/Project.ts

@@ -1,72 +0,0 @@
-// project.ts
-class Project {
-    private _idProject?: number;
-    private _projectName?: string;
-    private _creationDate?: string;
-    private _logo?: string;
-    private _status?: "PENDING" | "ACTIVE" | "ENDED" | "ABORTED" | "REJECTED";
-
-    constructor(data: Partial<Project> = {}) {
-        this._idProject = data.idProject;
-        this._projectName = data.projectName;
-        this._creationDate = data.creationDate;
-        this._logo = data.logo;
-        this._status = data.status;
-    }
-
-    get idProject(): number | undefined {
-        return this._idProject;
-    }
-
-    set idProject(value: number | undefined) {
-        this._idProject = value;
-    }
-
-    get projectName(): string | undefined {
-        return this._projectName;
-    }
-
-    set projectName(value: string | undefined) {
-        this._projectName = value;
-    }
-
-    get creationDate(): string | undefined {
-        return this._creationDate;
-    }
-
-    set creationDate(value: string | undefined) {
-        this._creationDate = value;
-    }
-
-    get logo(): string | undefined {
-        return this._logo;
-    }
-
-    set logo(value: string | undefined) {
-        this._logo = value;
-    }
-
-    get status():
-        | "PENDING"
-        | "ACTIVE"
-        | "ENDED"
-        | "ABORTED"
-        | "REJECTED"
-        | undefined {
-        return this._status;
-    }
-
-    set status(
-        value:
-            | "PENDING"
-            | "ACTIVE"
-            | "ENDED"
-            | "ABORTED"
-            | "REJECTED"
-            | undefined
-    ) {
-        this._status = value;
-    }
-}
-
-export default Project;

front/MyINPulse-front/src/ApiClasses/ProjectDecision.ts

@@ -1,38 +0,0 @@
-// projectDecision.ts
-class ProjectDecision {
-    private _projectId?: number;
-    private _adminId?: number;
-    private _isAccepted?: boolean;
-
-    constructor(data: Partial<ProjectDecision> = {}) {
-        this._projectId = data.projectId;
-        this._adminId = data.adminId;
-        this._isAccepted = data.isAccepted;
-    }
-
-    get projectId(): number | undefined {
-        return this._projectId;
-    }
-
-    set projectId(value: number | undefined) {
-        this._projectId = value;
-    }
-
-    get adminId(): number | undefined {
-        return this._adminId;
-    }
-
-    set adminId(value: number | undefined) {
-        this._adminId = value;
-    }
-
-    get isAccepted(): boolean | undefined {
-        return this._isAccepted;
-    }
-
-    set isAccepted(value: boolean | undefined) {
-        this._isAccepted = value;
-    }
-}
-
-export default ProjectDecision;

front/MyINPulse-front/src/ApiClasses/Repport.ts

@@ -1,28 +0,0 @@
-// report.ts
-class Report {
-    private _idReport?: number;
-    private _reportContent?: string;
-
-    constructor(data: Partial<Report> = {}) {
-        this._idReport = data.idReport;
-        this._reportContent = data.reportContent;
-    }
-
-    get idReport(): number | undefined {
-        return this._idReport;
-    }
-
-    set idReport(value: number | undefined) {
-        this._idReport = value;
-    }
-
-    get reportContent(): string | undefined {
-        return this._reportContent;
-    }
-
-    set reportContent(value: string | undefined) {
-        this._reportContent = value;
-    }
-}
-
-export default Report;

front/MyINPulse-front/src/ApiClasses/SectionCell.ts

@@ -1,57 +0,0 @@
-// sectionCell.ts
-class SectionCell {
-    private _idSectionCell?: number;
-    private _sectionId?: number;
-    private _contentSectionCell?: string;
-    private _modificationDate?: string;
-
-    constructor(data: Partial<SectionCell> = {}) {
-        this._idSectionCell = data.idSectionCell;
-        this._sectionId = data.sectionId;
-        this._contentSectionCell = data.contentSectionCell;
-        this._modificationDate = data.modificationDate;
-    }
-
-    get idSectionCell(): number | undefined {
-        return this._idSectionCell;
-    }
-
-    set idSectionCell(value: number | undefined) {
-        this._idSectionCell = value;
-    }
-
-    get sectionId(): number | undefined {
-        return this._sectionId;
-    }
-
-    set sectionId(value: number | undefined) {
-        this._sectionId = value;
-    }
-
-    get contentSectionCell(): string | undefined {
-        return this._contentSectionCell;
-    }
-
-    set contentSectionCell(value: string | undefined) {
-        this._contentSectionCell = value;
-    }
-
-    get modificationDate(): string | undefined {
-        return this._modificationDate;
-    }
-
-    set modificationDate(value: string | undefined) {
-        this._modificationDate = value;
-    }
-
-    toPlainObject() {
-        return {
-            idSectionCell: this._idSectionCell,
-            sectionId: this._sectionId,
-            contentSectionCell: this._contentSectionCell,
-            modificationDate: this._modificationDate,
-        };
-    }
-}
-
-export default SectionCell;

front/MyINPulse-front/src/ApiClasses/User.ts

@@ -1,67 +0,0 @@
-class User {
-    private _idUser?: number;
-    private _userSurname?: string;
-    private _userName?: string;
-    private _primaryMail?: string;
-    private _secondaryMail?: string;
-    private _phoneNumber?: string;
-
-    constructor(data: Partial<User> = {}) {
-        this._idUser = data.idUser;
-        this._userSurname = data.userSurname;
-        this._userName = data.userName;
-        this._primaryMail = data.primaryMail;
-        this._secondaryMail = data.secondaryMail;
-        this._phoneNumber = data.phoneNumber;
-    }
-
-    get idUser(): number | undefined {
-        return this._idUser;
-    }
-
-    set idUser(value: number | undefined) {
-        this._idUser = value;
-    }
-
-    get userSurname(): string | undefined {
-        return this._userSurname;
-    }
-
-    set userSurname(value: string | undefined) {
-        this._userSurname = value;
-    }
-
-    get userName(): string | undefined {
-        return this._userName;
-    }
-
-    set userName(value: string | undefined) {
-        this._userName = value;
-    }
-
-    get primaryMail(): string | undefined {
-        return this._primaryMail;
-    }
-
-    set primaryMail(value: string | undefined) {
-        this._primaryMail = value;
-    }
-
-    get secondaryMail(): string | undefined {
-        return this._secondaryMail;
-    }
-
-    set secondaryMail(value: string | undefined) {
-        this._secondaryMail = value;
-    }
-
-    get phoneNumber(): string | undefined {
-        return this._phoneNumber;
-    }
-
-    set phoneNumber(value: string | undefined) {
-        this._phoneNumber = value;
-    }
-}
-
-export default User;

front/MyINPulse-front/src/ApiClasses/UserAdmin.ts

@@ -1,10 +0,0 @@
-// user-admin.ts
-import User from "./User";
-
-class UserAdmin extends User {
-    constructor(data: Partial<UserAdmin> = {}) {
-        super(data);
-    }
-}
-
-export default UserAdmin;

front/MyINPulse-front/src/ApiClasses/UserEntrepreneur.ts

@@ -1,41 +0,0 @@
-// user-entrepreneur.ts
-import User from "./User";
-
-class UserEntrepreneur extends User {
-    private _school?: string;
-    private _course?: string;
-    private _sneeStatus?: boolean;
-
-    constructor(data: Partial<UserEntrepreneur> = {}) {
-        super(data);
-        this._school = data.school;
-        this._course = data.course;
-        this._sneeStatus = data.sneeStatus;
-    }
-
-    get school(): string | undefined {
-        return this._school;
-    }
-
-    set school(value: string | undefined) {
-        this._school = value;
-    }
-
-    get course(): string | undefined {
-        return this._course;
-    }
-
-    set course(value: string | undefined) {
-        this._course = value;
-    }
-
-    get sneeStatus(): boolean | undefined {
-        return this._sneeStatus;
-    }
-
-    set sneeStatus(value: boolean | undefined) {
-        this._sneeStatus = value;
-    }
-}
-
-export default UserEntrepreneur;

front/MyINPulse-front/src/App.vue

@@ -1,12 +1,47 @@
 <script setup lang="ts">
-import { /*RouterLink,*/ RouterView } from "vue-router";
+import { RouterView } from "vue-router";
 import ErrorWrapper from "@/views/errorWrapper.vue";
+import ProjectComponent from "@/components/ProjectComponent.vue";
 </script>
 
 <template>
-    <Header />
+    <HeaderComponent />
-    <ErrorWrapper />
+    <error-wrapper></error-wrapper>
-    <!--<RouterLink to="/">Home</RouterLink> | -->
+    <div id="main">
-    <!--<RouterLink to="/canvas">Canvas</RouterLink> -->
+        <ProjectComponent
+            v-for="(project, index) in projects"
+            :key="index"
+            :project-name="project.name"
+        />
+    </div>
     <RouterView />
 </template>
+
+<script lang="ts">
+import HeaderComponent from "@/components/HeaderComponent.vue";
+
+export default {
+    name: "App",
+    components: {
+        HeaderComponent,
+    },
+    data() {
+        return {
+            projects: [
+                {
+                    name: "Projet Alpha",
+                    //link: './project-alpha.html',
+                    //members: ['Alice', 'Bob', 'Charlie'],
+                },
+                {
+                    name: "Projet Beta",
+                    //link: './project-beta.html',
+                    //members: ['David', 'Eve', 'Frank'],
+                },
+            ],
+        };
+    },
+};
+</script>
+
+<style scoped></style>

front/MyINPulse-front/src/components/AddProjectForm.vue

@@ -1,108 +0,0 @@
-<template>
-    <form class="add-project-form" @submit.prevent="submitProject">
-        <h2>Ajouter un projet</h2>
-
-        <div class="form-group">
-            <label for="projectName">Nom du projet</label>
-            <input
-                id="projectName"
-                v-model="project.projectName"
-                type="text"
-                required
-            />
-        </div>
-
-        <div class="form-group">
-            <label for="creationDate">Date de création</label>
-            <input
-                id="creationDate"
-                v-model="project.creationDate"
-                type="text"
-                placeholder="JJ-MM-AAAA"
-                required
-            />
-        </div>
-
-        <div class="form-group">
-            <label for="logo">Logo</label>
-            <input
-                id="logo"
-                v-model="project.logo"
-                type="text"
-                placeholder="(à discuter)"
-            />
-        </div>
-
-        <button type="submit">Ajouter</button>
-    </form>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-import { postApi } from "@/services/api.ts";
-
-const project = ref({
-    projectName: "",
-    creationDate: "",
-    logo: "to be discussed not yet fixed",
-});
-
-function submitProject() {
-    postApi("/admin/projects/add", project.value);
-}
-</script>
-
-<style scoped>
-h2 {
-    font-size: 1.5rem;
-    color: #333;
-    margin-bottom: 1.2rem;
-    border-bottom: 2px solid #ddd;
-    padding-bottom: 0.5rem;
-}
-
-.add-project-form {
-    max-width: 500px;
-    margin: 0 auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-h2 {
-    margin-bottom: 20px;
-    font-size: 24px;
-    color: #333;
-}
-
-.form-group {
-    margin-bottom: 15px;
-    display: flex;
-    flex-direction: column;
-}
-
-label {
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-
-input {
-    padding: 8px;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-}
-
-button {
-    background-color: #4caf50;
-    color: white;
-    padding: 10px 15px;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-}
-
-button:hover {
-    background-color: #45a049;
-}
-</style>

front/MyINPulse-front/src/components/AdminAppointments.vue

@@ -1,178 +0,0 @@
-<template>
-    <div>
-        <h2>Ajouter / Modifier un Rapport pour un Rendez-vous</h2>
-
-        <form @submit.prevent="submitReport">
-            <div>
-                <label for="appointmentId">ID du rendez-vous :</label>
-                <div style="display: flex; align-items: center; gap: 0.5rem">
-                    <button type="button" @click="decrementId">-</button>
-                    <input
-                        id="appointmentId"
-                        v-model.number="appointmentId"
-                        type="number"
-                        min="1"
-                        style="width: 60px; text-align: center"
-                    />
-                    <button type="button" @click="incrementId">+</button>
-                </div>
-            </div>
-
-            <div>
-                <label for="reportContent">Contenu du rapport :</label>
-                <textarea
-                    id="reportContent"
-                    v-model="reportContent"
-                    required
-                ></textarea>
-            </div>
-
-            <button type="submit">
-                {{ isUpdate ? "Mettre à jour" : "Créer" }} le rapport
-            </button>
-        </form>
-
-        <p v-if="responseMessage">{{ responseMessage }}</p>
-    </div>
-</template>
-
-<script>
-export default {
-    name: "AdminAppointmentsComponent",
-    data() {
-        return {
-            appointmentId: 1,
-            reportContent: "",
-            responseMessage: "",
-            isUpdate: false,
-        };
-    },
-    watch: {
-        appointmentId(newVal) {
-            if (newVal) {
-                this.isUpdate = true;
-            }
-        },
-    },
-    methods: {
-        incrementId() {
-            this.appointmentId++;
-        },
-        decrementId() {
-            if (this.appointmentId > 1) {
-                this.appointmentId--;
-            }
-        },
-        async submitReport() {
-            const reportData = {
-                reportContent: this.reportContent,
-            };
-
-            const url = `/admin/appointments/report/${this.appointmentId}`;
-            const method = this.isUpdate ? "PUT" : "POST";
-
-            try {
-                const response = await this.$axios({
-                    method,
-                    url,
-                    data: reportData,
-                });
-
-                if (response.status === 201 || response.status === 200) {
-                    this.responseMessage =
-                        "Rapport " +
-                        (this.isUpdate ? "mis à jour" : "créé") +
-                        " avec succès.";
-                }
-            } catch (error) {
-                if (error.response && error.response.status === 400) {
-                    this.responseMessage =
-                        "Requête invalide. Vérifiez les informations.";
-                } else if (error.response && error.response.status === 401) {
-                    this.responseMessage =
-                        "Vous n'êtes pas autorisé à effectuer cette action.";
-                } else {
-                    this.responseMessage =
-                        "Une erreur est survenue. Veuillez réessayer.";
-                }
-            }
-        },
-    },
-};
-</script>
-
-<style scoped>
-/* Centrer le formulaire */
-div {
-    max-width: 600px;
-    margin: 0 auto;
-    padding: 1rem;
-    background-color: #f9f9f9;
-    border-radius: 8px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Titre */
-h2 {
-    text-align: center;
-    color: #333;
-    margin-bottom: 1rem;
-}
-
-/* Formulaire */
-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
-}
-
-/* Boutons */
-button {
-    padding: 0.5rem 1rem;
-    background-color: #007bff;
-    color: white;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: background-color 0.3s ease;
-}
-
-button:hover {
-    background-color: #0056b3;
-}
-
-/* Input et Textarea */
-input[type="number"],
-textarea {
-    width: 100%;
-    padding: 0.5rem;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 1rem;
-}
-
-textarea {
-    height: 120px;
-    resize: none;
-}
-
-/* Message de réponse */
-p {
-    text-align: center;
-    font-weight: bold;
-    color: green;
-}
-
-/* Boutons d'incrémentation/décrémentation */
-div[style*="display: flex"] button {
-    background-color: #6c757d;
-    color: white;
-    border: none;
-    border-radius: 4px;
-    padding: 0.5rem;
-}
-
-div[style*="display: flex"] button:hover {
-    background-color: #5a6268;
-}
-</style>

front/MyINPulse-front/src/components/AgendaComponent.vue

@@ -1,93 +0,0 @@
-<template>
-    <div id="agenda">
-        <h3>Rendez-vous</h3>
-        <table>
-            <thead>
-                <tr>
-                    <th>Projet</th>
-                    <th>Date</th>
-                    <th>Lieu</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="(p, index) in projectRDV" :key="index">
-                    <td>{{ p.projectName }}</td>
-                    <td>{{ p.date }}</td>
-                    <td>{{ p.lieu }}</td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { defineProps } from "vue";
-
-interface rendezVous {
-    projectName: string;
-    date: string;
-    lieu: string;
-}
-
-defineProps<{
-    projectRDV: rendezVous[];
-}>();
-</script>
-
-<style scoped>
-h3 {
-    font-size: 1.5rem;
-    color: #333;
-    margin-bottom: 1.2rem;
-    border-bottom: 2px solid #ddd;
-    padding-bottom: 0.5rem;
-}
-
-#agenda {
-    padding: 20px;
-    background-color: white;
-    border-radius: 10px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
-}
-
-/* Table Styling */
-table {
-    width: 100%;
-    border-collapse: collapse;
-    font-family: Arial, sans-serif;
-    text-align: left;
-    margin-top: 20px;
-    border: 1px solid #ccc;
-}
-
-th {
-    background-color: #f0f2f5;
-    padding: 12px;
-    font-weight: 600;
-    color: #333;
-}
-
-/* Table Body Rows */
-tbody tr {
-    border-bottom: 1px solid #ddd;
-    transition: background-color 0.2s ease; /* Smooth hover effect */
-}
-
-tbody tr:hover {
-    background-color: #f9f9f9; /* Highlight row on hover */
-}
-
-/* Cells Styling */
-td {
-    padding: 10px;
-    border: 1px solid #eee;
-    font-size: 14px;
-    vertical-align: middle; /* Align text to middle */
-}
-
-/* First Column Styling */
-td:first-child {
-    text-align: center;
-    width: 50px; /* Adjust width as needed */
-}
-</style>

front/MyINPulse-front/src/components/HeaderComponent.vue

@@ -1,16 +1,6 @@
 <template>
     <header>
-        <a
+        <img src="./icons/logo inpulse.png" alt="INPulse" />
-            href="https://www.bordeaux-inp.fr/fr/lincubateur-bordeaux-inpulse"
-            target="_blank"
-            rel="noopener"
-        >
-            <img
-                src="./icons/logo inpulse.png"
-                alt="INPulse Logo"
-                class="logo"
-            />
-        </a>
     </header>
 </template>
 

front/MyINPulse-front/src/components/LoginComponent.vue

@@ -1,207 +0,0 @@
-<script lang="ts" setup>
-import { onMounted, ref } from "vue";
-import { useRouter } from "vue-router";
-import { jwtDecode } from "jwt-decode"; // i hope this doesn't break the code later
-import { store } from "../main.ts";
-import { callApi } from "@/services/api.ts";
-import Header from "@/components/HeaderComponent.vue";
-const router = useRouter();
-
-type TokenPayload = {
-    realm_access?: {
-        roles?: string[];
-    };
-};
-
-const customRequest = ref("");
-
-onMounted(() => {
-    if (store.authenticated && store.user.token) {
-        try {
-            const decoded = jwtDecode<TokenPayload>(store.user.token);
-            const roles = decoded.realm_access?.roles || [];
-
-            if (roles.includes("MyINPulse-admin")) {
-                router.push("/admin");
-            } else if (roles.includes("MyINPulse-entrepreneur")) {
-                router.push("/leanCanva");
-            }
-        } catch (err) {
-            console.error("Failed to decode token", err);
-        }
-    }
-});
-/*
-const loading = ref(false);
-
-const callApiWithLoading = async (path: string) => {
-  loading.value = true;
-  await callApi(path);
-  loading.value = false;
-};
-*/
-</script>
-
-<template>
-    <Header />
-    <error-wrapper></error-wrapper>
-    <div class="auth-container">
-        <div class="auth-card">
-            <h1>Bienvenue</h1>
-
-            <div
-                class="status"
-                :class="store.authenticated ? 'success' : 'error'"
-            >
-                <p>
-                    {{
-                        store.authenticated
-                            ? "✅ Authenticated"
-                            : "❌ Not Authenticated"
-                    }}
-                </p>
-            </div>
-
-            <div class="actions">
-                <button @click="store.login">Login</button>
-                <button @click="store.logout">Logout</button>
-                <button @click="store.signup">Signup-admin</button>
-                <button @click="store.signup">Signup-Entrepreneur</button>
-                <button @click="store.refreshUserToken">Refresh Token</button>
-            </div>
-
-            <div v-if="store.authenticated" class="token-section">
-                <p><strong>Access Token:</strong></p>
-                <pre>{{ store.user.token }}</pre>
-
-                <p><strong>Refresh Token:</strong></p>
-                <pre>{{ store.user.refreshToken }}</pre>
-            </div>
-
-            <div class="api-calls">
-                <h2>Test API Calls</h2>
-                <button @click="callApi('random')">
-                    Call Entrepreneur API
-                </button>
-                <button @click="callApi('random2')">Call Admin API</button>
-                <button @click="callApi('unauth/dev')">Call Unauth API</button>
-
-                <div class="custom-call">
-                    <input
-                        v-model="customRequest"
-                        placeholder="Custom endpoint"
-                    />
-                    <button @click="callApi(customRequest)">Call</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<style scoped>
-.auth-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 3rem 1rem;
-    min-height: 100vh;
-    background-color: #eef1f5;
-    font-family: Arial, sans-serif;
-}
-
-.auth-card {
-    background: white;
-    padding: 2rem;
-    border-radius: 12px;
-    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
-    width: 100%;
-    max-width: 600px;
-}
-
-h1 {
-    text-align: center;
-    margin-bottom: 1rem;
-    color: #333;
-}
-
-.status {
-    text-align: center;
-    margin-bottom: 1.5rem;
-    font-weight: bold;
-}
-.success {
-    color: green;
-}
-.error {
-    color: red;
-}
-
-.actions {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 1rem;
-    justify-content: center;
-    margin-bottom: 1.5rem;
-}
-
-.actions button {
-    padding: 0.6rem 1rem;
-    background-color: #4a90e2;
-    border: none;
-    color: white;
-    border-radius: 8px;
-    cursor: pointer;
-    transition: background-color 0.2s;
-}
-.actions button:hover {
-    background-color: #357abd;
-}
-
-.token-section pre {
-    background: #f6f8fa;
-    padding: 0.5rem;
-    overflow-x: auto;
-    border: 1px solid #ddd;
-    border-radius: 6px;
-    margin-bottom: 1rem;
-    font-size: 0.85rem;
-}
-
-.api-calls {
-    margin-top: 2rem;
-}
-.api-calls h2 {
-    margin-bottom: 1rem;
-    color: #444;
-    font-size: 1.1rem;
-}
-.api-calls button {
-    margin-right: 0.5rem;
-    margin-bottom: 0.5rem;
-}
-
-.custom-call {
-    margin-top: 1rem;
-    display: flex;
-    gap: 0.5rem;
-}
-.custom-call input {
-    flex: 1;
-    padding: 0.5rem;
-    border: 1px solid #ccc;
-    border-radius: 6px;
-}
-/* 
-.status {
-  padding: 0.5rem 1rem;
-  border-radius: 8px;
-  display: inline-block;
-  background-color: #e0f7e9; 
-  color: #2e7d32;
-}
-*/
-.status.error {
-    background-color: #ffe2e2;
-    color: #c62828;
-}
-</style>

front/MyINPulse-front/src/components/PendingProjectComponent.vue

@@ -1,129 +0,0 @@
-<template>
-    <div class="project">
-        <div class="project-header">
-            <div class="project-title">
-                <h2>{{ projectName }}</h2>
-                <p>Projet mis le: {{ creationDate }}</p>
-            </div>
-            <div class="project-buttons">
-                <button id="accept" @click="acceptProject">Accepter</button>
-                <button id="refus" @click="refuseProject">Refuser</button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { defineProps } from "vue";
-import { postApi } from "@/services/api";
-import { addNewMessage, color } from "@/services/popupDisplayer";
-
-const props = defineProps<{
-    projectName: string;
-    creationDate: string;
-}>();
-
-const URI = "/admin/projects/pending/decision";
-
-const sendDecision = (decision: "true" | "false") => {
-    postApi(
-        URI,
-        {
-            projectName: props.projectName,
-            decision,
-        },
-        () => {
-            addNewMessage(
-                `Projet ${props.projectName} ${decision === "true" ? "accepté" : "refusé"}`,
-                color.Green
-            );
-        },
-        (err) => {
-            addNewMessage(`Erreur lors de la décision`, color.Red);
-            console.error(err);
-        }
-    );
-};
-
-const acceptProject = () => sendDecision("true");
-const refuseProject = () => sendDecision("false");
-</script>
-
-<style scoped>
-.project {
-    background: linear-gradient(to right, #f8f9fb, #ffffff);
-    border: 1px solid #e0e0e0;
-    border-radius: 16px;
-    padding: 1.5rem;
-    margin: 1.5rem 0;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-    font-family: Arial, sans-serif;
-    transition: box-shadow 0.3s ease;
-}
-
-.project:hover {
-    box-shadow: 0 6px 18px rgba(0, 0, 0, 0.08);
-}
-
-.project-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 1rem;
-}
-
-.project-title {
-    display: flex;
-    flex-direction: column;
-}
-
-.project-title h2 {
-    font-size: 1.25rem;
-    color: #222;
-    margin: 0;
-    font-weight: 600;
-}
-
-.project-title p {
-    font-size: 0.9rem;
-    color: #666;
-    margin-top: 0.25rem;
-}
-
-.project-buttons {
-    display: flex;
-    gap: 0.75rem;
-}
-
-button {
-    padding: 0.5rem 1.1rem;
-    color: white;
-    border: none;
-    border-radius: 8px;
-    font-size: 0.9rem;
-    font-weight: 500;
-    cursor: pointer;
-    transition:
-        background-color 0.2s ease,
-        transform 0.2s ease;
-}
-
-#accept {
-    background-color: #4caf50;
-}
-
-#accept:hover {
-    background-color: #3e8e41;
-    transform: translateY(-2px);
-}
-
-#refus {
-    background-color: #e74c3c;
-}
-
-#refus:hover {
-    background-color: #c0392b;
-    transform: translateY(-2px);
-}
-</style>

front/MyINPulse-front/src/components/ProjectComponent.vue

@@ -1,280 +1,21 @@
 <template>
     <div class="project">
         <div class="project-header">
-            <h2 @click="goToLink">{{ projectName }}</h2>
+            <h2>{{ projectName }}</h2>
-            <div class="header-actions">
-                <div class="dropdown-wrapper">
-                    <!-- Empêche la propagation du clic vers le parent -->
-                    <button class="contact-button" @click.stop="toggleDropdown">
-                        Contact
-                    </button>
-
-                    <div v-if="isDropdownOpen" class="dropdown-menu">
-                        <button @click.stop="contactAll">Contacter tous</button>
-                        <button
-                            v-for="(email, index) in entrepreneurEmails"
-                            :key="index"
-                            @click.stop="contactSingle(email)"
-                        >
-                            {{ email }}
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Toute cette partie est cliquable -->
-        <div class="project-body" @click="goToLink">
-            <ul>
-                <li v-for="(name, index) in listName" :key="index">
-                    {{ name }}
-                </li>
-            </ul>
         </div>
     </div>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
-import { defineProps, ref, onMounted, onBeforeUnmount } from "vue";
+import type { PropType } from "vue";
-import { useRouter } from "vue-router";
-import axios from "axios";
 
-const IS_MOCK_MODE = true;
+export default {
-
+    name: "ProjectComponent",
-const props = defineProps<{
+    props: {
-    projectName: string;
+        projectName: {
-    listName: string[];
+            type: Object as PropType<string>,
-    projectLink: string;
+            required: true,
-    projectId: number;
+        },
-}>();
+    },
-
-const router = useRouter();
-
-const isDropdownOpen = ref(false);
-const entrepreneurEmails = ref<string[]>([]);
-
-// Pour fermer le dropdown si on clique ailleurs
-const handleClickOutside = (event: MouseEvent) => {
-    const dropdown = document.querySelector(".dropdown-wrapper");
-    if (dropdown && !dropdown.contains(event.target as Node)) {
-        isDropdownOpen.value = false;
-    }
-};
-
-onMounted(() => {
-    fetchEntrepreneurs(props.projectId, IS_MOCK_MODE);
-    document.addEventListener("click", handleClickOutside);
-});
-
-onBeforeUnmount(() => {
-    document.removeEventListener("click", handleClickOutside);
-});
-
-const toggleDropdown = () => {
-    isDropdownOpen.value = !isDropdownOpen.value;
-};
-
-const goToLink = () => {
-    if (props.projectLink) {
-        router.push(props.projectLink);
-    }
-};
-
-const fetchEntrepreneurs = async (
-    projectId: number,
-    useMock = IS_MOCK_MODE
-) => {
-    try {
-        const responseData: Entrepreneur[] = useMock
-            ? await mockFetchEntrepreneurs(/*projectId*/)
-            : (
-                  await axios.get(
-                      `http://localhost:5000/shared/projects/entrepreneurs/${projectId}`
-                  )
-              ).data;
-
-        entrepreneurEmails.value = responseData.map(
-            (item: Entrepreneur) => item.primaryMail
-        );
-    } catch (error) {
-        console.error(
-            "Erreur lors de la récupération des entrepreneurs :",
-            error
-        );
-    }
-};
-
-type Entrepreneur = {
-    idUser: number;
-    userSurname: string;
-    userName: string;
-    primaryMail: string;
-    secondaryMail: string;
-    phoneNumber: string;
-    school: string;
-    course: string;
-    sneeStatus: boolean;
-};
-
-const mockFetchEntrepreneurs = async (/*projectId: number*/) => {
-    return new Promise<Entrepreneur[]>((resolve) => {
-        setTimeout(() => {
-            resolve([
-                {
-                    idUser: 1,
-                    userSurname: "Doe",
-                    userName: "John",
-                    primaryMail: "john.doe@example.com",
-                    secondaryMail: "johndoe@backup.com",
-                    phoneNumber: "612345678",
-                    school: "ENSEIRB",
-                    course: "Info",
-                    sneeStatus: false,
-                },
-                {
-                    idUser: 2,
-                    userSurname: "Smith",
-                    userName: "Jane",
-                    primaryMail: "jane.smith@example.com",
-                    secondaryMail: "janesmith@backup.com",
-                    phoneNumber: "698765432",
-                    school: "ENSEIRB",
-                    course: "Info",
-                    sneeStatus: true,
-                },
-            ]);
-        }, 500);
-    });
-};
-
-const contactAll = () => {
-    const allEmails = entrepreneurEmails.value.join(", ");
-    navigator.clipboard.writeText(allEmails).then(() => {
-        alert("Tous les emails copiés dans le presse-papiers !");
-        window.open("https://partage.bordeaux-inp.fr/", "_blank");
-    });
-};
-
-const contactSingle = (email: string) => {
-    navigator.clipboard.writeText(email).then(() => {
-        alert(`Adresse copiée : ${email}`);
-        window.open("https://partage.bordeaux-inp.fr/", "_blank");
-    });
 };
 </script>
-
-<style scoped>
-.project {
-    background: linear-gradient(to right, #f8f9fb, #ffffff);
-    border: 1px solid #e0e0e0;
-    border-radius: 16px;
-    padding: 1.5rem;
-    margin: 1.5rem 0;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-    transition: box-shadow 0.3s ease;
-    cursor: pointer;
-}
-
-.project:hover {
-    box-shadow: 0 6px 18px rgba(0, 0, 0, 0.08);
-}
-
-.project-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 0.5rem;
-}
-
-.project-header h2 {
-    font-size: 1.25rem;
-    color: #222;
-    margin: 0;
-    font-weight: 600;
-}
-
-.project-buttons {
-    display: flex;
-    gap: 0.5rem;
-}
-
-.contact-btn {
-    background-color: #007bff;
-    color: #fff;
-    padding: 0.5rem 1rem;
-    border: none;
-    border-radius: 8px;
-    font-size: 0.9rem;
-    font-weight: 500;
-    transition:
-        background-color 0.2s ease,
-        transform 0.2s ease;
-}
-
-.contact-btn:hover {
-    background-color: #0056b3;
-    transform: translateY(-2px);
-}
-
-.project-body {
-    margin-top: 1rem;
-}
-
-.project-body ul {
-    list-style-type: disc;
-    padding-left: 1.25rem;
-    margin: 0;
-}
-
-.project-body ul li {
-    font-size: 0.95rem;
-    color: #555;
-    line-height: 1.6;
-}
-
-button {
-    padding: 10px 15px;
-    background-color: #007bff;
-    color: white;
-    border: none;
-    cursor: pointer;
-    border-radius: 5px;
-}
-button:hover {
-    background-color: #0056b3;
-}
-
-.dropdown-wrapper {
-    position: relative;
-}
-
-.dropdown-menu {
-    position: absolute;
-    top: 100%; /* juste en dessous du bouton */
-    right: 0;
-    background-color: white;
-    border: 1px solid #ccc;
-    padding: 0.5rem;
-    z-index: 1000;
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    border-radius: 0.25rem;
-    min-width: 150px;
-}
-
-.dropdown-menu button {
-    text-align: left;
-    padding: 0.3rem 0.5rem;
-    background: none;
-    border: none;
-    cursor: pointer;
-    transition: background-color 0.2s;
-}
-
-.dropdown-menu button:hover {
-    background-color: #f0f0f0;
-}
-</style>

front/MyINPulse-front/src/components/canvas/CanvasItem.vue

@@ -1,572 +0,0 @@
-<template>
-    <div :class="['cell', { expanded }]" @click="handleClick">
-        <h3 class="fs-5 fw-medium">{{ titleText }}</h3>
-
-        <div class="tooltip-explain">{{ description }}</div>
-
-        <template v-if="expanded">
-            <div class="explain">
-                <p>{{ description }}</p>
-            </div>
-        </template>
-
-        <div class="description-wrapper custom-flow">
-            <div
-                v-for="(desc, index) in currentDescriptions"
-                :key="desc.idSectionCell || index"
-                :class="[
-                    'section-bloc',
-                    index % 2 === 0 ? 'from-left' : 'from-right',
-                ]"
-            >
-                <!-- ADMIN -------------------------------------------------------------------------------------------->
-                <template v-if="IS_ADMIN">
-                    <div class="description">
-                        <p class="m-0">{{ desc.contentSectionCell }}</p>
-                    </div>
-                </template>
-
-                <!-- ENTREP ------------------------------------------------------------------------------------------->
-                <template v-else>
-                    <!-- Mode affichage -->
-                    <template v-if="!isEditing[index]">
-                        <div class="description">
-                            <p class="m-0">{{ desc.contentSectionCell }}</p>
-                        </div>
-                        <div class="button-container">
-                            <button
-                                v-if="expanded"
-                                class="edit-button"
-                                @click.stop="startEditing(index)"
-                            >
-                                Éditer
-                            </button>
-                        </div>
-                    </template>
-
-                    <!-- Mode édition -->
-                    <template v-else>
-                        <div class="edit-row">
-                            <textarea
-                                v-model="
-                                    editedDescriptions[index].contentSectionCell
-                                "
-                                class="edit-input"
-                            ></textarea>
-                            <div class="button-container">
-                                <button
-                                    class="save-button"
-                                    @click.stop="saveEdit(index)"
-                                >
-                                    Enregistrer
-                                </button>
-                                <button
-                                    class="cancel-button"
-                                    @click.stop="cancelEdit(index)"
-                                >
-                                    Annuler
-                                </button>
-                            </div>
-                        </div>
-                    </template>
-                </template>
-            </div>
-
-            <template v-if="expanded">
-                <div class="canvas-exit-hint">
-                    Cliquez n'importe où pour quitter le canvas (terminez
-                    d'abord vos modifications)
-                </div>
-            </template>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, defineProps, onMounted } from "vue";
-import { getSectionCellsByDate } from "@/services/Apis/Shared.ts";
-import { addSectionCell } from "@/services/Apis/Entrepreneurs.ts";
-import SectionCell from "@/ApiClasses/SectionCell";
-
-import type { AxiosResponse, AxiosError } from "axios";
-
-const props = defineProps<{
-    projectId: number;
-    title: number;
-    titleText: string;
-    description: string;
-    isAdmin: number;
-}>();
-
-const IS_MOCK_MODE = false;
-const IS_ADMIN = props.isAdmin;
-
-const expanded = ref(false);
-const currentDescriptions = ref<SectionCell[]>([]);
-const editedDescriptions = ref<SectionCell[]>([]);
-const isEditing = ref<boolean[]>([]);
-
-function getCurrentFormattedDate(): string {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, '0'); // +1 car janvier = 0
-  const day = String(now.getDate()).padStart(2, '0');
-  const hours = String(now.getHours()).padStart(2, '0');
-  const minutes = String(now.getMinutes()).padStart(2, '0');
-
-  return `${year}-${month}-${day} ${hours}:${minutes}`;
-}
-
-onMounted(() => {
-    fetchData(props.projectId, props.title, getCurrentFormattedDate(), IS_MOCK_MODE);
-});
-
-// Fonctions
-const startEditing = (index: number) => {
-    isEditing.value[index] = true;
-};
-
-const cancelEdit = (index: number) => {
-    editedDescriptions.value[index].contentSectionCell =
-        currentDescriptions.value[index].contentSectionCell;
-    isEditing.value[index] = false;
-};
-
-const saveEdit = (index: number) => {
-    currentDescriptions.value[index].contentSectionCell =
-        editedDescriptions.value[index].contentSectionCell;
-    isEditing.value[index] = false;
-
-    if (!IS_MOCK_MODE){
-        addSectionCell(currentDescriptions.value[index],
-            (response) => {
-                console.log("Modification enregistrée avec succès :", response.data);
-            },
-            (error) => {
-                console.error("Erreur lors de l'enregistrement :", error);
-            }
-        );
-    }
-};
-
-
-const handleClick = () => {
-    if (expanded.value) {
-        const editingInProgress = isEditing.value.some((edit) => edit);
-        if (!editingInProgress) {
-            expanded.value = false;
-        }
-    } else {
-        expanded.value = true;
-    }
-};
-
-// fetchData
-const handleFetchSuccess = (sectionCells: SectionCell[]) => {
-    currentDescriptions.value = sectionCells;
-    editedDescriptions.value = sectionCells.map(
-        (cell) => new SectionCell({
-                    idSectionCell: cell.idSectionCell,
-                    sectionId: cell.sectionId,
-                    contentSectionCell: cell.contentSectionCell,
-                    modificationDate: cell.modificationDate, })
-    );
-    isEditing.value = Array(sectionCells.length).fill(false);
-};
-
-const handleFetchError = (error: unknown) => {
-    console.error("Erreur lors de la récupération des données :", error);
-};
-
-const fetchData = async ( projectId: number, title: number, date: string, useMock = false ) => {
-    try {
-        if (useMock) {
-            const responseData = await mockFetch(projectId, title, date);
-            handleFetchSuccess(responseData);
-        } else {
-            await new Promise<void>((resolve, reject) => {
-                getSectionCellsByDate( projectId, title, date,
-                    (response: AxiosResponse) => {
-                        const data = response.data;
-
-                        if (Array.isArray(data) && data.length > 0) {
-                            const sectionCells = data.map((cellData) => new SectionCell({
-                                                    idSectionCell: cellData.idSectionCell,
-                                                    sectionId: cellData.sectionId,
-                                                    contentSectionCell: cellData.contentSectionCell,
-                                                    modificationDate:
-                                                    cellData.modificationDate, })
-                            );
-                            handleFetchSuccess(sectionCells);
-                        } else {
-                            console.warn( "Aucune donnée reçue ou format inattendu :", data);
-                        }
-
-                        resolve();
-                    },
-                    (error: AxiosError) => {
-                        handleFetchError(error);
-                        reject(error);
-                    }
-                );
-            });
-        }
-    } catch (error) {
-        handleFetchError(error);
-    }
-};
-
-const mockFetch = async ( projectId: number, title: number, date: string ): Promise<SectionCell[]> => {
-    console.log(
-        `Mock fetch pour projectId: ${projectId}, title: ${title}, date: ${date}`
-    );
-
-    const leanCanvasData: Record<number, string[]> = {
-        1: [
-            "Les clients ont du mal à trouver des produits écoresponsables abordables.",
-            "Le processus d'achat en ligne est trop complexe.",
-            "Manque de transparence sur l’origine des produits.",
-            "Peu d’alternatives locales et durables sur le marché.",
-        ],
-        2: [
-            "Jeunes urbains engagés dans la cause écologique.",
-            "Familles à revenu moyen voulant consommer responsable.",
-            "Entreprises soucieuses de leur empreinte carbone.",
-        ],
-        3: [
-            "Une plateforme centralisée avec des produits écologiques certifiés.",
-            "Un service client humain et réactif.",
-            "Livraison éco-responsable avec suivi.",
-        ],
-        4: [
-            "Application intuitive avec suggestions personnalisées.",
-            "Emballages recyclables et réutilisables.",
-        ],
-        5: [
-            "Algorithme exclusif de recommandations durables.",
-            "Forte communauté engagée sur les réseaux.",
-        ],
-        6: [
-            "Canaux digitaux : réseaux sociaux, SEO.",
-            "Partenariats avec influenceurs écoresponsables.",
-            "Boutique physique en pop-up stores.",
-        ],
-        7: [
-            "Taux de rétention client mensuel.",
-            "Taux de satisfaction utilisateur (NPS).",
-        ],
-        8: [
-            "Coût du développement logiciel initial.",
-            "Campagnes publicitaires et communication.",
-            "Frais logistiques (emballages, transport).",
-        ],
-        9: [
-            "Ventes directes sur la plateforme.",
-            "Abonnement mensuel premium pour livraison gratuite.",
-            "Revenus via partenariats de marque.",
-        ],
-    };
-
-    // On extrait les descriptions pour la section demandée
-    const section = leanCanvasData[title] || ["Aucune donnée disponible."];
-
-    // On crée des instances de SectionCell
-    const result = section.map(
-        (txt, index) => new SectionCell({ idSectionCell: index + 1, sectionId: title,
-                                    contentSectionCell: txt, modificationDate: date, })
-    );
-
-    return new Promise<SectionCell[]>((resolve) => {
-        setTimeout(() => resolve(result), 500);
-    });
-};
-</script>
-
-<style scoped>
-@import "@/components/canvas/style-project.css";
-
-.cell {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    transition: all 0.3s ease;
-    cursor: pointer;
-    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.1);
-}
-
-.expanded-content {
-    justify-content: flex-start !important;
-}
-
-.tooltip-explain {
-    position: absolute;
-    bottom: 101%; /* au-dessus de la carte */
-    left: 50%;
-    transform: translateX(-50%);
-    background-color: #333;
-    color: #fff;
-    padding: 6px 12px;
-    font-size: 13px;
-    border-radius: 6px;
-    white-space: nowrap;
-    opacity: 0;
-    pointer-events: none;
-    transition: opacity 0.3s;
-    z-index: 10;
-}
-
-.cell:not(.expanded):hover .tooltip-explain {
-    opacity: 0.9;
-}
-
-.cell:not(.expanded):hover {
-    transform: scale(1.05);
-    box-shadow: 0 8px 9px rgba(0, 0, 0, 0.2);
-}
-
-.cell h3 {
-    font-size: 15px;
-    font-weight: 500;
-    font-family: "Arial", sans-serif;
-}
-
-.p {
-    font-size: 10px;
-    color: #666;
-    font-family: "Arial", sans-serif;
-}
-
-.expanded {
-    padding-top: 10%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: white;
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-}
-
-.description {
-    font-size: 5px;
-    color: #333;
-    word-break: break-word;
-    width: 90%;
-    margin: 5px 0;
-}
-
-.description + .p {
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-}
-
-.edit-input {
-    width: 100%;
-    height: 100%;
-    min-height: 100px;
-    padding: 10px;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    margin-top: 10px;
-    box-sizing: border-box;
-    margin-left: 2%;
-    max-height: none;
-    overflow: hidden;
-}
-
-.button-container {
-    display: block;
-    margin-top: 20px;
-    justify-content: center;
-    align-items: center;
-    gap: 10px;
-    padding-right: 1%;
-}
-
-.section-bloc {
-    background-color: #f3f3f3;
-    border-radius: 8px;
-    padding: 10px 12px;
-    font-family: "Arial", sans-serif;
-    color: #333;
-    word-break: break-word;
-    flex-shrink: 0;
-    cursor: default;
-
-    max-width: 100%;
-    width: fit-content;
-    overflow-wrap: break-word;
-    box-sizing: border-box;
-
-    min-width: 120px;
-}
-
-.editing-section-bloc {
-    width: 100%;
-    justify-content: center;
-    align-items: center;
-    display: flex;
-    margin-right: 10%;
-    margin: 10px;
-}
-
-.edit-button {
-    width: 100px;
-    height: 40px;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    transition: background 0.3s ease;
-    font-size: 12px;
-    margin-right: 20px;
-}
-
-.description p {
-    font-size: 12px;
-}
-
-.save-button,
-.cancel-button {
-    width: 100px;
-    height: 40px;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    transition: background 0.3s ease;
-    font-size: 12px;
-    margin-bottom: 5px;
-}
-
-.edit-button {
-    background-color: #007bff;
-    color: white;
-}
-
-.save-button {
-    background-color: #28a745;
-    color: white;
-}
-
-.cancel-button {
-    background-color: #dc3545;
-    color: white;
-}
-
-.edit-button:hover {
-    background-color: #0056b3;
-}
-
-.save-button:hover {
-    background-color: #218838;
-}
-
-.cancel-button:hover {
-    background-color: #c82333;
-}
-
-.canvas-exit-hint {
-    font-size: 0.75rem;
-    color: #666;
-    position: fixed;
-    bottom: 10px;
-    left: 0;
-    width: 100%;
-    text-align: center;
-    z-index: 1000;
-}
-
-.description-wrapper {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-
-    padding: 10px;
-    overflow: hidden;
-    max-height: 100%;
-    width: 100%;
-    box-sizing: border-box;
-
-    width: 100%;
-    overflow-x: hidden;
-    max-height: 100%;
-    box-sizing: border-box;
-}
-
-.custom-flow {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    justify-content: flex-start;
-    align-items: flex-start;
-    padding: 10px;
-
-    width: 100%;
-    box-sizing: border-box;
-    overflow-x: hidden;
-}
-
-.container {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
-    grid-auto-rows: min-content;
-    grid-auto-flow: dense;
-    gap: 1rem;
-}
-
-.float-up {
-    transform: translateY(-10px);
-}
-.float-left {
-    transform: translateX(-10px);
-}
-.float-right {
-    transform: translateX(10px);
-}
-.wiggle {
-    transform: rotate(1deg);
-}
-.tilt {
-    transform: rotate(-1deg);
-}
-
-.from-left {
-    align-self: flex-start;
-}
-
-.from-right {
-    align-self: flex-end;
-}
-
-.section-bloc.from-left {
-    margin-right: auto;
-    margin-left: 20%;
-}
-
-.section-bloc.from-right {
-    margin-left: auto;
-    margin-right: 20%;
-}
-
-.explain {
-    font-size: 16px;
-    color: #444;
-    background-color: #f9f9f9;
-    padding: 7px;
-    border-left: 4px solid #0d6efd;
-    border-right: 4px solid #0d6efd;
-    border-radius: 6px;
-    margin-bottom: 20px;
-    margin-top: 20px;
-    line-height: 1.6;
-    font-family: "Segoe UI", sans-serif;
-}
-</style>

front/MyINPulse-front/src/components/canvas/HeaderCanvas.vue

@@ -1,253 +0,0 @@
-<template>
-    <header class="header">
-        <a
-            href="https://www.bordeaux-inp.fr/fr/lincubateur-bordeaux-inpulse"
-            target="_blank"
-            rel="noopener"
-        >
-            <img
-                src="../icons/logo inpulse.png"
-                alt="INPulse Logo"
-                class="logo"
-            />
-        </a>
-
-        <div class="header-actions">
-            <div ref="dropdownRef" class="dropdown-wrapper">
-                <button class="contact-button" @click.stop="toggleDropdown">
-                    Contact
-                </button>
-                <div
-                    class="contact-dropdown"
-                    :class="{ 'dropdown-visible': isDropdownOpen }"
-                >
-                    <button @click="contactAll">Contacter tous</button>
-                    <button
-                        v-for="(email, index) in entrepreneurEmails"
-                        :key="index"
-                        @click="contactSingle(email)"
-                    >
-                        {{ email }}
-                    </button>
-                </div>
-            </div>
-            <RouterLink to="/" class="return-button">Retour</RouterLink>
-        </div>
-    </header>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount } from "vue";
-import axios from "axios";
-
-const IS_MOCK_MODE = true;
-const dropdownRef = ref<HTMLElement | null>(null); // ref pour le dropdown
-
-const props = defineProps<{
-    projectId: number;
-}>();
-
-type Entrepreneur = {
-    idUser: number;
-    userSurname: string;
-    userName: string;
-    primaryMail: string;
-    secondaryMail: string;
-    phoneNumber: string;
-    school: string;
-    course: string;
-    sneeStatus: boolean;
-};
-
-const isDropdownOpen = ref(false);
-const entrepreneurEmails = ref<string[]>([]);
-
-const toggleDropdown = () => {
-    isDropdownOpen.value = !isDropdownOpen.value;
-    console.log("Dropdown toggled:", isDropdownOpen.value);
-};
-
-const fetchEntrepreneurs = async (
-    projectId: number,
-    useMock = IS_MOCK_MODE
-) => {
-    try {
-        const responseData: Entrepreneur[] = useMock
-            ? await mockFetchEntrepreneurs(projectId)
-            : (
-                  await axios.get(
-                      `http://localhost:5000/shared/projects/entrepreneurs/${projectId}`
-                  )
-              ).data;
-
-        if (responseData.length > 0) {
-            entrepreneurEmails.value = responseData.map(
-                (item: Entrepreneur) => item.primaryMail
-            );
-        } else {
-            console.warn("Aucun entrepreneur trouvé.");
-        }
-    } catch (error) {
-        console.error(
-            "Erreur lors de la récupération des entrepreneurs :",
-            error
-        );
-    }
-};
-
-// Fonction de simulation de l'API
-const mockFetchEntrepreneurs = async (projectId: number) => {
-    console.log(`Mock fetch pour projectId: ${projectId}`);
-
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            resolve([
-                {
-                    idUser: 1,
-                    userSurname: "Doe",
-                    userName: "John",
-                    primaryMail: "john.doe@example.com",
-                    secondaryMail: "johndoe@backup.com",
-                    phoneNumber: "612345678",
-                    school: "ENSEIRB",
-                    course: "Info",
-                    sneeStatus: false,
-                },
-                {
-                    idUser: 2,
-                    userSurname: "Smith",
-                    userName: "Jane",
-                    primaryMail: "jane.smith@example.com",
-                    secondaryMail: "janesmith@backup.com",
-                    phoneNumber: "698765432",
-                    school: "ENSEIRB",
-                    course: "Info",
-                    sneeStatus: true,
-                },
-            ]);
-        }, 500);
-    });
-};
-
-const contactAll = () => {
-    const allEmails = entrepreneurEmails.value.join(", ");
-    navigator.clipboard
-        .writeText(allEmails)
-        .then(() => {
-            alert("Tous les emails copiés dans le presse-papiers !");
-            window.open("https://partage.bordeaux-inp.fr/", "_blank");
-        })
-        .catch((err) => {
-            console.error("Erreur lors de la copie :", err);
-        });
-};
-
-const contactSingle = (email: string) => {
-    navigator.clipboard
-        .writeText(email)
-        .then(() => {
-            alert(`Adresse copiée : ${email}`);
-            window.open("https://partage.bordeaux-inp.fr/", "_blank");
-        })
-        .catch((err) => {
-            console.error("Erreur lors de la copie :", err);
-        });
-};
-
-// Cacher le menu si on clique en dehors
-const handleClickOutside = (event: MouseEvent) => {
-    if (
-        isDropdownOpen.value &&
-        dropdownRef.value &&
-        !dropdownRef.value.contains(event.target as Node)
-    ) {
-        isDropdownOpen.value = false;
-    }
-};
-
-onMounted(() => {
-    fetchEntrepreneurs(props.projectId, IS_MOCK_MODE);
-    document.addEventListener("click", handleClickOutside);
-});
-
-onBeforeUnmount(() => {
-    document.removeEventListener("click", handleClickOutside);
-});
-</script>
-
-<style scoped>
-@import "@/components/canvas/style-project.css";
-
-.header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 15px 30px;
-    background-color: #f9f9f9;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.logo {
-    height: 50px;
-}
-
-.header-actions {
-    display: flex;
-    align-items: center;
-    gap: 20px;
-    position: relative;
-}
-
-.contact-button,
-.return-button {
-    background-color: #009cde;
-    color: white;
-    border: none;
-    padding: 10px 15px;
-    cursor: pointer;
-    font-size: 14px;
-    border-radius: 5px;
-    text-decoration: none;
-    transition: background-color 0.2s ease;
-    font-family: Arial, sans-serif;
-}
-
-.return-button:hover,
-.contact-button:hover {
-    background-color: #007bad;
-}
-
-.contact-dropdown {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    background-color: #000;
-    color: white;
-    box-shadow: 0px 4px 8px rgba(255, 255, 255, 0.2);
-    border-radius: 8px;
-    padding: 10px;
-    margin-top: 5px;
-    z-index: 1000;
-    min-width: 200px;
-    display: none;
-}
-
-.contact-dropdown button {
-    display: block;
-    width: 100%;
-    padding: 5px;
-    text-align: left;
-    border: none;
-    background: none;
-    cursor: pointer;
-    color: white;
-}
-
-.contact-dropdown button:hover {
-    background-color: #009cde;
-}
-
-.contact-dropdown.dropdown-visible {
-    display: block;
-}
-</style>

front/MyINPulse-front/src/components/canvas/LeanCanvas.vue

@@ -1,204 +0,0 @@
-<template>
-    <div class="canvas container-fluid">
-        <CanvasItem
-            v-for="(item, index) in items"
-            :key="index"
-            :title="item.title"
-            :title-text="item.title_text"
-            :description="item.description"
-            :project-id="item.projectId"
-            :class="['canvas-item', item.class, 'card', 'shadow', 'p-3']"
-            :is-admin="props.isAdmin"
-        />
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-import CanvasItem from "@/components/canvas/CanvasItem.vue";
-
-const props = defineProps<{
-    isAdmin: number;
-}>();
-
-const items = ref([
-    {
-        projectId: 1,
-        title: 1,
-        title_text: "1. Problème",
-        description: "3 problèmes essentiels à résoudre pour le client",
-        class: "Probleme",
-    },
-    {
-        projectId: 1,
-        title: 2,
-        title_text: "2. Segments",
-        description: "Les segments de clientèle visés",
-        class: "Segments",
-    },
-    {
-        projectId: 1,
-        title: 3,
-        title_text: "3. Valeur",
-        description: "La proposition de valeur",
-        class: "Valeur",
-    },
-    {
-        projectId: 1,
-        title: 4,
-        title_text: "4. Solution",
-        description: "Les solutions proposées",
-        class: "Solution",
-    },
-    {
-        projectId: 1,
-        title: 5,
-        title_text: "5. Avantage",
-        description: "Les avantages concurrentiels",
-        class: "Avantage",
-    },
-    {
-        projectId: 1,
-        title: 6,
-        title_text: "6. Canaux",
-        description: "Les canaux de distribution",
-        class: "Canaux",
-    },
-    {
-        projectId: 1,
-        title: 7,
-        title_text: "7. Indicateurs",
-        description: "Les indicateurs clés de performance",
-        class: "Indicateurs",
-    },
-    {
-        projectId: 1,
-        title: 8,
-        title_text: "8. Coûts",
-        description: "Les coûts associés",
-        class: "Couts",
-    },
-    {
-        projectId: 1,
-        title: 9,
-        title_text: "9. Revenus",
-        description: "Les sources de revenus",
-        class: "Revenus",
-    },
-]);
-
-/*
-onMounted(() => {
-    const bootstrapCss = document.createElement("link");
-    bootstrapCss.rel = "stylesheet";
-    bootstrapCss.href =
-        "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css";
-    bootstrapCss.integrity =
-        "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+Fpc+NC";
-    bootstrapCss.crossOrigin = "anonymous";
-    document.head.appendChild(bootstrapCss);
-
-    const bootstrapJs = document.createElement("script");
-    bootstrapJs.src =
-        "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js";
-    bootstrapJs.integrity =
-        "sha384-mQ93S0EhrF4Z1nM+fTflmYf0DyzsY5j7F5H3WlClDD6H3WUJh6kxBkF3GDW8n1j6";
-    bootstrapJs.crossOrigin = "anonymous";
-    document.body.appendChild(bootstrapJs);
-});
-*/
-</script>
-
-<style scoped>
-@import "@/components/canvas/style-project.css";
-
-.canvas {
-    display: grid;
-    grid-template-columns: repeat(10, minmax(0, 1fr));
-    grid-auto-rows: min-content;
-    gap: 12px;
-    padding: 30px;
-    position: relative;
-    height: auto; /* autorise la hauteur à s'ajuster selon le contenu */
-    max-height: none; /* enlève la limite de hauteur */
-    box-sizing: border-box;
-    overflow: visible; /* autorise le débordement visible */
-}
-
-@media (max-width: 768px) {
-    .canvas {
-        grid-template-columns: repeat(1, 1fr);
-    }
-}
-
-.Probleme {
-    grid-column: 1 / 3;
-    grid-row: 1 / 5;
-}
-.Segments {
-    grid-column: 9 / 11;
-    grid-row: 1 / 5;
-}
-.Valeur {
-    grid-column: 5 / 7;
-    grid-row: 1 / 5;
-}
-.Solution {
-    grid-column: 3 / 5;
-    grid-row: 1 / 3;
-}
-.Avantage {
-    grid-column: 7 / 9;
-    grid-row: 1 / 3;
-}
-.Canaux {
-    grid-column: 7 / 9;
-    grid-row: 3 / 5;
-}
-.Indicateurs {
-    grid-column: 3 / 5;
-    grid-row: 3 / 5;
-}
-.Couts {
-    grid-column: 1 / 6;
-    grid-row: 5 / 7;
-}
-.Revenus {
-    grid-column: 6 / 11;
-    grid-row: 5 / 7;
-}
-
-.canvas-item {
-    /*background-color: white;*/
-    border: 1px solid #dee2e6;
-    border-radius: 0.5rem;
-}
-
-.Probleme {
-    background-color: #ffdddd;
-}
-.Segments {
-    background-color: #ddffdd;
-}
-.Valeur {
-    background-color: #ddddff;
-}
-.Solution {
-    background-color: #fff0b3;
-}
-.Avantage {
-    background-color: #d1c4e9;
-}
-.Canaux {
-    background-color: #b2ebf2;
-}
-.Indicateurs {
-    background-color: #ffe082;
-}
-.Couts {
-    background-color: #ffcdd2;
-}
-.Revenus {
-    background-color: #c8e6c9;
-}
-</style>

front/MyINPulse-front/src/components/canvas/style-project.css

@@ -1,156 +0,0 @@
-body {
-    font-family: Arial, sans-serif;
-    margin: 0;
-    padding: 10px;
-}
-
-.row {
-    display: flex;
-}
-
-.cell {
-    flex: 1;
-    border: 1px solid #ddd;
-    padding: 10px;
-    text-align: center;
-    background-color: #f1f1f1;
-}
-
-.produit {
-    background-color: #f9e4e4;
-}
-
-.marche {
-    background-color: #e4f1f9;
-}
-
-.valeur {
-    background-color: #f9f4e4;
-}
-
-h3 {
-    margin: 0;
-    font-size: 18px;
-    color: #333;
-}
-
-p {
-    margin: 5px 0 0;
-    font-size: 14px;
-}
-
-body {
-    font-family: Arial, sans-serif;
-    margin: 0;
-    padding: 0;
-    background-color: #f9f9f9;
-}
-
-h1 img {
-    height: 80px;
-    margin: 40px;
-    text-align: center;
-}
-
-.row {
-    display: flex;
-    margin-bottom: 10px;
-}
-
-#ade {
-    max-width: 1200px;
-    margin: 20px auto;
-    padding: 20px;
-    text-align: center;
-    background-color: #e8f5e9;
-    border: 2px solid #4caf50;
-    border-radius: 10px;
-}
-
-#ade h3 {
-    color: #2e7d32;
-}
-
-#ade p {
-    margin: 10px 0;
-    font-size: 16px;
-    color: #333;
-}
-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 20px;
-    background-color: #fff;
-    border-bottom: 2px solid #ddd;
-}
-
-header img {
-    height: 60px;
-}
-
-header .contact-menu {
-    position: relative;
-}
-
-.contact-button,
-.return {
-    padding: 10px 15px;
-    border: none;
-    border-radius: 4px;
-    background-color: #2196f3;
-    color: #fff;
-    cursor: pointer;
-}
-
-.contact-button:hover,
-.return:hover {
-    background-color: #1976d2;
-}
-
-/* Dropdown styling */
-.contact-dropdown {
-    position: absolute;
-    right: 0;
-    top: 50px;
-    display: none;
-    flex-direction: column;
-    gap: 10px;
-    padding: 15px;
-    background-color: #fff;
-    border: 1px solid #ddd;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    z-index: 10;
-}
-
-.contact-dropdown button {
-    padding: 8px 12px;
-    border: none;
-    border-radius: 4px;
-    background-color: #4caf50;
-    color: #fff;
-    cursor: pointer;
-}
-
-.contact-dropdown button:hover {
-    background-color: #388e3c;
-}
-
-.return {
-    background-color: #f44336;
-}
-
-.return:hover {
-    background-color: #d32f2f;
-}
-
-.header-buttons {
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-a {
-    color: white;
-}

front/MyINPulse-front/src/main.ts

@@ -28,46 +28,4 @@ keycloakService.CallInit(() => {
     }
 });
 
-// this shit made by me so i can run the canva vue app
-//createApp(App).use(router).mount('#app');
-
-// TODO: fix the comment
-/*
-function tokenInterceptor () {
-    axios.interceptors.request.use(config => {
-        const keycloak = useKeycloak()
-        if (keycloak.authenticated) {
-            // Note that this is a simple example.
-            // you should be careful not to leak tokens to third parties.
-            // in this example the token is added to all usage of axios.
-            config.headers.Authorization = `Bearer ${keycloak.token}`
-        }
-        return config
-    }, error => {
-        console.error("tokenInterceptor: Rejected")
-        return Promise.reject(error)
-    })
-}
-*/
-
-/*
-app.use(VueKeyCloak,{
-    onReady: (keycloak) => {
-        console.log("Ready !")
-        tokenInterceptor()
-    },
-    init: {
-        onLoad: 'login-required',
-        checkLoginIframe: false,
-
-    },
-
-    config: {
-        realm: 'test',
-        url: 'http://localhost:7080',
-        clientId: 'myinpulse'
-    }
-}  );
-*/
-
 export { store };

front/MyINPulse-front/src/plugins/authStore.ts

@@ -1,16 +0,0 @@
-// file: src/plugins/authStore.js
-
-import { useAuthStore } from "@/stores/authStore.ts";
-import keycloakService from "@/services/keycloak";
-import type { Pinia } from "pinia";
-import type { App } from "vue";
-// Setup auth store as a plugin so it can be accessed globally in our FE
-const authStorePlugin = {
-    install(app: App, option: { pinia: Pinia }) {
-        const store = useAuthStore(option.pinia);
-        app.config.globalProperties.$store = store;
-        keycloakService.CallInitStore(store);
-    },
-};
-
-export default authStorePlugin;

front/MyINPulse-front/src/router/router.ts

@@ -11,35 +11,6 @@ const router = createRouter({
             // which is lazy-loaded when the route is visited.
             component: () => import("../views/testComponent.vue"),
         },
-        {
-            path: "/",
-            name: "login",
-            component: () => import("../components/LoginComponent.vue"),
-        },
-        {
-            path: "/admin",
-            name: "Admin-main",
-            component: () => import("../views/AdminMain.vue"),
-        },
-
-        // route pour les canvas (made by adnane), in fact the two vue apps are separated for now
-        {
-            path: "/canvas",
-            name: "canvas",
-            component: () => import("../views/CanvasView.vue"),
-        },
-
-        {
-            path: "/signup",
-            name: "signup",
-            component: () => import("../views/EntrepSignUp.vue"),
-        },
-
-        {
-            path: "/JorCproject",
-            name: "JorCproject",
-            component: () => import("../views/JoinOrCreatProjectForEntrep.vue"),
-        },
     ],
 });
 

front/MyINPulse-front/src/services/Apis/Admin.ts

@@ -1,321 +0,0 @@
-import { type AxiosError, type AxiosResponse } from "axios";
-import Project from "@/ApiClasses/Project";
-import Report from "@/ApiClasses/Repport";
-import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
-
-// Admin API
-function getPendingAccounts(
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get("/admin/pending-accounts")
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function validateUserAccount(
-    userId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post(`/admin/accounts/validate/${userId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-// function getPendingProjectJoinRequests( // Not yet implemented [cite: 3]
-//     onSuccessHandler?: (response: AxiosResponse) => void,
-//     onErrorHandler?: (error: AxiosError) => void
-// ): void {
-//     axiosInstance
-//         .get("/admin/request-join")
-//          .then((response) => {
-//             if (onSuccessHandler) {
-//                 onSuccessHandler(response);
-//             } else {
-//                 defaultApiSuccessHandler(response);
-//             }
-//         })
-//         .catch((error: AxiosError) => {
-//             if (onErrorHandler) {
-//                 onErrorHandler(error);
-//             } else {
-//                 defaultApiErrorHandler(error);
-//             }
-//         });
-// }
-
-// function decideProjectJoinRequest( // Not yet implemented [cite: 3]
-//     joinRequestId: number,
-//     decision: { isAccepted: boolean },
-//     onSuccessHandler?: (response: AxiosResponse) => void,
-//     onErrorHandler?: (error: AxiosError) => void
-// ): void {
-//     axiosInstance
-//         .post(`/admin/request-join/decision/${joinRequestId}`, decision)
-//          .then((response) => {
-//             if (onSuccessHandler) {
-//                 onSuccessHandler(response);
-//             } else {
-//                 defaultApiSuccessHandler(response);
-//             }
-//         })
-//         .catch((error: AxiosError) => {
-//             if (onErrorHandler) {
-//                 onErrorHandler(error);
-//             } else {
-//                 defaultApiErrorHandler(error);
-//             }
-//         });
-// }
-
-function getAdminProjects(
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get("/admin/projects")
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function addProjectManually(
-    projectDetails: Project, // Replace 'any' with a proper type for project details if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post("/admin/projects", projectDetails)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getPendingProjects(
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get("/admin/projects/pending")
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function decidePendingProject(
-    pendingProjectId: number,
-    decision: { projectId: number; adminId: number; isAccepted: boolean }, // Replace 'any' with a proper type for project decision if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post(`/admin/projects/pending/decision/${pendingProjectId}`, decision)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function createAppointmentReport(
-    appointmentId: number,
-    reportContent: Report, // Replace 'any' with a proper type for report content if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post(`/admin/appointments/report/${appointmentId}`, reportContent)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function updateAppointmentReport(
-    appointmentId: number,
-    reportContent: Report, // Replace 'any' with a proper type for report content if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .put(`/admin/appointments/report/${appointmentId}`, reportContent)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getUpcomingAppointments(
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get("/admin/appointments/upcoming")
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function removeProject(
-    projectId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .delete(`/admin/projects/${projectId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function grantAdminRights(
-    userId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post(`/admin/make-admin/${userId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-export {
-    axiosInstance,
-    // requestJoinProject, // Not yet implemented [cite: 4]
-    getPendingAccounts,
-    validateUserAccount,
-    // getPendingProjectJoinRequests, // Not yet implemented [cite: 3]
-    // decideProjectJoinRequest, // Not yet implemented [cite: 3]
-    getAdminProjects,
-    addProjectManually,
-    getPendingProjects,
-    decidePendingProject,
-    createAppointmentReport,
-    updateAppointmentReport,
-    getUpcomingAppointments,
-    removeProject,
-    grantAdminRights,
-};

front/MyINPulse-front/src/services/Apis/Entrepreneurs.ts

@@ -1,134 +0,0 @@
-import Project from "@/ApiClasses/Project";
-import SectionCell from "@/ApiClasses/SectionCell";
-import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
-
-axiosInstance.interceptors.response.use(
-    (response) => response, // Directly return successful responses.
-    async (error) => {
-        const originalRequest = error.config;
-        if (
-            ((error.response && error.response.status === 401) ||
-                error.code == "ERR_NETWORK") &&
-            !originalRequest._retry &&
-            store.authenticated
-        ) {
-            originalRequest._retry = true; // Mark the request as retried to avoid infinite loops.
-            try {
-                await store.refreshUserToken();
-                // Update the authorization header with the new access token.
-                axiosInstance.defaults.headers.common["Authorization"] =
-                    `Bearer ${store.user.token}`;
-                return axiosInstance(originalRequest); // Retry the original request with the new access token.
-            } catch (refreshError) {
-                // Handle refresh token errors by clearing stored tokens and redirecting to the login page.
-                console.error("Token refresh failed:", refreshError);
-                localStorage.removeItem("accessToken");
-                localStorage.removeItem("refreshToken");
-                router.push("/login");
-                return Promise.reject(refreshError);
-            }
-        }
-        return Promise.reject(error); // For all other errors, return the error as is.
-    }
-);
-
-// Entrepreneurs API
-function requestProjectCreation(
-    projectDetails: Project, // Replace 'any' with a proper type for project details if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post("/entrepreneur/projects/request", projectDetails)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function addSectionCell(
-    sectionCellDetails: SectionCell,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post("/entrepreneur/sectionCells", sectionCellDetails.toPlainObject())  // <-- Ici
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function modifySectionCell(
-    sectionCellId: number,
-    sectionCellDetails: SectionCell, // Replace 'any' with a proper type for section cell details if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .put(`/entrepreneur/sectionCells/${sectionCellId}`, sectionCellDetails)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function removeSectionCell(
-    sectionCellId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .delete(`/entrepreneur/sectionCells/${sectionCellId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-export {
-    requestProjectCreation,
-    addSectionCell,
-    modifySectionCell,
-    removeSectionCell,
-};

front/MyINPulse-front/src/services/Apis/Shared.ts

@@ -1,154 +0,0 @@
-import { type AxiosError, type AxiosResponse } from "axios";
-import Appointment from "@/ApiClasses/Appointment";
-import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
-
-
-// Shared API
-function getSectionCellsByDate(
-    projectId: number,
-    sectionId: number,
-    date: string, // Use string for date in 'YYYY-MM-DD HH:mm' format
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get(`/shared/projects/sectionCells/${projectId}/${sectionId}/${date}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getProjectEntrepreneurs(
-    projectId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get(`/shared/projects/entrepreneurs/${projectId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getProjectAdmin(
-    projectId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get(`/shared/projects/admin/${projectId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getProjectAppointments(
-    projectId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get(`/shared/projects/appointments/${projectId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function getAppointmentReport(
-    appointmentId: number,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .get(`/shared/appointments/report/${appointmentId}`)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-function requestAppointment(
-    appointmentDetails: Appointment, // Replace 'any' with a proper type for appointment details if available
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post("/shared/appointments/request", appointmentDetails)
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-export {
-    getSectionCellsByDate,
-    getProjectEntrepreneurs,
-    getProjectAdmin,
-    getProjectAppointments,
-    getAppointmentReport,
-    requestAppointment,
-};

front/MyINPulse-front/src/services/Apis/Unauth.ts

@@ -1,56 +0,0 @@
-import { type AxiosError, type AxiosResponse } from "axios";
-
-import { axiosInstance, defaultApiErrorHandler, defaultApiSuccessHandler } from "@/services/api"
-
-
-// Unauth API
-function finalizeAccount(
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post("/unauth/finalize")
-        .then((response) => {
-            if (onSuccessHandler) {
-                onSuccessHandler(response);
-            } else {
-                defaultApiSuccessHandler(response);
-            }
-        })
-        .catch((error: AxiosError) => {
-            if (onErrorHandler) {
-                onErrorHandler(error);
-            } else {
-                defaultApiErrorHandler(error);
-            }
-        });
-}
-
-// function requestJoinProject( // Not yet implemented [cite: 4]
-//     projectId: number,
-//     onSuccessHandler?: (response: AxiosResponse) => void,
-//     onErrorHandler?: (error: AxiosError) => void
-// ): void {
-//     axiosInstance
-//         .post(`/unauth/request-join/${projectId}`)
-//          .then((response) => {
-//             if (onSuccessHandler) {
-//                 onSuccessHandler(response);
-//             } else {
-//                 defaultApiSuccessHandler(response);
-//             }
-//         })
-//         .catch((error: AxiosError) => {
-//             if (onErrorHandler) {
-//                 onErrorHandler(error);
-//             } else {
-//                 defaultApiErrorHandler(error);
-//             }
-//         });
-// }
-
-
-export {   
-    finalizeAccount,
-    // requestJoinProject, // Not yet implemented [cite: 4]
-};

front/MyINPulse-front/src/services/api.ts

@@ -65,27 +65,4 @@ function callApi(
         );
 }
 
-function postApi(
+export { callApi };
-    endpoint: string,
-    data: unknown, //to fix eslint issue, go back here if errors occurs later
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .post(endpoint, data)
-        .then(onSuccessHandler ?? defaultApiSuccessHandler)
-        .catch(onErrorHandler ?? defaultApiErrorHandler);
-}
-
-function deleteApi(
-    endpoint: string,
-    onSuccessHandler?: (response: AxiosResponse) => void,
-    onErrorHandler?: (error: AxiosError) => void
-): void {
-    axiosInstance
-        .delete(endpoint)
-        .then(onSuccessHandler ?? defaultApiSuccessHandler)
-        .catch(onErrorHandler ?? defaultApiErrorHandler);
-}
-
-export { axiosInstance, callApi, postApi, deleteApi };

front/MyINPulse-front/src/stores/authStore.ts

@@ -54,7 +54,7 @@ const useAuthStore = defineStore("storeAuth", {
         async logout() {
             try {
                 await keycloakService.CallLogout(
-                    import.meta.env.VITE_APP_URL + "/" //redirect to login page instead of test...
+                    import.meta.env.VITE_APP_URL + "/test"
                 );
                 await this.clearUserData();
             } catch (error) {

front/MyINPulse-front/src/views/AdminMain.vue

@@ -1,160 +0,0 @@
-<template>
-    <Header />
-    <error-wrapper></error-wrapper>
-    <div id="container">
-        <div id="main">
-            <h3>Projet en cours</h3>
-            <ProjectComp
-                v-for="(project, index) in projects"
-                :key="index"
-                :project-name="project.name"
-                :list-name="project.members"
-                :project-link="project.link"
-                :project-id="0"
-            />
-
-            <div id="main">
-                <h3>Projet en attente</h3>
-
-                <PendingProjectComponent
-                    v-for="(project, index) in pendingProjects"
-                    :key="index"
-                    :project-name="project.name"
-                    :creation-date="project.creationDate"
-                />
-            </div>
-
-            <AddProjectForm />
-        </div>
-
-        <Agenda :project-r-d-v="rendezVous" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref /*, onMounted*/ } from "vue";
-//import { callApi } from "@/services/api";
-
-import Header from "../components/HeaderComponent.vue";
-import Agenda from "../components/AgendaComponent.vue";
-import ProjectComp from "../components/ProjectComponent.vue";
-import PendingProjectComponent from "@/components/PendingProjectComponent.vue";
-import AddProjectForm from "@/components/AddProjectForm.vue";
-
-//const PORT = "8081";
-//const URI = `http://localhost:${PORT}`;
-
-//const projects = ref<{ name: string; link: string; members: string[] }[]>([]);
-
-/* const fetchProjects = () => {
-  callApi(
-    `${URI}/admin/projects`,
-    async (response) => {
-      console.log(response);
-      const projectList = response.data;
-
-      const projectPromises = projectList.map((project: any) => {
-        return new Promise(async (resolve) => {
-          callApi(
-            `${URI}/shared/projects/entrepreneurs/${project.idProject}`,
-            (memberResponse) => {
-              const members = memberResponse.data.map((m: any) => m.userName);
-              resolve({
-                name: project.projectName,
-                link: `/project/${project.idProject}`,
-                members,
-              });
-            },
-            () => {
-              // Error fetching members, still resolve with empty members
-              resolve({
-                name: project.projectName,
-                link: `/project/${project.idProject}`,
-                members: [],
-              });
-            }
-          );
-        });
-      });
-
-      projects.value = await Promise.all(projectPromises);
-    },
-    (error) => {
-      console.error("Error fetching projects:", error);
-    }
-  );
-};
-
-onMounted(fetchProjects);
- */
-
-const projects = ref([
-    {
-        name: "Projet Alpha",
-        link: "/canvas", // to test
-        members: ["Alice", "Bob", "Charlie"],
-    },
-    {
-        name: "Projet Beta",
-        link: "./canvas", // to test
-        members: ["David", "Eve", "Frank"],
-    },
-]);
-
-const pendingProjects = ref([
-    { name: "l'eau", creationDate: "26-02-2024" },
-    { name: "l'air", creationDate: "09-03-2023" },
-]);
-
-const rendezVous = ref([
-    { projectName: "Projet Alpha", date: "2025-03-10", lieu: "P106" },
-    { projectName: "Projet Beta", date: "2025-04-15", lieu: "Td10" },
-]);
-</script>
-
-<style scoped>
-#container {
-    display: grid;
-    grid-template-columns: 3fr 1fr;
-    gap: 2rem;
-    padding: 2rem;
-    background-color: #f4f6f9;
-    min-height: 100vh;
-    box-sizing: border-box;
-}
-
-#main {
-    background-color: #fff;
-    padding: 2rem;
-    border-radius: 12px;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-}
-
-h3 {
-    font-size: 1.5rem;
-    color: #333;
-    margin-bottom: 1.2rem;
-    border-bottom: 2px solid #ddd;
-    padding-bottom: 0.5rem;
-}
-
-button {
-    padding: 10px 15px;
-    background-color: #007bff;
-    color: white;
-    border: none;
-    cursor: pointer;
-    border-radius: 6px;
-    font-weight: 500;
-    transition: background-color 0.2s ease;
-}
-
-button:hover {
-    background-color: #0056b3;
-}
-
-/* Add spacing between project sections */
-#main > * + * {
-    margin-top: 2rem;
-}
-</style>

front/MyINPulse-front/src/views/CanvasView.vue

@@ -1,149 +0,0 @@
-<template>
-    <div>
-        <header>
-            <HeaderCanvas :project-id="1" />
-        </header>
-    </div>
-    <div>
-        <h1 class="page-title">PAGE CANVAS</h1>
-        <p class="canvas-help-text">
-            Cliquez sur un champ du tableau pour afficher son contenu en détail
-            ci-dessous.
-        </p>
-        <LeanCanvas :is-admin="isAdmin" />
-        <div class="info-box">
-            <p>
-                Responsable :
-                <strong>{{ admin.userName }} {{ admin.userSurname }}</strong
-                ><br />
-                Contact :
-                <a href="mailto:{{ admin.primaryMail }}">{{
-                    admin.primaryMail
-                }}</a>
-                |
-                <a href="tel:{{ admin.phoneNumber }}">{{
-                    admin.phoneNumber
-                }}</a>
-            </p>
-            <div class="main"></div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import HeaderCanvas from "../components/canvas/HeaderCanvas.vue";
-import LeanCanvas from "../components/canvas/LeanCanvas.vue";
-import { ref, onMounted /*, defineProps*/ } from "vue";
-import { axiosInstance } from "@/services/api.ts";
-
-const IS_MOCK_MODE = true;
-
-/* 
-const props = defineProps<{
-  projectId: number;
-  token: TokenPayload;
-}>();
-
-
-is_admin = token.includes("MyINPulse-admin")
-  */
-
-const isAdmin = 0;
-
-// Variables pour les informations de l'administrateur
-const admin = ref({
-    idUser: 0,
-    userSurname: "",
-    userName: "",
-    primaryMail: "",
-    secondaryMail: "",
-    phoneNumber: "",
-});
-
-const mockAdminData = {
-    idUser: 1,
-    userSurname: "ALAMI",
-    userName: "Adnane",
-    primaryMail: "mock.admin@example.com",
-    secondaryMail: "admin.backup@example.com",
-    phoneNumber: "0600000000",
-};
-
-// Fonction pour récupérer les données de l'administrateur
-const fetchAdminData = async (projectId: number, useMock = IS_MOCK_MODE) => {
-    try {
-        if (useMock) {
-            console.log(
-                "Utilisation des données mockées pour l'administrateur"
-            );
-            admin.value = mockAdminData;
-            return;
-        }
-
-        const response = await axiosInstance.get(
-            `/shared/projects/admin/${projectId}`
-        );
-        admin.value = response.data;
-    } catch (error) {
-        console.error(
-            "Erreur lors de la récupération des données de l'administrateur :",
-            error
-        );
-    }
-};
-
-// Appeler la fonction fetch au montage du composant
-onMounted(() => {
-    const projectId = 1;
-    fetchAdminData(projectId);
-});
-</script>
-
-<style scoped>
-.page-title {
-    text-align: center;
-    font-size: 2.5rem;
-    margin-top: 20px;
-}
-
-.canvas-help-text {
-    text-align: center;
-    font-size: 0.7rem;
-    color: #666;
-}
-
-.info-box {
-    background-color: #f9f9f9;
-    padding: 15px;
-    border-radius: 8px;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-    font-family: Arial, sans-serif;
-    width: 30%;
-    max-width: 600px;
-    margin: 20px auto;
-}
-
-.info-box p {
-    font-size: 16px;
-    line-height: 1.5;
-    color: #333;
-}
-
-.info-box a {
-    color: #007bff;
-    text-decoration: none;
-}
-
-.info-box a:hover {
-    text-decoration: underline;
-}
-
-.canvas-help-text {
-    margin-top: 20px;
-    margin-bottom: -10px;
-}
-
-div:last-child {
-    margin-bottom: 60px;
-}
-</style>

front/MyINPulse-front/src/views/EntrepSignUp.vue

@@ -1,185 +0,0 @@
-<template>
-    <form class="add-project-form" @submit.prevent="submitForm">
-        <h2>Ajouter un projet</h2>
-
-        <div class="form-group">
-            <label for="name">Nom du projet</label>
-            <input id="name" v-model="form.name" type="text" required />
-        </div>
-
-        <h3>Entrepreneur</h3>
-
-        <div class="form-group">
-            <label for="founderName">Nom</label>
-            <input
-                id="founderName"
-                v-model="form.founder.userName"
-                type="text"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderSurname">Prénom</label>
-            <input
-                id="founderSurname"
-                v-model="form.founder.userSurname"
-                type="text"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderPrimaryMail">Email Principal</label>
-            <input
-                id="founderPrimaryMail"
-                v-model="form.founder.primaryMail"
-                type="email"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderSecondaryMail">Email Secondaire</label>
-            <input
-                id="founderSecondaryMail"
-                v-model="form.founder.secondaryMail"
-                type="email"
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderPhoneNumber">Numéro de téléphone</label>
-            <input
-                id="founderPhoneNumber"
-                v-model="form.founder.phoneNumber"
-                type="tel"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderSchool">École</label>
-            <input
-                id="founderSchool"
-                v-model="form.founder.school"
-                type="text"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderCourse">Département</label>
-            <input
-                id="founderCourse"
-                v-model="form.founder.course"
-                type="text"
-                required
-            />
-        </div>
-        <div class="form-group">
-            <label for="founderSneeStatus">Statut étudiant entrepreneur</label>
-            <input
-                id="founderSneeStatus"
-                v-model="form.founder.sneeStatus"
-                type="checkbox"
-            />
-        </div>
-
-        <button type="submit">Soumettre</button>
-    </form>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-import { postApi } from "@/services/api";
-
-const form = ref({
-    name: "",
-    founder: {
-        userSurname: "",
-        userName: "",
-        primaryMail: "",
-        secondaryMail: "",
-        phoneNumber: "",
-        school: "",
-        course: "",
-        sneeStatus: false,
-    },
-});
-
-function submitForm() {
-    postApi("/entrepreneur/projects/request", form.value);
-}
-</script>
-
-<style scoped>
-@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap");
-
-.add-project-form {
-    font-family: "Inter", sans-serif;
-    max-width: 600px;
-    margin: 0 auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Le reste reste inchangé */
-h2 {
-    margin-bottom: 20px;
-    font-size: 24px;
-    color: #333;
-}
-
-h3 {
-    margin-top: 20px;
-    font-size: 20px;
-    color: #555;
-}
-
-.form-group {
-    margin-bottom: 15px;
-    display: flex;
-    flex-direction: column;
-}
-
-label {
-    font-weight: 500;
-    margin-bottom: 5px;
-}
-
-input {
-    padding: 8px;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-    font-size: 1em;
-}
-
-input[type="checkbox"] {
-    width: auto;
-    margin-right: 10px;
-}
-
-button {
-    background-color: #4caf50;
-    color: white;
-    padding: 10px 15px;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    font-size: 1em;
-    width: 100%;
-    font-weight: 500;
-}
-
-button:hover {
-    background-color: #45a049;
-}
-
-button:active {
-    background-color: #388e3c;
-}
-
-input[type="text"]:focus,
-input[type="email"]:focus,
-input[type="tel"]:focus {
-    border-color: #4caf50;
-    outline: none;
-}
-</style>

front/MyINPulse-front/src/views/JoinOrCreatProjectForEntrep.vue

@@ -1,115 +0,0 @@
-<template>
-    <header class="header">
-        <img
-            src="@/components/icons/logo inpulse.png"
-            alt="INPulse Logo"
-            class="logo"
-        />
-    </header>
-
-    <div class="choix-projet">
-        <h1>Bienvenue sur MyINPulse</h1>
-        <p>
-            Souhaitez-vous créer un nouveau projet ou joindre un projet existant
-            ?
-        </p>
-
-        <div class="button-group">
-            <button @click="choisir('creer')">Créer un projet</button>
-            <button @click="choisir('joindre')">Joindre un projet</button>
-        </div>
-
-        <div v-if="choix === 'creer'" class="form-creer">
-            <h2>Créer un projet</h2>
-            <label for="nomProjet">Nom du projet :</label>
-            <input
-                id="nomProjet"
-                v-model="nomProjet"
-                type="text"
-                placeholder="Nom du projet"
-            />
-            <button @click="validerCreation">Valider</button>
-        </div>
-
-        <div v-if="choix === 'joindre'" class="message-indispo">
-            <h2>Joindre un projet</h2>
-            <p>Cette fonctionnalité n'est pas encore disponible.</p>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-
-const choix = ref<string | null>(null);
-const nomProjet = ref("");
-
-const choisir = (option: "creer" | "joindre") => {
-    choix.value = option;
-};
-
-const validerCreation = () => {
-    if (!nomProjet.value.trim()) {
-        alert("Veuillez entrer un nom de projet.");
-        return;
-    }
-    alert(`Projet "${nomProjet.value}" créé avec succès !`);
-};
-</script>
-
-<style scoped>
-@import "@/components/canvas/style-project.css";
-
-.choix-projet {
-    max-width: 500px;
-    margin: auto;
-    padding: 2rem;
-    background-color: #fefefe;
-    border-radius: 10px;
-    font-family: "Inter", sans-serif;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-    text-align: center;
-}
-
-.button-group {
-    margin: 20px 0;
-    display: flex;
-    justify-content: space-around;
-}
-
-button {
-    padding: 10px 20px;
-    font-size: 1em;
-    background-color: #4caf50;
-    color: white;
-    border: none;
-    border-radius: 6px;
-    cursor: pointer;
-}
-
-button:hover {
-    background-color: #43a047;
-}
-
-input {
-    padding: 10px;
-    margin-top: 10px;
-    width: 80%;
-    font-size: 1em;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-}
-
-.header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 15px 30px;
-    background-color: #f9f9f9;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.logo {
-    height: 50px;
-}
-</style>

front/MyINPulse-front/src/views/errorWrapper.vue

@@ -18,7 +18,7 @@ import ErrorModal from "@/components/errorModal.vue";
 .error-wrapper {
     position: absolute;
     left: 70%;
-    /*background-color: blue;*/
+    //background-color: blue;
     height: 100%;
     width: 30%;
 }

front/MyINPulse-front/src/views/testComponent.vue

@@ -4,7 +4,6 @@ import { callApi } from "@/services/api.ts";
 import { ref } from "vue";
 
 const CustomRequest = ref("");
-const USERID = ref("");
 </script>
 
 <template>
@@ -35,7 +34,30 @@ const USERID = ref("");
                 <td>Current refresh token</td>
                 <td>{{ store.user.refreshToken }}</td>
             </tr>
-
+            <tr>
+                <td>Entrepreneur API call</td>
+                <td>
+                    <button @click="callApi('random')">call</button>
+                </td>
+                <td>res</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>Admin API call</td>
+                <td>
+                    <button @click="callApi('random2')">call</button>
+                </td>
+                <td>res</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>Unauth API call</td>
+                <td>
+                    <button @click="callApi('unauth/dev')">call</button>
+                </td>
+                <td>res</td>
+                <td id="3"></td>
+            </tr>
             <tr>
                 <td>
                     <input v-model="CustomRequest" placeholder="edit me" />
@@ -44,83 +66,6 @@ const USERID = ref("");
                     <button @click="callApi(CustomRequest)">call</button>
                 </td>
             </tr>
-
-            <tr>
-                <td>Create an account</td>
-                <td>
-                    <button @click="callApi('unauth/create_account')">
-                        call
-                    </button>
-                </td>
-                <td>res</td>
-                <td id="4"></td>
-            </tr>
-            <tr>
-                <td>Get Pending Accounts</td>
-                <td>
-                    <button @click="callApi('admin/get_pending_accounts')">
-                        call
-                    </button>
-                </td>
-                <td>res</td>
-                <td id="6"></td>
-            </tr>
-            <tr>
-                <td>admin/validate_user_account/{id}</td>
-                <td>
-                    <button
-                        @click="
-                            callApi('admin/validate_user_account/' + USERID)
-                        "
-                    >
-                        call
-                    </button>
-                </td>
-
-                <td>
-                    <input v-model="USERID" placeholder="user ID" />
-                </td>
-
-                <td id="5"></td>
-            </tr>
-
-            <tr>
-                <td>admin/setadmin/{uid}</td>
-                <td>
-                    <button @click="callApi('admin/setadmin/' + USERID)">
-                        call
-                    </button>
-                </td>
-
-                <td>
-                    <input v-model="USERID" placeholder="user ID" />
-                </td>
-            </tr>
-            <tr>
-                <td>Unauth API call</td>
-                <td>
-                    <button @click="callApi('unauth/dev')">call</button>
-                </td>
-                <td>res</td>
-                <td id="8"></td>
-            </tr>
-            <tr>
-                <td>Unauth API call</td>
-                <td>
-                    <button @click="callApi('unauth/dev')">call</button>
-                </td>
-                <td>res</td>
-                <td id="9"></td>
-            </tr>
-
-            <tr>
-                <td>Unauth API call</td>
-                <td>
-                    <button @click="callApi('unauth/dev')">call</button>
-                </td>
-                <td>res</td>
-                <td id="10"></td>
-            </tr>
         </tbody>
     </table>
 </template>