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,9 +1,7 @@
 .env
 .idea
 keycloak/CAS/target
-keycloak/.installed
 docker-compose.yaml
 node_modules
 .vscode
 postgres/data
-bundled.yaml

Makefile

@@ -2,7 +2,6 @@ help:
 	@echo "make [clean dev-front prod dev-back dev]"
 
 clean: 
-	pkill -9 node
 	@cp config/frontdev.env front/MyINPulse-front/.env
 	@cp config/frontdev.env .env
 	@cp config/frontdev.env MyINPulse-back/.env

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

@@ -31,7 +31,7 @@ public class WebSecurityCustomConfiguration {
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedOrigins(List.of(frontendUrl));
-        configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS", "POST", "PUT", "DELETE"));
+        configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS"));
         configuration.setAllowedHeaders(
                 Arrays.asList("authorization", "content-type", "x-auth-token"));
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
@@ -56,18 +56,14 @@ public class WebSecurityCustomConfiguration {
         http.authorizeHttpRequests(
                         authorize ->
                                 authorize
-                                        .requestMatchers("/entrepreneur/**")
+                                        .requestMatchers("/entrepreneur/**", "/shared/**")
                                         .access(hasRole("REALM_MyINPulse-entrepreneur"))
-                                        .requestMatchers("/admin/**")
+                                        .requestMatchers("/admin/**", "/shared/**")
                                         .access(hasRole("REALM_MyINPulse-admin"))
-                                        .requestMatchers("/shared/**")
-                                        .hasAnyRole(
-                                                "REALM_MyINPulse-admin",
-                                                "REALM_MyINPulse-entrepreneur")
                                         .requestMatchers("/unauth/**")
-                                        .authenticated()
+                                        .permitAll()
                                         .anyRequest()
-                                        .denyAll())
+                                        .authenticated())
                 .oauth2ResourceServer(
                         oauth2 ->
                                 oauth2.jwt(

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,35 +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();
-    }
-
-    @PostMapping("/admin/create-account")
-    public void createAccount(@AuthenticationPrincipal Jwt principal) {
-        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");
-        this.adminApiService.createAccount(
-                userSurname, username, primaryMail, secondaryMail, phoneNumber);
-    }
 }

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

@@ -1,20 +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.GetMapping;
-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
@@ -34,26 +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"));
-    }
-
-    /**
-     * Endpoint used to update a LC section.
-     *
-     * @return status code
-     */
-    @GetMapping("/entrepreneur/projects")
-    public Iterable<Project> getEntrepreneurProjectId(
-            @PathVariable Long sectionCellId,
-            @RequestBody String content,
-            @AuthenticationPrincipal Jwt principal) {
-        return entrepreneurApiService.getProjectIdViaClaim(principal.getClaimAsString("email"));
     }
 
     /**
@@ -63,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"));
     }
 
     /**
@@ -77,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"));
@@ -90,27 +70,9 @@ 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"));
     }
-
-    /*
-     * <p>Endpoint to check if project is has already been validated by an admin
-     */
-    @GetMapping("/entrepreneur/projects/project-is-active")
-    public Boolean checkIfProjectValidated(@AuthenticationPrincipal Jwt principal) {
-        return entrepreneurApiService.checkIfEntrepreneurProjectActive(
-                principal.getClaimAsString("email"));
-    }
-
-    /*
-     * <p>Endpoint to check if a user requested a project (used when project is pending)
-     */
-    @GetMapping("/entrepreneur/projects/has-pending-request")
-    public Boolean checkIfHasRequested(@AuthenticationPrincipal Jwt principal) {
-        return entrepreneurApiService.entrepreneurHasPendingRequestedProject(
-                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,61 +0,0 @@
-package enseirb.myinpulse.controller;
-
-import enseirb.myinpulse.model.Entrepreneur;
-import enseirb.myinpulse.service.EntrepreneurApiService;
-import enseirb.myinpulse.service.UtilsService;
-
-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;
-    private final UtilsService utilsService;
-
-    @Autowired
-    UnauthApi(EntrepreneurApiService entrepreneurApiService, UtilsService utilsService) {
-        this.entrepreneurApiService = entrepreneurApiService;
-        this.utilsService = utilsService;
-    }
-
-    @PostMapping("/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);
-    }
-
-    @GetMapping("/unauth/check-if-not-pending")
-    public Boolean checkAccountStatus(@AuthenticationPrincipal Jwt principal) {
-        // Throws 404 if user not found
-        return utilsService.checkEntrepreneurNotPending(principal.getClaimAsString("email"));
-    }
-}

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/SectionCellRepository.java

@@ -15,6 +15,4 @@ public interface SectionCellRepository extends JpaRepository<SectionCell, Long>
 
     Iterable<SectionCell> findByProjectSectionCellAndSectionIdAndModificationDateBefore(
             Project project, long sectionId, LocalDateTime date);
-
-    Iterable<SectionCell> findByProjectSectionCell(Project project);
 }

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,47 +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();
-    }
-
-    public void createAccount(
-            String username,
-            String userSurname,
-            String primaryMail,
-            String secondaryMail,
-            String phoneNumber) {
-        Administrator a =
-                new Administrator(username, userSurname, primaryMail, secondaryMail, phoneNumber);
-        this.administratorService.addAdministrator(a);
-    }
 }

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

@@ -1,13 +1,11 @@
 package enseirb.myinpulse.service;
 
 import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
-import static enseirb.myinpulse.model.ProjectDecisionValue.ACTIVE;
 
-import enseirb.myinpulse.model.Entrepreneur;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.model.SectionCell;
-import enseirb.myinpulse.model.User;
+import enseirb.myinpulse.service.database.ProjectService;
-import enseirb.myinpulse.service.database.*;
+import enseirb.myinpulse.service.database.SectionCellService;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -16,10 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class EntrepreneurApiService {
 
@@ -28,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(
@@ -76,45 +55,27 @@ public class EntrepreneurApiService {
                 mail,
                 sectionCellId,
                 this.sectionCellService.getProjectId(sectionCellId));
-        SectionCell newSectionCell =
+        sectionCellService.updateSectionCell(
-                new SectionCell(
+                sectionCellId,
-                        null,
                 sectionCell.getSectionId(),
-                        content,
+                sectionCell.getContentSectionCell(),
-                        LocalDateTime.now(),
+                sectionCell.getModificationDate());
-                        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");
         }
@@ -123,162 +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");
-    }
-
-    public Iterable<Project> getProjectIdViaClaim(String email) {
-        Long UserId = this.userService.getUserByEmail(email).getIdUser();
-        Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(UserId);
-        List<Project> Project_List = new ArrayList<>();
-
-        Project_List.add(entrepreneur.getProjectParticipation());
-        return Project_List;
-    }
-
-    public Iterable<Entrepreneur> getAllEntrepreneurs() {
-        return entrepreneurService.getAllEntrepreneurs();
-    }
-
-    /**
-     * Checks if an entrepreneur with the given email has a project that is ACTIVE.
-     *
-     * @param email The email of the entrepreneur.
-     * @return true if the entrepreneur has an active project, false otherwise.
-     */
-    public Boolean checkIfEntrepreneurProjectActive(String email) {
-        User user = this.userService.getUserByEmail(email);
-        if (user == null) {
-            return false;
-        }
-        Long userId = user.getIdUser();
-
-        Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(userId);
-        if (entrepreneur == null) {
-            return false;
-        }
-        Project proposedProject = entrepreneur.getProjectProposed();
-        return proposedProject != null && proposedProject.getProjectStatus() == ACTIVE;
-    }
-
-    /**
-     * Checks if an entrepreneur with the given email has proposed a project.
-     *
-     * @param email The email of the entrepreneur.
-     * @return true if the entrepreneur has a proposed project, false otherwise.
-     */
-    public Boolean entrepreneurHasPendingRequestedProject(String email) {
-        User user = this.userService.getUserByEmail(email);
-        if (user == null) {
-            return false;
-        }
-        Long userId = user.getIdUser();
-
-        Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(userId);
-        if (entrepreneur == null) {
-            return false;
-        }
-        Project proposedProject = entrepreneur.getProjectProposed();
-        if (entrepreneur.getProjectProposed() == null) {
-            return false;
-        }
-        return proposedProject.getProjectStatus() == PENDING;
     }
 }

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.*;
 
@@ -25,19 +24,11 @@ import java.nio.file.StandardCopyOption;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 @Service
 public class SharedApiService {
 
-    private final AdminApi adminApi;
-
-    private final EntrepreneurApi entrepreneurApi;
-
     protected static final Logger logger = LogManager.getLogger();
 
     private final ProjectService projectService;
@@ -53,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
@@ -82,54 +69,10 @@ public class SharedApiService {
         LocalDateTime dateTime = LocalDateTime.parse(date, formatter);
 
         Project project = this.projectService.getProjectById(projectId);
-        return this.sectionCellService.getLatestSectionCellsByIdReferenceBeforeDate(
+        return this.sectionCellService.getSectionCellsByProjectAndSectionIdBeforeDate(
                 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);
-
-        Map<Long, SectionCell> latestSectionCellsMap =
-                new HashMap<>(); // List for the intermediate result
-
-        // Iterate through all SectionCells associated with the project
-        // This loop iterates over project.getListSectionCell() but does NOT modify it which causes
-        // ConcurrentModificationException.
-        // Modifications are done only on the latestSectionCellsMap (which is safe).
-        project.getListSectionCell() // <-- Iterating over the original list (read-only)
-                .forEach(
-                        projectCell -> {
-                            Long idReference = projectCell.getIdReference();
-                            // Check if we have already seen a SectionCell with this idReference in
-                            // our map
-                            if (latestSectionCellsMap.containsKey(idReference)) {
-                                SectionCell existingCell = latestSectionCellsMap.get(idReference);
-                                // Compare modification dates. If the current cell is newer, replace
-                                // the one in the map.
-                                if (projectCell
-                                        .getModificationDate()
-                                        .isAfter(existingCell.getModificationDate())) {
-                                    latestSectionCellsMap.put(idReference, projectCell);
-                                }
-                            } else {
-                                // If this is the first time we encounter this idReference, add the
-                                // cell to the map.
-                                latestSectionCellsMap.put(idReference, projectCell);
-                            }
-                        });
-        return new ArrayList<>(latestSectionCellsMap.values());
-    }
-
     // TODO: test
     public Iterable<Entrepreneur> getEntrepreneursByProjectId(long projectId, String mail) {
         if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
@@ -171,26 +114,18 @@ public class SharedApiService {
                 "User {} tried to check the appointments related to the project {}",
                 mail,
                 projectId);
-
+        Iterable<SectionCell> sectionCells =
-        Project project = projectService.getProjectById(projectId);
+                this.sectionCellService.getSectionCellsByProject(
-
+                        projectService.getProjectById(projectId),
-        Iterable<SectionCell> sectionCellsIterable =
+                        2L); // sectionId useless in this function ?
-                this.sectionCellService.getSectionCellsByProject(project);
+        List<Appointment> appointments = new ArrayList<Appointment>();
-
+        sectionCells.forEach(
-        // Use a Set to collect unique appointments
-        Set<Appointment> uniqueAppointments = new HashSet<>();
-
-        sectionCellsIterable.forEach(
                 sectionCell -> {
-                    List<Appointment> sectionAppointments =
+                    appointments.addAll(
                             this.sectionCellService.getAppointmentsBySectionCellId(
-                                    sectionCell.getIdSectionCell());
+                                    sectionCell.getIdSectionCell()));
-                    // Add all appointments from this section cell to the Set
-                    uniqueAppointments.addAll(sectionAppointments);
                 });
-
+        return appointments;
-        // Convert the Set back to a List for the return value
-        return new ArrayList<>(uniqueAppointments);
     }
 
     public void getPDFReport(long appointmentId, String mail)
@@ -312,13 +247,6 @@ public class SharedApiService {
                         sectionCell -> {
                             sectionCell.updateAppointmentSectionCell(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,36 +44,19 @@ 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;
         }
     }
-
-    public Boolean checkEntrepreneurNotPending(String email) {
-        // Throws 404 if user not found
-        User user = userService.getUserByEmail(email);
-        return !user.isPending();
-    }
 }

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;
@@ -14,10 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -54,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());
     }
@@ -119,18 +74,6 @@ public class SectionCellService {
         return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId);
     }
 
-    public Iterable<SectionCell> getSectionCellsByProject(Project project) {
-        logger.info("Fetching SectionCells for Project ID: {}", project.getIdProject());
-        Iterable<SectionCell> sectionCells =
-                this.sectionCellRepository.findByProjectSectionCell(project);
-        List<SectionCell> sectionCellList = new ArrayList<>();
-        sectionCells.forEach(
-                cell -> {
-                    sectionCellList.add(cell);
-                });
-        return sectionCellList;
-    }
-
     public Long getProjectId(Long sectionCellId) {
         SectionCell sectionCell = getSectionCellById(sectionCellId);
         Project sectionProject = sectionCell.getProjectSectionCell();
@@ -147,37 +90,4 @@ public class SectionCellService {
         return sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
                 project, sectionId, date);
     }
-
-    public Iterable<SectionCell> getLatestSectionCellsByIdReferenceBeforeDate(
-            Project project, long sectionId, LocalDateTime date) {
-
-        // 1. Fetch ALL relevant SectionCells modified before the date
-        Iterable<SectionCell> allMatchingCells =
-                sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
-                        project, sectionId, date);
-
-        // 2. Find the latest for each idReference
-        Map<Long, SectionCell> latestCellsByIdReference = new HashMap<>();
-
-        for (SectionCell cell : allMatchingCells) {
-            Long idReference = cell.getIdReference();
-
-            // Check if we've seen this idReference before
-            if (latestCellsByIdReference.containsKey(idReference)) {
-                // If yes, compare modification dates
-                SectionCell existingLatest = latestCellsByIdReference.get(idReference);
-
-                // If the current cell is more recent, update the map
-                if (cell.getModificationDate().isAfter(existingLatest.getModificationDate())) {
-                    latestCellsByIdReference.put(idReference, cell);
-                }
-            } else {
-                // If this is the first time we see this idReference, add it to the map
-                latestCellsByIdReference.put(idReference, cell);
-            }
-        }
-
-        // 3. Return the collection of the latest cells (the values from the map)
-        return latestCellsByIdReference.values();
-    }
 }

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/main/resources/application.properties

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

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

@@ -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,13 +65,6 @@ public class AdminApiServiceTest {
                         "info ofc",
                         false);
         entrepreneurService.addEntrepreneur(entrepreneur);
-
-        Entrepreneur entrepreneur2 =
-                new Entrepreneur(
-                        "GDProjets", "", "Entrepreneur2@inpulse.com", "", "", "", "info ofc", true);
-        entrepreneurService.addEntrepreneur(entrepreneur2);
-
-        p =
         projectService.addNewProject(
                 new Project(
                         "sampleProjectAdminApiService",
@@ -87,17 +73,6 @@ public class AdminApiServiceTest {
                         ACTIVE,
                         administratorService.getAdministratorByPrimaryMain(
                                 "testAdminFull@example.com")));
-
-        entrepreneurService.updateEntrepreneurProjectParticipation(entrepreneur2.getIdUser(), p);
-
-        appt =
-                new Appointment(
-                        null,
-                        LocalDate.now(),
-                        LocalTime.now(),
-                        LocalTime.now(),
-                        "Salle TD 03",
-                        "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,922 +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 jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import enseirb.myinpulse.service.UtilsService;
-
-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.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
-    }
-
-    // --- 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 SectionCell getTestSectionCell(
-            Project project, Long sectionId, String content, LocalDateTime date, Long refrenceId) {
-        SectionCell sectionCell = new SectionCell();
-        sectionCell.setProjectSectionCell(project);
-        sectionCell.setSectionId(sectionId);
-        sectionCell.setContentSectionCell(content);
-        sectionCell.setModificationDate(date);
-        sectionCell.setIdReference(refrenceId);
-        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 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() {
-        Long targetSectionId = 1L;
-        // Set a date filter slightly in the future so our "latest before" cell is included
-        LocalDateTime dateFilter = LocalDateTime.now().plusMinutes(5);
-
-        // Creating versions of the SAME SectionCell (share the same idReference)
-
-        // the first version. This will get a GENERATED idReference.
-        SectionCell firstVersion =
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Content V1 (Oldest)",
-                        LocalDateTime.now().minusDays(3) // Oldest date
-                        );
-        sectionCellService.addNewSectionCell(firstVersion);
-
-        Long sharedIdReference = firstVersion.getIdReference();
-        assertNotNull(
-                sharedIdReference,
-                "idReference should be generated after saving the first version");
-        System.out.println("Generated sharedIdReference: " + sharedIdReference);
-
-        // Create subsequent versions and MANUALLY set the SAME idReference.
-        // These represent updates to the cell identified by sharedIdReference.
-
-        SectionCell middleVersion =
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Content V2 (Middle)",
-                        LocalDateTime.now().minusDays(2), // Middle date, before filter
-                        sharedIdReference);
-        middleVersion = sectionCellService.addNewSectionCell(middleVersion);
-        sectionCellService.updateSectionCellReferenceId(
-                middleVersion.getIdSectionCell(), sharedIdReference);
-
-        SectionCell latestBeforeFilter =
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Content V3 (Latest Before Filter)",
-                        LocalDateTime.now().minusDays(1), // Latest date before filter
-                        sharedIdReference);
-        latestBeforeFilter = sectionCellService.addNewSectionCell(latestBeforeFilter);
-        sectionCellService.updateSectionCellReferenceId(
-                latestBeforeFilter.getIdSectionCell(), sharedIdReference);
-
-        SectionCell futureVersion =
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        targetSectionId,
-                        "Content V4 (Future - Should Be Excluded)",
-                        LocalDateTime.now().plusDays(1), // Date is AFTER the filter
-                        sharedIdReference);
-        futureVersion = sectionCellService.addNewSectionCell(futureVersion);
-        sectionCellService.updateSectionCellReferenceId(
-                futureVersion.getIdSectionCell(), sharedIdReference);
-
-        // --- Create other SectionCells that should NOT be included (different sectionId or
-        // project) ---
-
-        // Cell in a different section ID
-        sectionCellService.addNewSectionCell(
-                getTestSectionCell(
-                        staticAuthorizedProject,
-                        99L, // Different sectionId
-                        "Content in Different Section",
-                        LocalDateTime.now()));
-
-        // 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);
-
-        assertEquals(1, resultList.size());
-        // Verify that the returned cell is the 'latestBeforeFilter' cell
-        // Comparing by idSectionCell is a good way to verify the exact entity
-        assertEquals(
-                latestBeforeFilter.getIdSectionCell(),
-                resultList.get(0).getIdSectionCell(),
-                "The returned SectionCell should be the one with the latest modification date before the filter.");
-
-        // Also assert the idReference and content
-        assertEquals(
-                sharedIdReference,
-                resultList.get(0).getIdReference(),
-                "The returned cell should have the shared idReference.");
-        assertEquals(
-                "Content V3 (Latest Before Filter)",
-                resultList.get(0).getContentSectionCell(),
-                "The returned cell should have the correct content.");
-    }
-
-    /*
-     * 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 - Removed this comment as we are fixing it
-    void testGetAllSectionCells_Authorized_FoundLatest() {
-        // Arrange: Create specific SectionCells for this test
-        // Define the idReference values we will use for grouping
-        Long refIdGroup1 = 101L;
-        Long refIdGroup2 = 102L;
-        Long refIdOtherProject = 103L;
-
-        // --- Create and Add Cells for Group 1 (refIdGroup1) ---
-        // Create the older cell for group 1
-        SectionCell tempOldCell1 =
-                getTestSectionCell(
-                        staticAuthorizedProject, // Project
-                        1L, // Section ID (assuming this groups by section within refId)
-                        "Ref1 Old", // Name
-                        LocalDateTime.now().minusDays(3), // Date (older)
-                        null); // Pass null or let getTestSectionCell handle it, we'll set
-        // idReference later
-        final SectionCell oldCell1 =
-                sectionCellService.addNewSectionCell(tempOldCell1); // Add to DB
-
-        // Create the newer cell for group 1
-        SectionCell tempNewerCell1 =
-                getTestSectionCell(
-                        staticAuthorizedProject, // Project
-                        1L, // Section ID
-                        "Ref1 Newer", // Name
-                        LocalDateTime.now().minusDays(2), // Date (newer than oldCell1)
-                        null); // Pass null
-        final SectionCell newerCell1 =
-                sectionCellService.addNewSectionCell(tempNewerCell1); // Add to DB
-
-        // Now, update the idReference for both cells in Group 1 to the desired value
-        sectionCellService.updateSectionCellReferenceId(oldCell1.getIdSectionCell(), refIdGroup1);
-        sectionCellService.updateSectionCellReferenceId(newerCell1.getIdSectionCell(), refIdGroup1);
-
-        // --- Create and Add Cells for Group 2 (refIdGroup2) ---
-        // Create the older cell for group 2
-        SectionCell tempOldCell2 =
-                getTestSectionCell(
-                        staticAuthorizedProject, // Project
-                        2L, // Section ID (different section)
-                        "Ref2 Old", // Name
-                        LocalDateTime.now().minusDays(1), // Date (older than newerCell2)
-                        null); // Pass null
-        final SectionCell oldCell2 =
-                sectionCellService.addNewSectionCell(tempOldCell2); // Add to DB
-
-        // Create the newer cell for group 2
-        SectionCell tempNewerCell2 =
-                getTestSectionCell(
-                        staticAuthorizedProject, // Project
-                        2L, // Section ID
-                        "Ref2 Newer", // Name
-                        LocalDateTime.now(), // Date (latest)
-                        null); // Pass null
-        final SectionCell newerCell2 =
-                sectionCellService.addNewSectionCell(tempNewerCell2); // Add to DB
-
-        // Now, update the idReference for both cells in Group 2 to the desired value
-        sectionCellService.updateSectionCellReferenceId(oldCell2.getIdSectionCell(), refIdGroup2);
-        sectionCellService.updateSectionCellReferenceId(newerCell2.getIdSectionCell(), refIdGroup2);
-
-        // --- Create and Add Cell for Other Project (refIdOtherProject) ---
-        Project otherProject =
-                projectService.addNewProject(
-                        getTestProject(
-                                "other_project_for_cell_test",
-                                administratorService.addAdministrator(
-                                        getTestAdmin("other_admin_cell_test"))));
-
-        SectionCell tempOtherProjectCell =
-                getTestSectionCell(
-                        otherProject, // DIFFERENT Project
-                        1L, // Section ID
-                        "Other Project Cell", // Name
-                        LocalDateTime.now(), // Date
-                        null); // Pass null
-        final SectionCell otherProjectCell =
-                sectionCellService.addNewSectionCell(tempOtherProjectCell); // Add to DB
-
-        // Now, update the idReference for the Other Project cell
-        sectionCellService.updateSectionCellReferenceId(
-                otherProjectCell.getIdSectionCell(), refIdOtherProject);
-
-        // Act
-        // Ensure the service call uses the correct project ID and mail
-        Iterable<SectionCell> result =
-                sharedApiService.getAllSectionCells(
-                        staticAuthorizedProject.getIdProject(), // Use static project ID
-                        staticAuthorizedMail); // Use static authorized mail
-
-        List<SectionCell> resultList = TestUtils.toList(result);
-
-        // Assert
-        // We expect 2 cells from the staticAuthorizedProject:
-        // - The latest one from refIdGroup1 (newerCell1)
-        // - The latest one from refIdGroup2 (newerCell2)
-        assertEquals(2, resultList.size());
-
-        // Assert that the result list contains the LATEST cell from each group within the correct
-        // project
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(newerCell1.getIdSectionCell())),
-                "Should contain the latest cell for Group 1"); // Add assertion message
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(newerCell2.getIdSectionCell())),
-                "Should contain the latest cell for Group 2"); // Add assertion message
-
-        // Assert that the result list does NOT contain the OLDER cells from the correct project
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(oldCell1.getIdSectionCell())),
-                "Should not contain the older cell for Group 1"); // Add assertion message
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(oldCell2.getIdSectionCell())),
-                "Should not contain the older cell for Group 2"); // Add assertion message
-
-        // Assert that the result list does NOT contain the cell from the other project
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                cell ->
-                                        cell.getIdSectionCell()
-                                                .equals(otherProjectCell.getIdSectionCell())),
-                "Should not contain cells from other projects"); // Add assertion message
-    }
-
-    /*
-     *        _____         _    ____      _   ____            _           _   ____
-     *       |_   _|__  ___| |_ / ___| ___| |_|  _ \ _ __ ___ (_) ___  ___| |_| __ ) _   _
-     *         | |/ _ \/ __| __| |  _ / _ \ __| |_) | '__/ _ \| |/ _ \/ __| __|  _ \| | | |
-     *         | |  __/\__ \ |_| |_| |  __/ |_|  __/| | | (_) | |  __/ (__| |_| |_) | |_| |
-     *        _|_|\___||___/\__|\____|\___|\__|_|   |_|  \___// |\___|\___|\__|____/ \__, |
-     *       |_ _|  _ \                                     |__/                     |___/
-     *        | || | | |
-     *        | || |_| |
-     *       |___|____/
-     */
-
-    /*
-     * 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());
-    }
-
-    @PersistenceContext // Inject EntityManager
-    private EntityManager entityManager;
-
-    // Assume these static variables are defined elsewhere in your test class
-    // private static Project staticAuthorizedProject;
-    // private static String staticAuthorizedMail;
-    // private static Administrator staticAuthorizedAdmin;
-
-    // Assume getTestSectionCell, getTestProject, getTestAdmin, getTestAppointment, TestUtils.toList
-    // are defined elsewhere
-
-    @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()));
-
-        // Create Appointments with SectionCells lists (Owning side)
-        Appointment app1 =
-                getTestAppointment(
-                        LocalDate.now().plusDays(10),
-                        LocalTime.NOON,
-                        LocalTime.of(0, 30),
-                        "Place 1 App Test",
-                        "Subject 1 App Test",
-                        List.of(cell1), // This links Appointment to SectionCell
-                        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), // This links Appointment to SectionCells
-                        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), // This links Appointment to SectionCell
-                        null);
-        Appointment savedOtherApp =
-                appointmentService.addNewAppointment(otherApp); // Capture saved entity
-
-        // --- IMPORTANT DEBUGGING STEPS ---
-        // Flush pending changes to the database (including join table inserts)
-        entityManager.flush();
-        // Clear the persistence context cache to ensure entities are loaded fresh from the database
-        entityManager.clear();
-        // --- END IMPORTANT DEBUGGING STEPS ---
-
-        // --- Add Debug Logging Here ---
-        // Re-fetch cells to see their state after saving Appointments and flushing/clearing cache
-        // These fetches should load from the database due to entityManager.clear()
-        SectionCell fetchedCell1_postPersist =
-                sectionCellService.getSectionCellById(cell1.getIdSectionCell());
-        SectionCell fetchedCell2_postPersist =
-                sectionCellService.getSectionCellById(cell2.getIdSectionCell());
-        SectionCell fetchedOtherCell_postPersist =
-                sectionCellService.getSectionCellById(otherProjectCell.getIdSectionCell());
-
-        // Access the lazy collections to see if they are populated from the DB
-        // This access should trigger lazy loading if the data is in the DB
-        List<Appointment> cell1Apps_postPersist =
-                fetchedCell1_postPersist.getAppointmentSectionCell();
-        List<Appointment> cell2Apps_postPersist =
-                fetchedCell2_postPersist.getAppointmentSectionCell();
-        List<Appointment> otherCellApps_postPersist =
-                fetchedOtherCell_postPersist.getAppointmentSectionCell();
-
-        // Ensure logging is enabled in SharedApiService and SectionCellService methods called below
-        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(savedOtherApp.getIdAppointment())));
-    }
-
-    /*
-     * 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())));
-    }
-}

config/backdev.docker-compose.yaml

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

config/dev.env

@@ -16,7 +16,7 @@ BACKEND_PASSWORD=backend_db_user_password
 DATABASE_URL=localhost:5433
 
 VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=MyINPulse-vite
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
-VITE_KEYCLOAK_REALM=MyINPulse
+VITE_KEYCLOAK_REALM=test
 VITE_APP_URL=http://localhost:5173
 VITE_BACKEND_URL=http://localhost:8081/

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/adminApi.yaml

@@ -22,8 +22,6 @@ paths:
           description: Bad Request - Invalid project data provided (e.g., missing required fields).
         "401":
           description: Unauthorized - Authentication required or invalid token.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           
     post:
       operationId: addProjectManually
@@ -41,7 +39,7 @@ paths:
             schema:
               $ref: "./main.yaml#/components/schemas/project"
       responses:
-        "200": # Use 200 Created for successful creation
+        "201": # Use 201 Created for successful creation
           description: Created - Project added successfully. Returns the created project.
           content:
             application/json:
@@ -51,8 +49,6 @@ paths:
           description: Bad Request - Project already exists.
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           
 
   /admin/projects/pending:
@@ -75,8 +71,6 @@ paths:
                   $ref: "./main.yaml#/components/schemas/project" # Assuming pending projects use the same schema
         "401":
           description: Unauthorized.        
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.      
 
   /admin/request-join:
     get:
@@ -98,8 +92,6 @@ paths:
                   $ref: "./main.yaml#/components/schemas/joinRequest"
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
   
   /admin/request-join/decision/{joinRequestId}:
     post:
@@ -130,8 +122,6 @@ paths:
           description: Bad Request - Invalid input (e.g., missing decision).
         "401":
           description: Unauthorized.     
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.   
 
 
   /admin/projects/pending/decision:
@@ -146,6 +136,14 @@ paths:
         If rejected (isAccepted=false), the pending project data might be archived or deleted based on business logic.
       security:
           - MyINPulse: [MyINPulse-admin]
+      parameters:
+        - in: path
+          name: pendingProjectId # Corrected typo and name change
+          required: true
+          schema:
+            type: integer
+          description: The ID of the pending project to decide upon.
+          example: 7
       requestBody:
         required: true
         description: Decision payload.
@@ -154,14 +152,12 @@ paths:
             schema:
               $ref: './main.yaml#/components/schemas/projectDecision'
       responses:
-        "200": # Use 200 No Content for successful action with no body
+        "204": # Use 204 No Content for successful action with no body
           description: No Content - Decision processed successfully.
         "400":
           description: Bad Request - Invalid input (e.g., missing decision).
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           
 
   /admin/pending-accounts: # Path updated
@@ -184,8 +180,6 @@ paths:
                   $ref: "./main.yaml#/components/schemas/user-entrepreneur"
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
 
   /admin/accounts/validate/{userId}:
     post: # Changed to POST as it changes state
@@ -205,12 +199,11 @@ paths:
           description: The ID of the user account to validate.
           example: 102
       responses:
-        "200":
+        "204":
           description: No Content - Account validated successfully.
         "400":
           description: Bad Request - Invalid user ID format.
-        "403":
+          
-          description: Bad Token - Invalid Keycloack configuration.  
         "401":
           description: Unauthorized.
 
@@ -232,8 +225,6 @@ paths:
                 type: array
                 items:
                   $ref: "./main.yaml#/components/schemas/appointment"
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "404":
           description: no appointments found.
         "401":
@@ -264,15 +255,13 @@ paths:
             schema:
               $ref: "./main.yaml#/components/schemas/report"
       responses:
-        "200":
+        "201":
           description: Created - Report created and linked successfully. Returns the created report.
           content:
              application/json:
                 schema: { $ref: "./main.yaml#/components/schemas/report" }
         "400":
           description: Bad Request - Invalid input (e.g., missing content, invalid appointment ID format).
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -307,8 +296,6 @@ paths:
                 schema: { $ref: "./main.yaml#/components/schemas/report" }
         "400":
           description: Bad Request - Invalid input (e.g., missing content).
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
 
@@ -331,12 +318,10 @@ paths:
           description: The ID of the project to remove.
           example: 12
       responses:
-        "200":
+        "204":
           description: No Content - Project removed successfully.
         "400":
           description: Bad Request - Invalid project ID format.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -360,28 +345,9 @@ paths:
           description: The ID of the user to grant admin rights.
           example: 103
       responses:
-        "200": # Use 200 No Content
+        "204": # Use 204 No Content
           description: No Content - Admin rights granted successfully.
         "400":
           description: Bad Request - Invalid user ID format or user is already an admin.     
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.  
-        
-  /admin/create-account:
-    post:
-      summary: Creates Admin out Jwt Token
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description: Create an admin instance in the MyINPulse DB of the information provided from the authenticated user's keycloack token.
-       The information required in the token are `userSurname`, `username`, `primaryMail`, `secondaryMail`, `phoneNumber`.
-      responses:
-        "200": 
-          description: No Content - Admin user created successfully.
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.

documentation/openapi/src/entrepreneurApi.yaml

@@ -21,14 +21,12 @@ paths:
             schema:
               $ref: "./main.yaml#/components/schemas/project"
       responses:
-        "200":
+        "202":
           description: Accepted - Project creation request received and is pending validation.
         "400":
           description: Bad Request - Invalid input (e.g., missing name).
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         
   /entrepreneur/sectionCells: # Base path
     post:
@@ -48,14 +46,12 @@ paths:
             schema:
               $ref: "./main.yaml#/components/schemas/sectionCell"
       responses:
-        "200":
+        "201":
           description: Created - Section cell added successfully. Returns the created cell.
         "400":
           description: Bad Request - Invalid input (e.g., missing content or sectionId).
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           
   /entrepreneur/sectionCells/{sectionCellId}:
     put:
@@ -88,8 +84,6 @@ paths:
           description: Bad Request - Invalid input or ID mismatch.
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
 
     delete:
       operationId: removeSectionCell
@@ -108,7 +102,7 @@ paths:
           description: The ID of the section cell to remove.
           example: 509
       responses:
-        "200":
+        "204":
           description: No Content - Section cell removed successfully.
         "400":
           description: Bad Request - Invalid ID format.
@@ -116,82 +110,3 @@ paths:
           description: Bad Request - sectionCell not found.
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-
-
-  /entrepreneur/projects:
-    get:
-      summary: gets the projectId of the project associated with the entrepreneur 
-      description: returns a list of projectIds of the projects associated with the entrepreneur
-      tags:
-       - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      parameters:
-      responses:
-        "200":
-          description: OK - Section cell updated successfully. Returns the updated cell.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/project"
-        "404":
-          description: Bad Request - Invalid input or ID mismatch.
-        "401":
-          description: Unauthorized or identity not found
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-
-
-  /entrepreneur/projects/project-is-active:
-    get:
-      summary: checks if the project associated with an entrepreneur is active 
-      description: returns a boolean if the project associated with an entrepreneur has an active status 
-        (i.e has been validated by an admin). The user should be routed to LeanCanvas. any other response code 
-        should be treated as false
-      tags:
-       - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      parameters:
-      responses:
-        "200":
-          description: OK - got the value successfully any other response code should be treated as false.
-          content:
-            application/json:
-              schema:
-                type: boolean
-        "404":
-          description: Bad Request - Invalid input or ID mismatch.
-        "401":
-          description: Unauthorized or identity not found
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-
-  /entrepreneur/projects/has-pending-request:
-    get:
-      summary: checks if the user has a pending projectRequest 
-      description: returns a boolean if the project associated with an entrepreneur has a pending status 
-        (i.e has not yet been validated by an admin). The user should be routed to a page telling him that he should 
-        wait for admin validation. any other response code should be treated as false.
-      tags:
-       - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      parameters:
-      responses:
-        "200":
-          description: OK - got the value successfully any other response code should be treated as false.
-          content:
-            application/json:
-              schema:
-                type: boolean
-        "404":
-          description: Bad Request - Invalid input or ID mismatch.
-        "401":
-          description: Unauthorized or identity not found
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.

documentation/openapi/src/main.yaml

@@ -79,10 +79,6 @@ paths:
     $ref: "./unauthApi.yaml#/paths/~1unauth~1finalize"
   /unauth/request-join/{projectId}:
     $ref: "./unauthApi.yaml#/paths/~1unauth~1request-join~1{projectId}"
-  /unauth/request-admin-role:
-    $ref: "./unauthApi.yaml#/paths/~1unauth~1request-admin-role"
-  /unauth/check-if-not-pending:
-    $ref: "./unauthApi.yaml#/paths/~1unauth~1check-if-not-pending"
 
   #          _    ____  __  __ ___ _   _      _    ____ ___
   #         / \  |  _ \|  \/  |_ _| \ | |    / \  |  _ \_ _|
@@ -112,8 +108,6 @@ paths:
     $ref: "./adminApi.yaml#/paths/~1admin~1projects~1{projectId}" 
   /admin/make-admin/{userId}:
     $ref: "./adminApi.yaml#/paths/~1admin~1make-admin~1{userId}"
-  /admin/create-account:
-    $ref: "./adminApi.yaml#/paths/~1admin~1create-account"
 
   #       ____  _                        _      _    ____ ___
   #      / ___|| |__   __ _ _ __ ___  __| |    / \  |  _ \_ _|
@@ -144,16 +138,9 @@ paths:
   #      / ___ \|  __/| |
   #     /_/   \_\_|  |___|
   #
-
-  /entrepreneur/projects:
-    $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects"
   /entrepreneur/projects/request:
     $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1request"
   /entrepreneur/sectionCells:
     $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells"
   /entrepreneur/sectionCells/{sectionCellId}:
     $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells~1{sectionCellId}"
-  /entrepreneur/projects/project-is-active:
-    $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1project-is-active"
-  /entrepreneur/projects/has-pending-request:
-    $ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1has-pending-request"

documentation/openapi/src/sharedApi.yaml

@@ -37,8 +37,6 @@ paths:
                   $ref: "./main.yaml#/components/schemas/sectionCell"
         "400":
           description: Bad Request - Invalid parameter format.         
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -70,7 +68,7 @@ paths:
         "401":
           description: Unauthorized.       
         "403":
-          description: Bad Token - Invalid Keycloack configuration.         
+          description: Forbidden - User does not have access to this project.         
         "404":
           description: Not Found - Project not found.       
 
@@ -99,7 +97,7 @@ paths:
         "401":
           description: Unauthorized.       
         "403":
-          description: Bad Token - Invalid Keycloack configuration.    
+          description: Forbidden - User does not have access to this project.    
         "404":
           description: Not Found - Project not found.
           
@@ -128,8 +126,6 @@ paths:
                 type: array
                 items:
                   $ref: "./main.yaml#/components/schemas/appointment"
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -160,8 +156,6 @@ paths:
                 format: binary
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           
 
   /shared/appointments/request:
@@ -180,14 +174,24 @@ 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:
-        "200": # Accepted seems appropriate for a request
+        "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.
+          
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
           

documentation/openapi/src/unauthApi.yaml

@@ -18,14 +18,12 @@ paths:
       tags:
         - Unauth API
       responses:
-        "200":
+        "201":
           description: Created - Account finalized and pending admin validation. Returns the user profile.
         "400":
           description: Bad Request - Problem processing the token or user data derived from it.
         "401":
           description: Unauthorized - Valid authentication token required.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
   /unauth/request-join/{projectId}:
     post:
       summary: Request to join an existing project
@@ -41,7 +39,7 @@ paths:
           description: The ID of the project to request joining.
           example: 15
       responses: # Moved responses block to correct level
-        "200":
+        "202":
           description: Accepted - Join request submitted and pending approval.
         "400":
           description: Bad Request - Invalid project ID format 
@@ -49,42 +47,16 @@ paths:
           description: Already member/request pending.
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
   /unauth/request-admin-role:
     post:
-      summary: Request to become an admin
+      summary: Request to join an existing project
       description: Submits a request for the authenticated user (keycloack authenticated) to become an admin. Their role is then changed to admin in server and Keycloak. This requires approval from a project admin.
       tags:
        - Unauth API
       responses:
-        "200":
+        "202":
           description: Accepted - Become admin request submitted and pending approval.
         "400":
           description: Bad Request - Invalid project ID format or already member/request pending.
         "401":
           description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-
-  /unauth/check-if-not-pending:
-    get:
-      summary: Returns a boolean of whether the user's account is not pending
-      description: Returns a boolean with value `true` if the user's account is not pending and `false` if it is.
-      tags:
-       - Unauth API
-      responses:
-        "200":
-          description: Accepted - Become admin request submitted and pending approval.
-          content:
-            application/json:
-              schema:
-                type: boolean  
-        "400":
-          description: Bad Request - Invalid project ID format or already member/request pending.
-        "401":
-          description: Unauthorized.
-        "404":
-          description: Bad Request - User not found in database.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.

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/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/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>