Merge branch 'front_foundation' of https://gitea.piair.dev/piair/MyINPulse into front_foundation

Merge branch 'main' of https://gitea.piair.dev/piair/MyINPulse

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

Documentation/openapi/main.yaml

@@ -0,0 +1,741 @@
+openapi: 3.0.3
+info:
+  title: MyInpulse Backend Api
+  description: this document servers as a documentation for the backend api.  
+  version: 0.0.0
+
+tags:
+  - name: Entrepreneurs API
+    description: La partie de l'api dédiée aux entrepreneurs
+  - name: Admin API
+    description: La partie de l'api dédiée aux entrepreneurs
+  - name: Shared API
+    description: La partie de l'api dédiée aux entrepreneurs et admins
+
+
+components:
+  schemas:
+    user:
+      type: object
+      properties:
+        nom:
+          type: string
+        prenom:
+          type: string
+        email:
+          type: string
+          example: "example@exmaple.com"
+        secondaryEmail:
+          type: string
+          example: "example@exmaple.com"
+        tel:
+          type: string
+          example: "0612345678"
+    user-entrepreneur:
+      type: object
+      properties:
+        user:
+          $ref: "#/components/schemas/user"
+        entrepreneur:
+          type: object
+          properties:
+            ecole: 
+              type: string
+              example: "enseirb"
+            filiere:
+              type: string
+              example: "info"
+            status:
+              type: boolean
+              example: false
+    user-admin:
+      type: object
+      properties:
+        admin:
+          $ref: "#/components/schemas/user"
+
+  securitySchemes:
+      MyINPulse:
+        type: oauth2
+        flows:
+          implicit:
+            authorizationUrl: https://petstore3.swagger.io/oauth/authorize
+            scopes:
+              MyINPulse-admin: Administrateur
+              MyINPulse-entrepreneur: Utilisateur
+
+paths:
+
+#          _    ____  __  __ ___ _   _      _    ____ ___ 
+#         / \  |  _ \|  \/  |_ _| \ | |    / \  |  _ \_ _|
+#        / _ \ | | | | |\/| || ||  \| |   / _ \ | |_) | | 
+#       / ___ \| |_| | |  | || || |\  |  / ___ \|  __/| | 
+#      /_/   \_\____/|_|  |_|___|_| \_| /_/   \_\_|  |___|
+#
+
+  /admin/projects:
+    get:
+      summary: Retourne la liste of projets associés à l'admin
+      tags: 
+        - Admin API 
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+      description:
+        JSON array of who's elements are objects containing necessary information for the view 
+        (project name, entrepreneur names, etc..)
+        of the projects an admin is watching over.
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    E_names:
+                      type: string
+                      description: entrepreneur names
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is missing or invalid
+  /admin/projects/pending/decision:
+    post:
+      summary: valider un projet en attente de validation
+      tags:
+        - Admin API
+      description:
+        if the request is accepted the status of the
+        project is changed to ongoing, entrepreneur
+        account is confirmed and the project is linked
+        to the admin accepting the request and the
+        entrepreneur requesting it. Else the pending
+        project and user info are deleted.
+      security:
+          - MyINPulse:
+              - MyINPulse-admin
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                pedingProjectId: 
+                  type: integer
+                decision:
+                  type: boolean
+                
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+            
+  /admin/projects/add:
+    post:
+      summary: Ajout manuel d'un projet
+      description:
+        Adds a project with the
+        inputed details
+      tags:
+        - Admin API
+      security:
+          - MyINPulse:
+              - MyINPulse-admin
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                name:
+                  type: string
+                founder:
+                  $ref: "#/components/schemas/user-entrepreneur"
+                
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+  
+  /admin/appointments/report/{appointmentId}:
+    put:
+      summary: enregistrer un rapport du rendez-vous
+      description:
+        Generate a PDF file formatted 
+        from input text and links it 
+        to the appointement.
+      tags:
+        - Admin API
+      security:
+        - MyINPulse:
+          - MyINPulse-admin
+      parameters:
+        - in: path
+          name: appointmentId
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                title:
+                  type: string
+                body:
+                  type: string
+                conclusion:
+                  type: string
+        
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+                    missing or invalid
+    post:
+      summary: modifier un rapport déja éxistant du rendez-vous
+      description:
+        Modifies the report file to input 
+        text and links it to the appointement.
+      tags:
+        - Admin API
+      security:
+        - MyINPulse:
+          - MyINPulse-admin
+      parameters:
+        - in: path
+          name: appointmentId
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                title:
+                  type: string
+                body:
+                  type: string
+                conclusion:
+                  type: string
+        
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+                    missing or invalid
+
+
+  /admin/projects/remove/{projectId}:
+    delete:
+      summary: supression d'un project
+      description:
+        Removes the project
+        with the inputed id projectId
+      tags:
+        - Admin API
+      security:
+          - MyINPulse:
+              - MyINPulse-admin
+      parameters:
+        - in: path
+          name: projectId
+          required: true
+          schema:
+            type: integer
+          
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+     
+
+  /admin/projects/pending:
+    get:
+      summary: Retourne la liste des projets en attente de validation
+      tags: 
+        - Admin API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+      description:
+        JSON array of who's elements are objects containing
+        necessary information for the view (project name,
+        entrepreneur names, etc..) of all pending projects.
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    founder:
+                      $ref: "#/components/schemas/user-entrepreneur"
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is missing or invalid
+
+#
+#       ____  _                        _      _    ____ ___ 
+#      / ___|| |__   __ _ _ __ ___  __| |    / \  |  _ \_ _|
+#      \___ \| '_ \ / _` | '__/ _ \/ _` |   / _ \ | |_) | | 
+#       ___) | | | | (_| | | |  __/ (_| |  / ___ \|  __/| | 
+#      |____/|_| |_|\__,_|_|  \___|\__,_| /_/   \_\_|  |___|
+#                   
+
+  /shared/appointments/upcoming:
+    get:
+      summary: Retourne la list des prochains rendez-vous de l'utilisateur
+      tags: 
+        - Shared API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+      description:
+        JSON array of upcoming appointment data (name, date, time etc..) for a user.
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    date:
+                      type: string
+                    time:
+                      type: string
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is missing or invalid        
+
+  /shared/projects/lcsection/{projectId}/{title}/{date}:
+      get:
+        summary: Retourne la liste de sections de LC avec un titre donné
+        tags: 
+          - Shared API
+        security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+        description:
+          JSON array containing Lean Canvas 
+          section data with a title for the
+          current date (or given date if the
+          date parameter is passed)
+        parameters:
+          - in: path
+            required: true
+            name: projectId
+            schema:
+              type: integer
+          - in: path
+            required: true
+            description: this number can be 1, 2,...,8. It is associated with the title of the lcsection
+            name: title
+            schema:
+              type: integer
+              enum: [1, 2, 3, 4, 5, 6, 7, 8] 
+            
+          - in: path
+            required: true
+            name: date
+            description: the date corresponding to the wanted version of lc section. "Nan" for the latest version
+            example: "NaN"
+            schema:
+              type: string
+              
+        responses:
+          "200":
+            description: OK
+            content:
+              application/json:
+                schema:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      section:
+                        type: string
+                      txt:
+                        type: string
+                      time:
+                        type: string
+          "400":
+            description: Bad request
+          "401":
+            description: Authorization information is missing or invalid
+  
+  /shared/projects/entrepreneurs/{projectId}:
+    get:
+      summary: Retourne la liste d'entrepreneurs associée à un projet donné
+      tags: 
+          - Shared API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+      description:
+        JSON array of entrepreneur
+        names associated with a project
+      parameters:
+          - in: path
+            name: projectId
+            schema:
+              type: integer
+            required: true
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/user-entrepreneur"
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is missing or invalid
+  
+  /shared/projects/admin/{projectId}:
+    get:
+      summary: Retourne les informations de l'admin qui accompagne le projet
+      tags: 
+          - Shared API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+      description: 
+        JSON object containing information (name, gmail, tel, etc..) 
+        the admin supervising the project with id projectID.
+      parameters:
+            - in: path
+              name: projectId
+              schema:
+                type: integer
+              required: true
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/user-admin"
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+  
+  /shared/projects/appointments/{projectId}:
+    get:
+      summary: Retourne les rendez-vous du projet 
+      tags: 
+          - Shared API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+      description: 
+        JSON array of upcoming and past appointment 
+        data for the project with id projectID.
+      parameters:
+        - in: path
+          name: projectId
+          schema:
+            type: integer
+          required: true
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    appointementId:
+                      type: integer
+                    name: 
+                      type: string
+                    date: 
+                      type: string
+                    time: 
+                      type: string
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+  /shared/projects/appointments/report/{apointementId}:
+    get:
+      summary: Retourne le rapport pdf du rendez-vous
+      tags: 
+          - Shared API
+      security:
+        - MyINPulse:
+            - MyINPulse-admin
+            - MyINPulse-entrepreneur
+      description:
+        PDF file containing the ap-
+        pointment report
+      parameters:
+        - in: path
+          name: apointementId
+          schema:
+            type: integer
+          required: true
+      responses:
+        "200":
+          description: OK
+          content:
+            application/pdf:
+              schema:
+                type: string
+                format: binary
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+  
+  /shared/appointments/request:
+    post:
+      summary: demander un rendez-vous
+      description:
+        will add an appointement request request by the applicant 
+        to have an appointment to be confirmed or denied by the
+        specified participants of the appointement.
+      tags:
+        - Shared API
+      security:
+        - MyINPulse:
+          - MyINPulse-entrepreneur
+          - MyINPulse-admin
+      requestBody:
+        description: \"participants\" property is an array containing userids of the participants in the appointement
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                title:
+                  type: string
+                start_time:
+                  type: string
+                end_time:
+                  type: string
+                place:
+                  type: string
+                applicantId:
+                  type: integer
+                participants:
+                  #/* */
+                  type: array
+                  items:
+                    type: integer
+                    
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+                    missing or invalid        
+  
+
+
+#      _____ _   _ _____ ____  _____ ____  ____  _____ _   _ _____ _   _ ____  
+#     | ____| \ | |_   _|  _ \| ____|  _ \|  _ \| ____| \ | | ____| | | |  _ \ 
+#     |  _| |  \| | | | | |_) |  _| | |_) | |_) |  _| |  \| |  _| | | | | |_) |
+#     | |___| |\  | | | |  _ <| |___|  __/|  _ <| |___| |\  | |___| |_| |  _ < 
+#     |_____|_|_\_| |_| |_| \_\_____|_|   |_| \_\_____|_| \_|_____|\___/|_| \_\
+#        / \  |  _ \_ _|                                                       
+#       / _ \ | |_) | |                                                        
+#      / ___ \|  __/| |                                                        
+#     /_/   \_\_|  |___|                                                       
+#
+
+                    
+  /entrepreneur/projects/request:
+    post:
+      summary: demander la création et validation d'un projet
+      tags:
+        - Entrepreneurs API
+      description: 
+        Adds project to pending projects 
+        to then be accepted or rejected by
+        an admin
+      security:
+        - MyINPulse:
+          - MyINPulse-entrepreneur
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                name:
+                  type: string
+                founder:
+                  $ref: "#/components/schemas/user-entrepreneur"
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+            
+           
+  /entrepreneur/lcsection/add/{projectId}:
+    post:
+      summary: ajouter une sections au LC
+      description: 
+        Adds input data to the user's LC 
+        with a specified title.
+      tags:
+       - Entrepreneurs API
+      security:
+        - MyINPulse:
+          - MyINPulse-entrepreneur
+      parameters:
+        - in: path
+          name: projectId
+          schema:
+            type: integer
+          required: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                title:
+                  type: string
+                txt:
+                  type: string
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+  /entrepreneur/lcsection/modify/{sectionId}:
+    put:
+      summary: modifier les données d'une section LC
+      description: 
+        Modifies input Lean Canvas section by changing it to 
+        the information in the request body and changes the
+        time stamp.
+      tags:
+       - Entrepreneurs API
+      security:
+        - MyINPulse:
+          - MyINPulse-entrepreneur
+      parameters:
+        - in: path
+          name: sectionId
+          schema:
+            type: integer
+          required: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                title:
+                  type: string
+                txt:
+                  type: string
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+            missing or invalid
+            
+  /entrepreneur/lcsection/remove/{sectionId}:
+    delete:
+      summary: supprimer une section LC.
+      description:
+        Deletes section from Lean Canvas
+      tags:
+        - Entrepreneurs API
+      security:
+        - MyINPulse:
+          - MyINPulse-entrepreneur
+      parameters:
+        - in: path
+          name: sectionId
+          schema:
+            type: integer
+          required: true
+      responses:
+        "200": 
+          description: OK
+        "400":
+          description: Bad request
+        "401":
+          description: Authorization information is
+                      missing or invalid
+  
+  
+  
+  

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

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

@@ -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.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;
+import org.springframework.web.bind.annotation.*;
 
 @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,
-            @RequestBody String content,
+            @PathVariable Long sectionId,
+            @RequestBody SectionCell sectionCell,
             @AuthenticationPrincipal Jwt principal) {
         entrepreneurApiService.editSectionCell(
-                sectionCellId, content, 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"));
+                sectionId, sectionCell, 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) {
-        entrepreneurApiService.removeSectionCell(
-                sectionCellId, principal.getClaimAsString("email"));
+            @PathVariable Long sectionId, @AuthenticationPrincipal Jwt principal) {
+        entrepreneurApiService.removeSectionCell(sectionId, 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,
-            boolean pending) {
-        super(userSurname, userName, primaryMail, secondaryMail, phoneNumber, pending);
+            MakeAppointment makeAppointment) {
+        super(idUser, userSurname, userName, primaryMail, secondaryMail, phoneNumber);
         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,
-            boolean pending) {
+            String phoneNumber) {
         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.*;
+import enseirb.myinpulse.service.database.ProjectService;
+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,
-            UserService userService,
-            EntrepreneurService entrepreneurService,
-            AdministratorService administratorService,
-            AppointmentService appointmentService,
-            AnnotationService annotationService) {
+            UtilsService utilsService) {
         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) {
-        if (sectionCellId == null) {
-            logger.warn("Trying to edit unknown section cell");
+    public void editSectionCell(Long sectionCellId, SectionCell sectionCell, String mail) {
+        SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
+        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 =
-                new SectionCell(
-                        null,
+        sectionCellService.updateSectionCell(
+                sectionCellId,
                 sectionCell.getSectionId(),
-                        content,
-                        LocalDateTime.now(),
-                        sectionCell.getProjectSectionCell());
-        newSectionCell.setIdReference(sectionCell.getIdReference());
-        this.addSectionCell(newSectionCell, mail);
-        sectionCell
-                .getAppointmentSectionCell()
-                .forEach(
-                        appointment -> {
-                            this.appointmentService.updateAppointmentListSectionCell(
-                                    appointment.getIdAppointment(), newSectionCell);
-                        });
-        sectionCell
-                .getListAnnotation()
-                .forEach(
-                        annotation -> {
-                            this.annotationService.updateAnnotationSectionCell(
-                                    annotation.getIdAnnotation(), newSectionCell);
-                        });
+                sectionCell.getContentSectionCell(),
+                sectionCell.getModificationDate());
     }
 
     public void removeSectionCell(Long sectionCellId, String mail) {
-        if (sectionCellId == null) {
-            logger.warn("Trying to remove unknown section cell");
+        SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
+        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 =
-                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);
+        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());
-        SectionCell newSectionCell =
-                sectionCellService.addNewSectionCell(
-                        sectionCell); // if here, logger fails cause id is null (not added yet)
+                this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
+        SectionCell newSectionCell = sectionCellService.addNewSectionCell(sectionCell);
         newSectionCell.getProjectSectionCell().updateListSectionCell(newSectionCell);
         newSectionCell
                 .getAppointmentSectionCell()
                 .forEach(
                         appointment -> {
-                            this.appointmentService.updateAppointmentListSectionCell(
-                                    appointment.getIdAppointment(), newSectionCell);
+                            appointment.updateListSectionCell(newSectionCell);
                         });
         newSectionCell
                 .getListAnnotation()
                 .forEach(
                         annotation -> {
-                            this.annotationService.updateAnnotationSectionCell(
-                                    annotation.getIdAnnotation(), newSectionCell);
+                            annotation.setSectionCellAnnotation(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());
-        project.setEntrepreneurProposed((Entrepreneur) this.userService.getUserByEmail(mail));
+        logger.info("User {} created a new project with id {}", mail, project.getIdProject());
+        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);
-        /*
-        {"id":"7a845f2e-c832-4465-8cd8-894d72bc13f1","name":"MyINPulse-entrepreneur","description":"Role for entrepreneur","composite":false,"clientRole":false,"containerId":"0d6f691b-e328-471a-b89e-c30bd7e5b6b0","attributes":{}}
-         */
-        // TODO: check what happens when role does not exist
-        return response;
+                        .body(RoleRepresentation[].class);
+
+        if (response == null || response.length == 0) {
+            throw new RoleNotFoundException("Role not found");
+        }
+        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);
-        String userId = getUserIdByName(username, token);
-        List<RoleRepresentation> rolesToAdd = List.of(roleRepresentation);
-        logger.debug("Adding role {} to user {}", roleRepresentation.id, userId);
+        RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, bearer);
+        String userId = getUserIdByName(username, bearer);
+
         RestClient.builder()
                 .baseUrl(keycloakUrl)
-                .defaultHeader("Authorization", toBearer(token))
+                .defaultHeader("Authorization", bearer)
                 .build()
                 .post()
-                .uri("/admin/realms/" + realmName + "/users/" + userId + "/role-mappings/realm")
-                .body(rolesToAdd)
+                .uri(
+                        "/admin/realms/${realmName}/users/${userId}/role-mappings/realm",
+                        realmName,
+                        userId)
+                .body(roleRepresentation)
                 .contentType(APPLICATION_JSON)
-                .retrieve()
-                .toBodilessEntity();
+                .retrieve();
     }
 
     /**

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,
-            EntrepreneurApi entrepreneurApi,
-            AdminApi adminApi) {
+            UtilsService utilsService) {
         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);
-
-        Project project = projectService.getProjectById(projectId);
-
-        Iterable<SectionCell> sectionCellsIterable =
-                this.sectionCellService.getSectionCellsByProject(project);
-
-        // Use a Set to collect unique appointments
-        Set<Appointment> uniqueAppointments = new HashSet<>();
-
-        sectionCellsIterable.forEach(
+        Iterable<SectionCell> sectionCells =
+                this.sectionCellService.getSectionCellsByProject(
+                        projectService.getProjectById(projectId),
+                        2L); // sectionId useless in this function ?
+        List<Appointment> appointments = new ArrayList<Appointment>();
+        sectionCells.forEach(
                 sectionCell -> {
-                    List<Appointment> sectionAppointments =
+                    appointments.addAll(
                             this.sectionCellService.getAppointmentsBySectionCellId(
-                                    sectionCell.getIdSectionCell());
-                    // Add all appointments from this section cell to the Set
-                    uniqueAppointments.addAll(sectionAppointments);
+                                    sectionCell.getIdSectionCell()));
                 });
-
-        // Convert the Set back to a List for the return value
-        return new ArrayList<>(uniqueAppointments);
+        return appointments;
     }
 
     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 Objects.equals(
-                entrepreneur.getProjectParticipation().getIdProject(), project.getIdProject());
+        return entrepreneur.getProjectParticipation() == project;
     }
 
     // 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,
-            SectionCell sectionCell) {
+            String appointmentSubject) {
         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,
-            String school,
-            String course,
-            Boolean sneeStatus,
-            Project projectParticipation,
-            Project projectProposed,
-            MakeAppointment makeAppointment) {
+            Long id, String school, String course, Boolean sneeStatus) {
         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) {
-        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) {
+    public Report updateReport(Long id, String reportContent) {
         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,
-            String contentSectionCell,
-            Appointment appointment,
-            Annotation annotation,
-            Project project) {
+            Long id, Long sectionId, String contentSectionCell, LocalDateTime modificationDate) {
         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) {
-            sectionCell.get().updateAppointmentSectionCell(appointment);
-            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());
+        if (modificationDate != null) {
+            sectionCell.get().setModificationDate(modificationDate);
         }
         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.issuer-uri=http://localhost:7080/realms/${VITE_KEYCLOAK_REALM}
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
 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.*;
+import enseirb.myinpulse.service.database.AdministratorService;
+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 AppointmentService appoitmentService,
-            @Autowired SectionCellService sectionCellService) {
+            @Autowired EntrepreneurService entrepreneurService) {
         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/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_REALM=MyINPulse
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_REALM=test
 VITE_APP_URL=http://localhost:5173
 VITE_BACKEND_URL=http://localhost:8081/

documentation/openapi/notes.md

@@ -1,13 +0,0 @@
-## API Endpoints notes
-
-### EntrepreneurApi and SharedApi
-#### Endpoint Name Changes
-- `/entrepreneur/lcsection/modify/{sectionId}` → `/entrepreneur/sectionCell/modify/{sectionId}`
-
-### Admin api
-- `/admin/appointments/report/{appointmentId}` has no PUT and DELETE
-- `/admin/request-join` and `/admin/request-join/decision/{joinRequestId}` have not yet been implemented
-
-### Unauth api
-- `/unauth/request-join/{projectId}` has not yet been implemented
-

documentation/openapi/run_doc.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cd ./swagger-ui
-
-if [ ! -d "./node_modules/" ]
-then
-    npm install
-    npm install swagger-cli
-fi
-
-npm start

documentation/openapi/src/adminApi.yaml

@@ -1,387 +0,0 @@
-# Admin API Endpoints
-paths:
-  /admin/projects:
-    get:
-      operationId: getAdminProjects
-      summary: Get projects associated with the admin
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description: Retrieves a list of projects managed by the requesting admin, including details for overview.
-      responses:
-        "200":
-          description: OK - List of projects returned successfully.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/project"
-        "400":
-          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
-      summary: Manually add a new project
-      description: Creates a new project with the provided details. (NOTE that this meant for manually inserting projects, for example importing already existing projects).
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      requestBody:
-        required: true
-        description: Project details to create. `idProject` and `creationDate` will be ignored if sent and set by the server.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/project"
-      responses:
-        "200": # Use 200 Created for successful creation
-          description: Created - Project added successfully. Returns the created project.
-          content:
-            application/json:
-              schema:
-                $ref: "./main.yaml#/components/schemas/project"
-        "409":
-          description: Bad Request - Project already exists.
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-          
-
-  /admin/projects/pending:
-    get:
-      operationId: getPendingProjects
-      summary: Get projects awaiting validation
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description: Retrieves a list of projects submitted by entrepreneurs that are pending admin approval.
-      responses:
-        "200":
-          description: OK - List of pending projects returned.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $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:
-      operationId: getPendingProjects
-      summary: Get entrepreneurs project join requests
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description:  Retrieves a list of pending requests from entrepreneurs to join an existing project.
-      responses:
-        "200":
-          description: OK - List of pending project join requests.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/joinRequest"
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-  
-  /admin/request-join/decision/{joinRequestId}:
-    post:
-      summary: Approve or reject a pending project join request
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      parameters:
-        - in: path
-          name: joinRequestId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the pending join request to decide upon.
-        
-      description: |-
-        Allows an admin to make a decision on an ebtrepreneur's request to join an existing project awaiting validation.
-        If approved (isAccepted=true), the entrepreneur is linked to the project with ID joinRequestId.
-        If rejected (isAccepted=false), the pending request data might be archived or deleted based on business logic.
-      responses:
-        "200":
-          description: OK - No Content, decision processed successfully..
-          content:
-            application/json:
-              $ref: "./main.yaml#/components/schemas/joinRequestDecision"
-        "400":
-          description: Bad Request - Invalid input (e.g., missing decision).
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.   
-
-
-  /admin/projects/pending/decision:
-    post:
-      operationId: decidePendingProject
-      summary: Approve or reject a pending project
-      tags:
-        - Admin API
-      description: |-
-        Allows an admin to make a decision on a project awaiting validation.
-        If approved (isAccepted=true), the project status changes, and it's linked to the involved users.
-        If rejected (isAccepted=false), the pending project data might be archived or deleted based on business logic.
-      security:
-          - MyINPulse: [MyINPulse-admin]
-      requestBody:
-        required: true
-        description: Decision payload.
-        content:
-          application/json:
-            schema:
-              $ref: './main.yaml#/components/schemas/projectDecision'
-      responses:
-        "200": # Use 200 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
-    get:
-      operationId: getPendingAccounts
-      summary: Get accounts awaiting validation
-      description: Retrieves a list of entrepreneur user accounts that are pending admin validation.
-      tags:
-        - Admin API
-      security:
-          - MyINPulse: [MyINPulse-admin]
-      responses:
-        "200":
-          description: OK - List of pending accounts returned.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $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
-      operationId: validateUserAccount
-      summary: Validate a pending user account
-      description: Marks the user account specified by userId as validated/active.
-      tags:
-        - Admin API
-      security:
-          - MyINPulse: [MyINPulse-admin]
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the user account to validate.
-          example: 102
-      responses:
-        "200":
-          description: No Content - Account validated successfully.
-        "400":
-          description: Bad Request - Invalid user ID format.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.  
-        "401":
-          description: Unauthorized.
-
-  /admin/appointments/upcoming:
-    get:
-      operationId: getUpcomingAppointments
-      summary: Get upcoming appointments for an admin
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description: Retrieves a list of appointments scheduled for an admin in the future.
-      responses:
-        "200":
-          description: OK - List of upcoming appointments.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/appointment"
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-        "404":
-          description: no appointments found.
-        "401":
-          description: Unauthorized.
-
-  /admin/appointments/report/{appointmentId}:
-    post:
-      operationId: createAppointmentReport
-      summary: Create a report for an appointment
-      description: Creates and links a new report (e.g., meeting minutes) to the specified appointment using the provided content.
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      parameters:
-        - in: path
-          name: appointmentId
-          required: true
-          schema:
-            type: integer
-          description: ID of the appointment to add a report to.
-          example: 303
-      requestBody:
-        required: true
-        description: Report content. `idReport` will be ignored if sent.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/report"
-      responses:
-        "200":
-          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.
-          
-    put: # Changed to PUT for update/replacement
-      operationId: updateAppointmentReport
-      summary: Update an existing appointment report
-      description: Updates the content of an existing report linked to the specified appointment. Replaces the entire report content.
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      parameters:
-        - in: path
-          name: appointmentId
-          required: true
-          schema:
-            type: integer
-          description: ID of the appointment whose report needs updating.
-          example: 303
-      requestBody:
-        required: true
-        description: New report content. `idReport` in the body should match the existing report's ID or will be ignored.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/report"
-      responses:
-        "200":
-          description: OK - Report updated successfully. Returns the updated report.
-          content:
-             application/json:
-                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.
-
-
-  /admin/projects/{projectId}:
-    delete:
-      operationId: removeProject
-      summary: Remove a project
-      description: Permanently removes the project specified by projectId and potentially related data (use with caution).
-      tags:
-        - Admin API
-      security:
-          - MyINPulse: [MyINPulse-admin]
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the project to remove.
-          example: 12
-      responses:
-        "200":
-          description: No Content - Project removed successfully.
-        "400":
-          description: Bad Request - Invalid project ID format.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-        "401":
-          description: Unauthorized.
-          
-
-
-  /admin/make-admin/{userId}:
-    post:
-      operationId: grantAdminRights
-      summary: Grant admin rights to a user
-      tags:
-        - Admin API
-      security:
-        - MyINPulse: [MyINPulse-admin]
-      description: Elevates the specified user to also have administrator privileges. Assumes the user already exists.
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the user to grant admin rights.
-          example: 103
-      responses:
-        "200": # Use 200 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

@@ -1,197 +0,0 @@
-# Entrepreneur API Endpoints
-paths:
-  /entrepreneur/projects/request:
-    post:
-      operationId: requestProjectCreation
-      summary: Request creation and validation of a new project
-      tags:
-        - Entrepreneurs API
-      description: |-
-        Submits a request for a new project. The project details are provided in the request body.
-        The requesting entrepreneur (identified by the token) will be associated to it.
-        The project is created with a 'pending' status, awaiting admin approval.
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      requestBody:
-        required: true
-        description: Project details for the request. `status`, `creationDate` are required by the model when being sent but is ignored by the server; 
-          primarily expects a valid `projectId`, `name`, `logo`.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/project"
-      responses:
-        "200":
-          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:
-      operationId: addSectionCell
-      summary: Add a cell to a Lean Canvas section
-      description: Adds a new cell (like a sticky note) with the provided content to a specific section of the entrepreneur's project's Lean Canvas. Assumes project context is known based on user's token.
-        `idSectionCell` and `modificationDate` are server-generated so they're values in the request are ignored by the server.
-      tags:
-       - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      requestBody:
-        required: true
-        description: Section cell details. `idSectionCell` and `modificationDate` will be ignored if sent.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/sectionCell"
-      responses:
-        "200":
-          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:
-      operationId: modifySectionCell
-      summary: Modify data in a Lean Canvas section cell
-      description: Updates the content of an existing Lean Canvas section cell specified by `sectionCellId`. The server "updates" (it keeps a record of the previous version to keep a history of all the sectionCells and creates a new ones with the specified modifications) the `modificationDate`.
-      tags:
-       - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      parameters:
-        - in: path
-          name: sectionCellId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the section cell to modify.
-          example: 508
-      requestBody:
-        required: true
-        description: Updated section cell details. `sectionCellId` "the path parameter" is the only id that's consideredn the `sectionCellId` id in the request body is ignored. `modificationDate` should be updated by the server.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/sectionCell"
-      responses:
-        "200":
-          description: OK - Section cell updated successfully. Returns the updated cell.
-        "404":
-          description: Bad Request - Invalid input or ID mismatch.
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-
-    delete:
-      operationId: removeSectionCell
-      summary: Remove a Lean Canvas section cell
-      description: Deletes the Lean Canvas section cell specified by `sectionCellId`.
-      tags:
-        - Entrepreneurs API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur]
-      parameters:
-        - in: path
-          name: sectionCellId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the section cell to remove.
-          example: 509
-      responses:
-        "200":
-          description: No Content - Section cell removed successfully.
-        "400":
-          description: Bad Request - Invalid ID format.
-        "404":
-          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

@@ -1,159 +0,0 @@
-openapi: 3.0.3
-info:
-  title: MyInpulse Backend API
-  description: This serves as an OpenAPI documentation for the MyInpulse backend service, covering operations for Entrepreneurs, Admins, and shared functionalities.
-  version: 0.2.1
-
-tags:
-  - name: Entrepreneurs API
-    description: API endpoints primarily for Entrepreneur users.
-  - name: Admin API
-    description: API endpoints restricted to Admin users for management tasks.
-  - name: Shared API
-    description: API endpoints accessible by both Entrepreneurs and Admins.
-  - name: Unauth API
-    description: API endpoints related to user account management.
-
-components:
-  schemas:
-    user:
-      $ref: "models.yaml#/user"
-    user-entrepreneur:
-      $ref: "models.yaml#/user-entrepreneur"
-    user-admin:
-      $ref: "models.yaml#/user-admin"
-    sectionCell:
-      $ref: "models.yaml#/sectionCell"
-    project:
-      $ref: "models.yaml#/project"
-    report:
-      $ref: "models.yaml#/report"
-    appointment:
-      $ref: "models.yaml#/appointment"
-    joinRequest:
-      $ref: "models.yaml#/joinRequest"
-    projectDecision:
-      $ref: "models.yaml#/projectDecision"
-    joinRequestDecision:
-      $ref: "models.yaml#/joinRequestDecision"
-
-  securitySchemes:
-      MyINPulse:
-        type: oauth2
-        description: OAuth2 authentication using Keycloak.
-        flows:
-          implicit:
-            authorizationUrl: '{keycloakBaseUrl}/realms/{keycloakRealm}/protocol/openid-connect/auth'
-            scopes:
-              MyINPulse-admin: Grants administrator access.
-              MyINPulse-entrepreneur: Grants standard entrepreneur user access.
-
-servers:
-    - url: '{serverProtocol}://{serverHost}:{serverPort}'
-      description: API Server
-      variables:
-        serverProtocol:
-          enum: [http, https]
-          default: http
-        serverHost:
-          default: localhost
-        serverPort:
-          enum: ['8081'] 
-          default: '8081'
-        keycloakBaseUrl:
-          default: http://localhost:7080
-          description: Base URL for the Keycloak server.
-        keycloakRealm:
-          default: MyInpulseRealm 
-          description: Keycloak realm name.
-
-paths:
-  #       _   _                   _   _        _          _ 
-  #      | | | |_ __   __ _ _   _| |_| |__    / \   _ __ (_)
-  #      | | | | '_ \ / _` | | | | __| '_ \  / _ \ | '_ \| |
-  #      | |_| | | | | (_| | |_| | |_| | | |/ ___ \| |_) | |
-  #       \___/|_| |_|\__,_|\__,_|\__|_| |_/_/   \_\ .__/|_|
-  #                                                |_|      
-
-  /unauth/finalize:
-    $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"
-
-  #          _    ____  __  __ ___ _   _      _    ____ ___
-  #         / \  |  _ \|  \/  |_ _| \ | |    / \  |  _ \_ _|
-  #        / _ \ | | | | |\/| || ||  \| |   / _ \ | |_) | |
-  #       / ___ \| |_| | |  | || || |\  |  / ___ \|  __/| |
-  #      /_/   \_\____/|_|  |_|___|_| \_| /_/   \_\_|  |___|
-  #
-  /admin/pending-accounts:
-    $ref: "./adminApi.yaml#/paths/~1admin~1pending-accounts"
-  /admin/accounts/validate/{userId}:
-    $ref: "./adminApi.yaml#/paths/~1admin~1accounts~1validate~1{userId}"
-  /admin/request-join:
-    $ref: "./adminApi.yaml#/paths/~1admin~1request-join"
-  /admin/request-join/decision/{joinRequestId}:
-    $ref: "./adminApi.yaml#/paths/~1admin~1request-join~1decision~1{joinRequestId}"
-  /admin/projects:
-    $ref: "./adminApi.yaml#/paths/~1admin~1projects"
-  /admin/projects/pending:
-    $ref: "./adminApi.yaml#/paths/~1admin~1projects~1pending"
-  /admin/projects/pending/decision:
-    $ref: "./adminApi.yaml#/paths/~1admin~1projects~1pending~1decision"
-  /admin/appointments/report/{appointmentId}:
-    $ref: "./adminApi.yaml#/paths/~1admin~1appointments~1report~1{appointmentId}"
-  /admin/appointments/upcoming:
-    $ref: "./adminApi.yaml#/paths/~1admin~1appointments~1upcoming"
-  /admin/projects/{projectId}:
-    $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"
-
-  #       ____  _                        _      _    ____ ___
-  #      / ___|| |__   __ _ _ __ ___  __| |    / \  |  _ \_ _|
-  #      \___ \| '_ \ / _` | '__/ _ \/ _` |   / _ \ | |_) | |
-  #       ___) | | | | (_| | | |  __/ (_| |  / ___ \|  __/| |
-  #      |____/|_| |_|\__,_|_|  \___|\__,_| /_/   \_\_|  |___|
-  #
-  /shared/projects/sectionCells/{projectId}/{sectionId}/{date}:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1projects~1sectionCells~1{projectId}~1{sectionId}~1{date}"
-  /shared/projects/entrepreneurs/{projectId}:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1projects~1entrepreneurs~1{projectId}"
-  /shared/projects/admin/{projectId}:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1projects~1admin~1{projectId}"
-  /shared/projects/appointments/{projectId}:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1projects~1appointments~1{projectId}"
-  /shared/appointments/report/{appointmentId}:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1appointments~1report~1{appointmentId}"
-  /shared/appointments/request:
-    $ref: "./sharedApi.yaml#/paths/~1shared~1appointments~1request"
-
-  #      _____ _   _ _____ ____  _____ ____  ____  _____ _   _ _____ _   _ ____
-  #     | ____| \ | |_   _|  _ \| ____|  _ \|  _ \| ____| \ | | ____| | | |  _ \
-  #     |  _| |  \| | | | | |_) |  _| | |_) | |_) |  _| |  \| |  _| | | | | |_) |
-  #     | |___| |\  | | | |  _ <| |___|  __/|  _ <| |___| |\  | |___| |_| |  _ <
-  #     |_____|_|_\_| |_| |_| \_\_____|_|   |_| \_\_____|_| \_|_____|\___/|_| \_\
-  #        / \  |  _ \_ _|
-  #       / _ \ | |_) | |
-  #      / ___ \|  __/| |
-  #     /_/   \_\_|  |___|
-  #
-
-  /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/models.yaml

@@ -1,210 +0,0 @@
-# models.yaml
-user:
-  type: object
-  properties:
-    idUser:
-      type: integer
-      description: Unique identifier for the user.
-      #readOnly: true # Typically generated by the server
-      example: 101
-    userSurname:
-      type: string
-      description: User's surname (last name).
-      example: "Doe"
-    userName:
-      type: string
-      description: User's given name (first name).
-      example: "John"
-    primaryMail:
-      type: string
-      format: email
-      description: User's primary email address.
-      example: "john.doe@example.com"
-    secondaryMail:
-      type: string
-      format: email
-      description: User's secondary email address (optional).
-      example: "j.doe@personal.com"
-    phoneNumber:
-      type: string
-      description: User's phone number.
-      example: "+33612345678" # Example using international format
-
-user-entrepreneur:
-  allOf:
-    - $ref: "#/user"
-    - type: object
-      properties:
-        school:
-          type: string
-          description: The school the entrepreneur attends/attended.
-          example: "ENSEIRB-MATMECA"
-        course:
-          type: string
-          description: The specific course or program of study.
-          example: "Electronics"
-        sneeStatus:
-          type: boolean
-          description: Indicates if the user has SNEE status (Statut National d'Étudiant-Entrepreneur).
-          example: true
-  example: # Added full object example
-    idUser: 101
-    userSurname: "Doe"
-    userName: "John"
-    primaryMail: "john.doe@example.com"
-    secondaryMail: "j.doe@personal.com"
-    phoneNumber: "+33612345678"
-    school: "ENSEIRB-MATMECA"
-    course: "Electronics"
-    sneeStatus: true
-
-user-admin:
-  allOf:
-    - $ref: "#/user"
-  # No additional properties needed for this example
-  example: # Added full object example
-    idUser: 55
-    userSurname: "Admin"
-    userName: "Super"
-    primaryMail: "admin@myinpulse.com"
-    phoneNumber: "+33512345678"
-
-sectionCell:
-  type: object
-  description: Represents a cell (like a sticky note) within a specific section of a project's Lean Canvas.
-  properties:
-    idSectionCell:
-      type: integer
-      description: Unique identifier for the section cell.
-      #readOnly: true # Generated by server
-      example: 508
-    sectionId:
-      type: integer
-      description: Identifier of the Lean Canvas section this cell belongs to (e.g., 1 for Problem, 2 for Solution).
-      example: 1
-    contentSectionCell:
-      type: string
-      description: The text content of the section cell.
-      example: "Users find it hard to track project progress."
-    modificationDate:
-      type: string
-      format: date # Using Java LocalDate -> YYYY-MM-DD
-      description: The date when this cell was last modified.
-      #readOnly: true # Typically updated by the server on modification
-      example: "yyyy-MM-dd HH:mm"
-
-project:
-  type: object
-  description: Represents a project being managed or developed.
-  properties:
-    idProject:
-      type: integer
-      description: Unique identifier for the project.
-      #readOnly: true # Generated by server
-      example: 12
-    projectName:
-      type: string
-      description: The name of the project.
-      example: "MyInpulse Mobile App"
-    creationDate:
-      type: string
-      format: date # Using Java LocalDate -> YYYY-MM-DD
-      description: The date when the project was created in the system.
-      #readOnly: true # Set by server
-      example: "yyyy-MM-dd HH:mm"
-    logo:
-      type: string
-      format: byte
-      description: Base64 encoded string representing the project logo image.
-      example: "/*Base64 encoded string representing the project logo image*/"
-    status:
-      type: string
-      enum: [PENDING, ACTIVE, ENDED, ABORTED, REJECTED]
-      description: Corresponds to a status enum internal to the backend, it's value in in requests
-        incoming to the server should be ignored as the client shouldn't be specifying them.
-      example: "NaN"
-
-joinRequest:
-  type: object
-  description: Represents a request from an entrepreneur to join an already existing project.
-  properties:
-    idProject:
-      type: integer
-      description: the ID of the project the entrepreneur wants to join.
-      example: 42
-    entrepreneur:
-      $ref: "#/user-entrepreneur"
-      
-
-report:
-  type: object
-  description: Represents a report associated with an appointment.
-  properties:
-    idReport:
-      type: integer
-      description: Unique identifier for the report.
-      #readOnly: true # Generated by server
-      example: 987
-    reportContent:
-      type: string
-      description: The textual content of the report. Could be plain text or Markdown (specify if known).
-      example: "Discussed roadmap milestones for Q3. Agreed on preliminary UI mockups."
-
-appointment: # Corrected typo
-  type: object
-  description: Represents a scheduled meeting or appointment.
-  properties:
-    idAppointment: # Assuming there's an ID
-        type: integer
-        description: Unique identifier for the appointment.
-        #readOnly: true
-        example: 303
-    appointmentDate:
-      type: string
-      format: date # Using Java LocalDate -> YYYY-MM-DD
-      description: The date of the appointment.
-      example: "2025-05-10"
-    appointmentTime:
-      type: string
-      format: time # Using Java LocalTime -> HH:mm:ss
-      description: The time of the appointment (local time).
-      example: "14:30:00"
-    appointmentDuration:
-      type: string
-      description: Duration of the appointment in ISO 8601 duration format (e.g., PT1H30M for 1 hour 30 minutes).
-      example: "PT1H" # Example for 1 hour
-    appointmentPlace:
-      type: string
-      description: Location or meeting link for the appointment.
-      example: "Meeting Room 3 / https://meet.example.com/abc-def-ghi"
-    appointmentSubject:
-      type: string
-      description: The main topic or subject of the appointment.
-      example: "Q3 Roadmap Planning"
-    # Consider adding project ID or user IDs if relevant association exists
-
-projectDecision:
-  type: object
-  description: Represents a decision from an admin to accept a pending project.
-  properties:
-    projectId:
-      type: integer
-      description: The ID of the project the entrepreneur wants to join.
-      example: 12
-    adminId: 
-      type: integer
-      description: The ID of the project the admin who will supervise the project in case of admission.
-      example: 2
-    isAccepted:
-      type: boolean
-      description: The boolean value of the decision.
-      example: "true"
-
-joinRequestDecision:
-  type: object
-  description: Represents a decision from an admin to accept a pending project join request.
-  properties:
-    isAccepted:
-      type: boolean
-      description: The boolean value of the decision.
-      example: "true"

documentation/openapi/src/sharedApi.yaml

@@ -1,193 +0,0 @@
-# Shared API Endpoints
-paths:    
-
-  /shared/projects/sectionCells/{projectId}/{sectionId}/{date}: 
-    get:
-      operationId: getSectionCellsByDate
-      summary: Get project section cells modified on a specific date
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Retrieves section cells belonging to a specific section of a project, filtered by the last modification date. Requires user to have access to the project.
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema: { type: integer }
-          description: ID of the project.
-        - in: path
-          name: sectionId
-          required: true
-          schema: { type: integer }
-          description: ID of the Lean Canvas section.
-        - in: path
-          name: date
-          required: true
-          schema: { type: string, format: date } # Expect YYYY-MM-DD
-          description: The modification date to filter by (YYYY-MM-DD HH:mm).
-      responses:
-        "200":
-          description: OK - List of section cells matching the criteria.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/sectionCell"
-        "400":
-          description: Bad Request - Invalid parameter format.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-        "401":
-          description: Unauthorized.
-          
-
-  /shared/projects/entrepreneurs/{projectId}:
-    get:
-      operationId: getProjectEntrepreneurs
-      summary: Get entrepreneurs associated with a project
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Retrieves a list of entrepreneur users associated with the specified project. Requires access to the project.
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema: { type: integer }
-          description: ID of the project.
-      responses:
-        "200":
-          description: OK - List of entrepreneurs.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/user-entrepreneur"
-        "401":
-          description: Unauthorized.       
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.         
-        "404":
-          description: Not Found - Project not found.       
-
-  /shared/projects/admin/{projectId}: # Path updated
-    get:
-      operationId: getProjectAdmin
-      summary: Get admin associated with a project
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Retrieves a list of admin users associated with the specified project. Requires access to the project.
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema: { type: integer }
-          description: ID of the project.
-      responses:
-        "200":
-          description: OK - admin.
-          content:
-            application/json:
-              schema:
-                $ref: "./main.yaml#/components/schemas/user-admin"
-        "401":
-          description: Unauthorized.       
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.    
-        "404":
-          description: Not Found - Project not found.
-          
-
-  /shared/projects/appointments/{projectId}:
-    get:
-      operationId: getProjectAppointments
-      summary: Get appointments related to a project
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Retrieves a list of appointments associated with the specified project. Requires access to the project.
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema: { type: integer }
-          description: ID of the project.
-      responses:
-        "200":
-          description: OK - List of appointments.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "./main.yaml#/components/schemas/appointment"
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-        "401":
-          description: Unauthorized.
-          
-
-  /shared/appointments/report/{appointmentId}: # Path updated
-    get:
-      operationId: getAppointmentReport # Shared endpoint implies read-only access might be possible
-      summary: Get the report for an appointment
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Retrieves the report associated with a specific appointment. Requires user to have access to the appointment/project.
-      parameters:
-        - in: path
-          name: appointmentId
-          required: true
-          schema: { type: integer }
-          description: ID of the appointment.
-      responses:
-        "200":
-          description: OK - Report PDF returned.
-          content:
-            application/pdf:
-              schema:
-                schema:
-                type: string
-                format: binary
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-          
-
-  /shared/appointments/request:
-    post:
-      operationId: requestAppointment
-      summary: Request a new appointment
-      tags:
-        - Shared API
-      security:
-        - MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
-      description: Allows a user (entrepreneur or admin) to request a new appointment, potentially with another user or regarding a project. Details in the body. The request might need confirmation or create a pending appointment.
-      requestBody:
-        required: true
-        description: Details of the appointment request.
-        content:
-          application/json:
-            schema:
-              $ref: "./main.yaml#/components/schemas/appointment" # Assuming request uses same model structure
-                # Potentially add projectId or targetUserId here
-      responses:
-        "200": # Accepted seems appropriate for a request
-          description: Accepted - Appointment request submitted.
-        "400":
-          description: Bad Request - Invalid appointment details.
-        "401":
-          description: Unauthorized.
-        "403":
-          description: Bad Token - Invalid Keycloack configuration.
-          

documentation/openapi/src/unauthApi.yaml

@@ -1,90 +0,0 @@
-
-#       _   _                   _   _        _          _ 
-#      | | | |_ __   __ _ _   _| |_| |__    / \   _ __ (_)
-#      | | | | '_ \ / _` | | | | __| '_ \  / _ \ | '_ \| |
-#      | |_| | | | | (_| | |_| | |_| | | |/ ___ \| |_) | |
-#       \___/|_| |_|\__,_|\__,_|\__|_| |_/_/   \_\ .__/|_|
-#                                                |_|      
-
-paths:
-  /unauth/finalize:
-    post:
-      summary: Finalize account setup using authentication token
-      description: |-
-        Completes the user account creation/setup process in the MyInpulse system.
-        This endpoint requires the user to be authenticated via Keycloak (e.g., after initial login).
-        User details (name, email, etc.) are extracted from the authenticated user's token (e.g., Keycloak JWT).
-        No request body is needed. The account is marked as pending admin validation upon successful finalization.
-      tags:
-        - Unauth API
-      responses:
-        "200":
-          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
-      description: Submits a request for the authenticated user (keycloack authenticated) to join the project specified by projectId. Their role is then changed to entrepreneur in server and Keycloak. This requires approval from a project admin.
-      tags:
-       - Unauth API
-      parameters:
-        - in: path
-          name: projectId
-          required: true
-          schema:
-            type: integer
-          description: The ID of the project to request joining.
-          example: 15
-      responses: # Moved responses block to correct level
-        "200":
-          description: Accepted - Join request submitted and pending approval.
-        "400":
-          description: Bad Request - Invalid project ID format 
-        "409":
-          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
-      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":
-          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/main.js

@@ -1,14 +0,0 @@
-const express = require("express");
-const swaggerUi = require("swagger-ui-express");
-const yaml = require("js-yaml");
-const fs = require("fs");
-
-const app = express();
-
-const swaggerDocument = yaml.load(fs.readFileSync("../src/bundled.yaml", "utf8"));
-
-app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
-
-app.listen(3000, () => {
-    console.log("Swagger UI running at http://localhost:3000/api-docs");
-});

documentation/openapi/swagger-ui/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "swagger-ui",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "bundle": "swagger-cli bundle -o ../src/bundled.yaml -t yaml ../src/main.yaml",
-    "start": "npm run bundle; node main.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "dependencies": {
-    "express": "^4.21.2",
-    "js-yaml": "^4.1.0",
-    "package.json": "^2.0.1",
-    "swagger-cli": "^4.0.4",
-    "swagger-ui-express": "^5.0.1"
-  }
-}

front/MyINPulse-front/fake_data/db.json

@@ -0,0 +1,63 @@
+{
+  "entrepreneurs": [
+    { "id": 1, "name": "Alice", "email": "alice@example.com" },
+    { "id": 2, "name": "Bob", "email": "bob@example.com" },
+    { "id": 3, "name": "Charlie", "email": "charlie@example.com" }
+  ],
+  "data": [
+    {
+      "projectId": 1,
+      "title": 1,
+      "title_text": "1. Problème",
+      "description": "3 problèmes essentiels à résoudre pour le client"
+    },
+    {
+      "projectId": 1,
+      "title": 2,
+      "title_text": "2. Segments",
+      "description": "Les segments de clientèle visés"
+    },
+    {
+      "projectId": 1,
+      "title": 3,
+      "title_text": "3. Valeur",
+      "description": "La proposition de valeur"
+    },
+    {
+      "projectId": 1,
+      "title": 4,
+      "title_text": "4. Solution",
+      "description": "Les solutions proposées"
+    },
+    {
+      "projectId": 1,
+      "title": 5,
+      "title_text": "5. Avantage",
+      "description": "Les avantages concurrentiels"
+    },
+    {
+      "projectId": 1,
+      "title": 6,
+      "title_text": "6. Canaux",
+      "description": "Les canaux de distribution"
+    },
+    {
+      "projectId": 1,
+      "title": 7,
+      "title_text": "7. Indicateurs",
+      "description": "Les indicateurs clés de performance"
+    },
+    {
+      "projectId": 1,
+      "title": 8,
+      "title_text": "8. Coûts",
+      "description": "Les coûts associés"
+    },
+    {
+      "projectId": 1,
+      "title": 9,
+      "title_text": "9. Revenus",
+      "description": "Les sources de revenus"
+    }
+  ]
+}

front/MyINPulse-front/fake_data/open.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+json-server --watch db.json --port 5000

front/MyINPulse-front/src/App.vue

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

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

@@ -0,0 +1,75 @@
+<template>
+    <div id="agenda">
+        <h3>Rendez-vous</h3>
+        <table>
+        <tbody>
+            <tr v-for=" (p, index) in projectRDV" :key="index" >
+                <td>{{ p.projectName }} </td> <td>{{ p.date }}</td> <td>{{ p.lieu }}</td>
+            </tr>
+        </tbody>
+        </table>
+    </div>
+</template>
+
+<script setup lang="ts">
+    import { defineProps } from "vue";
+
+    interface rendezVous{
+        projectName: String,
+        date: String,
+        lieu: String,
+    }
+
+    const props = defineProps<{
+        projectRDV: rendezVous[]
+    }>();
+</script>
+
+<style scoped>
+ #agenda {   
+    padding: 20px;
+  }
+
+  /* Table Styling */
+ table {
+    width: 100%;
+    border-collapse: collapse;
+    font-family: Arial, sans-serif;
+    text-align: left;
+    margin-top: 20px;
+    border: 1px solid #ccc;
+  }
+  
+  /* Header Row (if exists) */
+  th {
+    background-color: #f4f4f4;
+    padding: 12px;
+    font-weight: bold;
+    border: 1px solid #ccc;
+  }
+  
+  /* Table Body Rows */
+  tbody tr {
+    border-bottom: 1px solid #ddd;
+    transition: background-color 0.2s ease; /* Smooth hover effect */
+  }
+  
+  tbody tr:hover {
+    background-color: #f9f9f9; /* Highlight row on hover */
+  }
+  
+  /* Cells Styling */
+  td {
+    padding: 10px;
+    border: 1px solid #eee;
+    font-size: 14px;
+    vertical-align: middle; /* Align text to middle */
+  }
+  
+  /* First Column Styling */
+  td:first-child {
+    text-align: center;
+    width: 50px; /* Adjust width as needed */
+  }
+ 
+</style>

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

@@ -1,21 +1,130 @@
 <template>
-    <div class="project">
+    <div @click="goToLink" class="project">
         <div class="project-header">
-            <h2>{{ projectName }}</h2>
+            <h2 >{{ projectName }}</h2>
+            <div class="project-buttons">
+                <button class="contact-btn">Contact</button>
+            </div>
+        </div>
+        <div class="project-body">   
+            <ul>
+                <li v-for="(name, index) in listName" :key="index">{{ name }}</li>
+            </ul>
         </div>
     </div>
 </template>
 
-<script lang="ts">
-import type { PropType } from "vue";
 
-export default {
-    name: "ProjectComponent",
-    props: {
-        projectName: {
-            type: Object as PropType<string>,
-            required: true,
-        },
-    },
+
+<script setup lang="ts">
+import { defineProps } from "vue";
+import { useRouter } from 'vue-router'
+
+
+const props = defineProps<{
+    projectName: string;
+    listName: string[];
+    projectLink: string;
+}>();
+
+const router = useRouter();
+
+const goToLink = () => {
+  if (props.projectLink) {
+    router.push(props.projectLink);
+  }
+ 
 };
 </script>
+
+
+<style scoped>
+.project {
+    background: linear-gradient(to right, #f4f4f4, #ffffff);
+    border: 1px solid #ddd;
+    border-radius: 10px;
+    padding: 20px;
+    margin: 20px 0;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    font-family: Arial, sans-serif;
+  }
+  
+  /* Header Styling */
+  .project-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  .project-header h2 {
+    font-size: 20px;
+    color: #333;
+    margin: 0;
+  }
+  
+  /* Button Container */
+  .project-buttons {
+    display: flex;
+    gap: 10px;
+  }
+
+
+  .info-btn {
+    background-color: #4CAF50;
+    color: #fff;
+  }
+  
+  .info-btn:hover {
+    background-color: #45a049;
+    transform: scale(1.05);
+  }
+  
+  .contact-btn {
+    background-color: #007BFF;
+    color: #fff;
+  }
+  
+  .contact-btn:hover {
+    background-color: #0056b3;
+    transform: scale(1.05);
+  }
+  
+
+
+
+  .project-body {
+    margin-top: 15px;
+  }
+  
+  .project-body p {
+    font-size: 16px;
+    color: #555;
+    margin-bottom: 10px;
+  }
+  
+  .project-body ul {
+    list-style-type: disc;
+    margin: 0;
+    padding-left: 20px;
+  }
+  
+  .project-body ul li {
+    font-size: 14px;
+    color: #666;
+    line-height: 1.6;
+  }
+
+
+  button {
+  padding: 10px 15px;
+  background-color: #007bff;
+  color: white;
+  border: none;
+  cursor: pointer;
+  border-radius: 5px;
+}
+  button:hover {
+    background-color: #0056b3;
+  }
+
+</style>

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

@@ -0,0 +1,359 @@
+<template>
+  <div :class="['cell', { expanded }]" @click="handleClick">
+    <h3>{{ title_text }}</h3>
+
+    <div class="section-bloc" v-for="(desc, index) in currentDescriptions" :key="index">
+
+<!-- ADMIN -------------------------------------------------------------------------------------------->
+
+      <template v-if="IS_ADMIN">
+        <div class="description">
+          <p>{{ desc }}</p>
+        </div>
+      </template>
+      
+<!-- ENTREP ------------------------------------------------------------------------------------------->
+      
+      <template v-if="!IS_ADMIN">
+        <!-- Mode affichage -->
+        <template v-if="!isEditing[index]">
+          <div class="description">
+            <p>{{ desc }}</p>
+          </div>
+          <div class="button-container">
+            <button v-if="expanded" @click.stop="startEditing(index)" class="edit-button">Éditer</button>
+          </div>
+        </template>
+
+        <!-- Mode édition -->
+        <template v-else>
+          <textarea v-model="editedDescriptions[index]" class="edit-input"></textarea>
+          <div class="button-container">
+            <button @click.stop="saveEdit(index)" class="save-button">Enregistrer</button>
+            <button @click.stop="cancelEdit(index)" class="cancel-button">Annuler</button>
+          </div>
+        </template>
+      </template>
+    </div>
+<!---------------------------------------------------------------------------------------------------->
+    <template v-if="expanded">
+      <div class="canvas-exit-hint">
+        Cliquez n'importe où pour quitter le canvas
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, defineProps } from "vue";
+import axios from "axios";
+
+const IS_MOCK_MODE = true; 
+const IS_ADMIN = false;
+
+const props = defineProps<{
+  projectId: number;
+  title: number;
+  title_text: string;
+  description: string;
+}>();
+
+const expanded = ref(false);
+const currentDescriptions = ref<string[]>([]);
+currentDescriptions.value[0] = props.description;
+const editedDescriptions = ref<string[]>([]);
+const isEditing = ref<boolean[]>([]);
+
+
+/*
+const fetchData = async () => {
+  try {
+    const response = await axios.get("http://localhost:5000/data"); // Met à jour l'URL
+    if (response.data.length > 0) {
+      currentDescription.value = response.data[0].canva_data;
+      editedDescription.value = response.data[0].canva_data;
+    } else {
+      console.warn("Aucune donnée reçue.");
+    }
+  } catch (error) {
+    console.error("Erreur lors de la récupération des données :", error);
+  }
+};
+*/
+
+// Fonction fetchData avec possibilité d'utiliser le mock
+const fetchData = async (projectId: number, title: number, date: string, useMock = false) => {
+  try {
+    const responseData = useMock
+      ? await mockFetch(projectId, title, date)
+      : (await axios.get<{ txt: string }[]>(
+          `http://localhost:5000/shared/projects/lcsection/${projectId}/${title}/${date}`
+        )).data;
+
+    if (responseData.length > 0) {
+      currentDescriptions.value = responseData.map((item) => item.txt);
+      editedDescriptions.value = [...currentDescriptions.value];
+      isEditing.value = Array(responseData.length).fill(false);
+    } else {
+      console.warn("Aucune donnée reçue.");
+    }
+  } catch (error) {
+    console.error("Erreur lors de la récupération des données :", error);
+  }
+};
+
+
+// Fonction de simulation de l'API
+const mockFetch = async (projectId: number, title: number, date: string) => {
+  console.log(`Mock fetch pour projectId: ${projectId}, title: ${title}, date: ${date}`);
+
+  return new Promise<{ txt: string }[]>((resolve) => {
+    setTimeout(() => {
+      resolve([
+      {txt: "Ceci est une description 1 pour tester le front. Franchement, si tu es encore en train de lire, c’est probablement que tu veux t'assurer que tout s’affiche bien même avec un texte bien long. Allez, encore quelques mots inutiles pour bien remplir la ligne et tester les retours à la ligne. Bravo champion."},
+      {txt: "Deuxième description : elle est là pour t’aider à tester le comportement du composant avec du texte plus dense. Peut-être même avec quelques caractères spéciaux, tiens : éèàçù$#@! Et si on faisait semblant d’avoir du contenu sérieux ? Non, toujours pas."},
+      {txt: "Troisième description, probablement inutile mais bon, on continue pour la forme. À ce stade, tu testes sûrement si le champ de texte peut supporter un pavé sans exploser. Spoiler alert : si t'as tout bien codé, ça devrait aller. Sinon, bah... débogue. Courage."}
+      ]);
+    }, 500); // Simule un délai réseau de 500ms
+  });
+};
+
+// Utilisation du mock dans handleClick pour tester sans serveur
+const handleClick = async () => {
+  if (!expanded.value) {
+    await fetchData(props.projectId, props.title, "NaN", IS_MOCK_MODE);
+  } else if (!isEditing.value.includes(true)) {
+    // Réinitialiser les descriptions si aucune édition n'est en cours
+    currentDescriptions.value = [props.description];
+    editedDescriptions.value = [props.description];
+  }
+
+  if (!isEditing.value.includes(true)) {
+    expanded.value = !expanded.value;
+  }
+};
+
+
+const startEditing = (index: number) => {
+  isEditing.value[index] = true;
+};
+
+/*
+const saveEdit = async (index: number) => {
+  try {
+    const id = index + 1; // À adapter selon l'ID réel des données
+    await axios.put(`http://localhost:5000/data/${id}`, {
+      canva_data: editedDescriptions.value[index]
+    });
+
+    // Mettre à jour l'affichage local après la mise à jour réussie
+    currentDescriptions.value[index] = editedDescriptions.value[index];
+    isEditing.value[index] = false;
+  } catch (error) {
+    console.error("Erreur lors de la mise à jour des données :", error);
+  }
+};
+*/
+
+const saveEdit = async (index: number) => {
+  if (IS_MOCK_MODE) {
+    await mockSaveEdit(index);
+  } else {
+    try {
+      const id = index + 1;
+      await axios.put(`http://localhost:5000/data/${id}`, {
+        canva_data: editedDescriptions.value[index]
+      });
+
+      // Mettre à jour l'affichage local après la mise à jour réussie
+      currentDescriptions.value[index] = editedDescriptions.value[index];
+      isEditing.value[index] = false;
+    } catch (error) {
+      console.error("Erreur lors de la mise à jour des données :", error);
+    }
+  }
+};
+
+// Fonction de mock pour l'enregistrement
+const mockSaveEdit = async (index: number) => {
+  try {
+    const id = index + 1;
+    console.log(`Mock save pour l'ID ${id} avec la description : ${editedDescriptions.value[index]}`);
+
+    await new Promise((resolve) => setTimeout(resolve, 500)); // Simulation de délai réseau
+
+    // Mettre à jour l'affichage local après la mise à jour réussie
+    currentDescriptions.value[index] = editedDescriptions.value[index];
+    isEditing.value[index] = false;
+  } catch (error) {
+    console.error("Erreur lors de la mise à jour des données mockées :", error);
+  }
+};
+
+const cancelEdit = (index: number) => {
+  editedDescriptions.value[index] = currentDescriptions.value[index];
+  isEditing.value[index] = false;
+};
+</script>
+
+<style scoped>
+@import "@/components/canvas/style-project.css";
+
+.cell {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  transition: all 0.3s ease;
+  cursor: pointer;
+  box-shadow: 0 4px 5px rgba(0, 0, 0, 0.1);
+}
+
+.expanded-content {
+  justify-content: flex-start !important;
+}
+
+.cell:not(.expanded):hover {
+  transform: scale(1.05);
+  box-shadow: 0 8px 9px rgba(0, 0, 0, 0.2);
+}
+
+.cell h3 {
+  font-size: 25px;
+  font-weight: 500;
+  font-family: 'Arial', sans-serif;
+}
+
+.p {
+  font-size: 25px;
+  color: #666;
+  font-family: 'Arial', sans-serif;
+}
+
+.expanded {
+  padding-top: 10%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: white;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+}
+
+
+.description {
+  display: flex;
+  align-items: center; 
+  justify-content: center;
+  text-align: center;
+  width: 100%;
+  height: 100%;
+  font-size: 16px;
+  margin-top: 10px;
+  margin-left: 2%;
+  margin-right: 4%;
+}
+
+.description + .p {
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+
+.edit-input {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  margin-top: 10px;
+  box-sizing: border-box;
+  margin-left: 2%;
+}
+
+
+.button-container {
+  display: block;
+  margin-top: 20px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  padding-right: 1%;
+}
+
+.section-bloc ,.editing-section-bloc {
+  width: 100%;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  margin-right: 10%;
+  margin: 10px;
+}
+
+.edit-button {
+  width: 100px;
+  height: 40px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  transition: background 0.3s ease;
+  font-size: 12px;
+  margin-right: 20px;
+}
+
+.save-button, .cancel-button {
+  width: 100px;
+  height: 40px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  transition: background 0.3s ease;
+  font-size: 12px;
+  margin-bottom: 5px;
+}
+
+.edit-button {
+  background-color: #007bff;
+  color: white;
+}
+
+.save-button {
+  background-color: #28a745;
+  color: white;
+}
+
+.cancel-button {
+  background-color: #dc3545;
+  color: white;
+}
+
+.edit-button:hover {
+  background-color: #0056b3;
+}
+
+.save-button:hover {
+  background-color: #218838;
+}
+
+.cancel-button:hover {
+  background-color: #c82333;
+}
+
+.canvas-exit-hint {
+  font-size: 0.75rem;
+  color: #666;
+  position: fixed;
+  bottom: 10px;
+  left: 0;
+  width: 100%;
+  text-align: center;
+  z-index: 1000;
+}
+
+</style>

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

@@ -0,0 +1,182 @@
+<template>
+  <header class="header">
+    <img src="../icons/logo inpulse.png" alt="INPulse Logo" class="logo" />
+
+    <div class="header-actions">
+      <div class="dropdown-wrapper">
+        <button class="contact-button" @click="toggleDropdown">Contact</button>
+        <div class="contact-dropdown" :class="{ 'dropdown-visible': isDropdownOpen }">
+          <button @click="contactAll">Contacter tous</button>
+          <button v-for="(email, index) in entrepreneurEmails" :key="index">
+            {{ email }}
+          </button>
+        </div>
+      </div>
+
+      <RouterLink to="/" class="return-button">Retour</RouterLink>
+    </div>
+  </header>
+</template>
+
+
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import axios from "axios";
+
+const IS_MOCK_MODE = true; 
+
+const props = defineProps<{
+  projectId: number;
+}>();
+
+type Entrepreneur = {
+  id: number;
+  name: string;
+  primaryMail: string;
+};
+
+const isDropdownOpen = ref(false);
+const entrepreneurEmails = ref([]);
+
+const toggleDropdown = () => {
+  isDropdownOpen.value = !isDropdownOpen.value;
+  console.log("Dropdown toggled:", isDropdownOpen.value);
+};
+
+
+const fetchEntrepreneurs = async (projectId :number, useMock = IS_MOCK_MODE) => {
+  try {
+    const responseData = useMock
+      ? await mockFetchEntrepreneurs(projectId)
+      : (await axios.get(`http://localhost:5000/shared/projects/entrepreneurs/${projectId}`)).data;
+
+    if (responseData.length > 0) {
+      entrepreneurEmails.value = responseData.map((item) => item.primaryMail);
+    } else {
+      console.warn("Aucun entrepreneur trouvé.");
+    }
+  } catch (error) {
+    console.error("Erreur lors de la récupération des entrepreneurs :", error);
+  }
+};
+
+// Fonction de simulation de l'API
+const mockFetchEntrepreneurs = async (projectId :number) => {
+  console.log(`Mock fetch pour projectId: ${projectId}`);
+
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve([
+        {
+          idUser: 1,
+          userSurname: "Doe",
+          userName: "John",
+          primaryMail: "john.doe@example.com",
+          secondaryMail: "johndoe@backup.com",
+          phoneNumber: "612345678",
+          school: "ENSEIRB",
+          course: "Info",
+          sneeStatus: false
+        },
+        {
+          idUser: 2,
+          userSurname: "Smith",
+          userName: "Jane",
+          primaryMail: "jane.smith@example.com",
+          secondaryMail: "janesmith@backup.com",
+          phoneNumber: "698765432",
+          school: "ENSEIRB",
+          course: "Info",
+          sneeStatus: true
+        }
+      ]);
+    }, 500);
+  });
+};
+
+const contactAll = () => {
+  alert("Contacter tous les entrepreneurs : " + entrepreneurEmails.value.join(", "));
+};
+
+onMounted(() => fetchEntrepreneurs(props.projectId, IS_MOCK_MODE));
+</script>
+
+<style scoped>
+@import "@/components/canvas/style-project.css";
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 30px;
+  background-color: #f9f9f9;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.logo {
+  height: 50px;
+}
+
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  position: relative;
+}
+
+.contact-button,
+.return-button {
+  background-color: #009CDE;
+  color: white;
+  border: none;
+  padding: 10px 15px;
+  cursor: pointer;
+  font-size: 14px;
+  border-radius: 5px;
+  text-decoration: none;
+  transition: background-color 0.2s ease;
+  font-family: Arial, sans-serif;
+}
+
+.return-button:hover,
+.contact-button:hover {
+  background-color: #007bad;
+}
+
+
+.contact-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  background-color: #000;
+  color: white;
+  box-shadow: 0px 4px 8px rgba(255, 255, 255, 0.2);
+  border-radius: 8px;
+  padding: 10px;
+  margin-top: 5px;
+  z-index: 1000;
+  min-width: 200px;
+  display: none;
+}
+
+.contact-dropdown button {
+  display: block;
+  width: 100%;
+  padding: 5px;
+  text-align: left;
+  border: none;
+  background: none;
+  cursor: pointer;
+  color: white;
+}
+
+.contact-dropdown button:hover {
+  background-color: #009CDE;
+}
+
+.contact-dropdown.dropdown-visible {
+  display: block;
+}
+
+
+</style>

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

@@ -0,0 +1,59 @@
+<template>
+  <div class="canvas">
+    <CanvasItem
+      v-for="(item, index) in items"
+      :key="index"
+      :title="item.title"
+      :title_text="item.title_text"
+      :description="item.description"
+      :projectId="item.projectId"
+      :class="item.class"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import CanvasItem from "@/components/canvas/CanvasItem.vue";
+
+const items = ref([
+  { projectId: 1, title: 1, title_text: "1. Problème", description: "3 problèmes essentiels à résoudre pour le client", class: "Probleme" },
+  { projectId: 1, title: 2, title_text: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },
+  { projectId: 1, title: 3, title_text: "3. Valeur", description: "La proposition de valeur", class: "Valeur" },
+  { projectId: 1, title: 4, title_text: "4. Solution", description: "Les solutions proposées", class: "Solution" },
+  { projectId: 1, title: 5, title_text: "5. Avantage", description: "Les avantages concurrentiels", class: "Avantage" },
+  { projectId: 1, title: 6, title_text: "6. Canaux", description: "Les canaux de distribution", class: "Canaux" },
+  { projectId: 1, title: 7, title_text: "7. Indicateurs", description: "Les indicateurs clés de performance", class: "Indicateurs" },
+  { projectId: 1, title: 8, title_text: "8. Coûts", description: "Les coûts associés", class: "Couts" },
+  { projectId: 1, title: 9, title_text: "9. Revenus", description: "Les sources de revenus", class: "Revenus" }
+]);
+
+</script>
+
+<style scoped>
+@import "@/components/canvas/style-project.css";
+
+.canvas {
+  display: grid;
+  grid-template-columns: repeat(10, 1fr);
+  grid-template-rows: repeat(6, 1fr);
+  gap: 10px;
+  padding: 10px;
+  max-width: 1200px;
+  margin: 20px auto;
+  background-color: #fff; 
+  position: relative;
+  height: 80vh;
+  overflow: auto;
+}
+
+.Probleme { grid-column: 1 / 3; grid-row: 1 / 5; padding-top: 20px;}
+.Segments { grid-column: 9 / 11; grid-row: 1 / 5; padding-top: 20px;}
+.Valeur { grid-column: 5 / 7; grid-row: 1 / 5; padding-top: 20px;}
+.Solution { grid-column: 3 / 5; grid-row: 1 / 3; padding-top: 20px;}
+.Avantage { grid-column: 7 / 9; grid-row: 1 / 3; padding-top: 20px;}
+.Canaux { grid-column: 7 / 9; grid-row: 3 / 5; padding-top: 20px;}
+.Indicateurs { grid-column: 3 / 5; grid-row: 3 / 5; padding-top: 20px;}
+.Couts { grid-column: 1 / 6; grid-row: 5 / 7; padding-top: 20px;}
+.Revenus { grid-column: 6 / 11; grid-row: 5 / 7; padding-top: 20px;}
+</style>

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

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

front/MyINPulse-front/src/main.ts

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

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

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

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

@@ -4,14 +4,27 @@ const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
     {
-            path: "/test",
-            name: "test",
+      path: '/test',
+      name: 'test',
       // route level code-splitting
       // this generates a separate chunk (About.[hash].js) for this route
       // which is lazy-loaded when the route is visited.
-            component: () => import("../views/testComponent.vue"),
+      component: () => import('../views/testComponent.vue'),
+    },
+
+    {
+      path: '/',
+      name: 'Admin-main',
+      component: () => import('../views/AdminMain.vue'),
+    },
+
+// route pour les canvas (made by adnane), in fact the two vue apps are separated for now  
+    {
+      path: '/canvas',
+      name: 'canvas',
+      component: () => import('../views/CanvasView.vue'),
     },
   ],
-});
+})
 
 export default router;

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

@@ -65,4 +65,28 @@ function callApi(
         );
 }
 
-export { callApi };
+function postApi(
+    endpoint: string,
+    data: any,
+    onSuccessHandler?: (response: AxiosResponse) => void,
+    onErrorHandler?: (error: AxiosError) => void
+): void {
+    axiosInstance
+        .post(endpoint, data)
+        .then(onSuccessHandler ?? defaultApiSuccessHandler)
+        .catch(onErrorHandler ?? defaultApiErrorHandler);
+}
+
+function deleteApi(
+    endpoint: string,
+    onSuccessHandler?: (response: AxiosResponse) => void,
+    onErrorHandler?: (error: AxiosError) => void
+): void {
+    axiosInstance
+        .delete(endpoint)
+        .then(onSuccessHandler ?? defaultApiSuccessHandler)
+        .catch(onErrorHandler ?? defaultApiErrorHandler);
+}
+
+
+export { callApi, postApi, deleteApi };

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

@@ -0,0 +1,118 @@
+<template>
+    <Header />
+    <error-wrapper></error-wrapper>
+    <div id="container"> 
+      <div id="main">
+          <ProjectComp 
+            v-for="(project, index) in projects" 
+            :key="index"
+            :projectName="project.name"
+            :listName="project.members"
+            :projectLink="project.link"
+          />
+      </div>
+  
+      <Agenda :projectRDV="rendezVous" />
+    </div>
+    
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { callApi } from "@/services/api";
+
+import Header from "../components/HeaderComponent.vue";
+import Agenda from "../components/Agenda.vue";
+import ProjectComp from "../components/ProjectComponent.vue";
+
+
+const PORT = "8081";
+const URI = `http://localhost:${PORT}`;
+
+const projects = ref<{ name: string; link: string; members: string[] }[]>([]);
+
+const fetchProjects = () => {
+  callApi(
+    `${URI}/admin/projects`,
+    async (response) => {
+      console.log(response);
+      const projectList = response.data;
+
+      const projectPromises = projectList.map((project: any) => {
+        return new Promise(async (resolve) => {
+          callApi(
+            `${URI}/shared/projects/entrepreneurs/${project.idProject}`,
+            (memberResponse) => {
+              const members = memberResponse.data.map((m: any) => m.userName);
+              resolve({
+                name: project.projectName,
+                link: `/project/${project.idProject}`,
+                members,
+              });
+            },
+            () => {
+              // Error fetching members, still resolve with empty members
+              resolve({
+                name: project.projectName,
+                link: `/project/${project.idProject}`,
+                members: [],
+              });
+            }
+          );
+        });
+      });
+
+      projects.value = await Promise.all(projectPromises);
+    },
+    (error) => {
+      console.error("Error fetching projects:", error);
+    }
+  );
+};
+
+onMounted(fetchProjects);
+
+
+
+/*const projects = ref([
+  {
+    name: "Projet Alpha",
+    link: "/canvas", // to test
+    members: ["Alice", "Bob", "Charlie"],
+  },
+  {
+    name: "Projet Beta",
+    link: "./canvas", // to test
+    members: ["David", "Eve", "Frank"],
+  },
+]);
+*/
+const rendezVous = ref([
+  { projectName: "Projet Alpha", date: "2025-03-10", lieu: "P106" },
+  { projectName: "Projet Beta", date: "2025-04-15", lieu: "Td10" },
+]);
+
+</script>
+
+<style scoped>
+
+#container {
+    margin: 0;
+    display: grid;
+    grid-template-columns: 3fr 1fr; /* Main body takes 3/4, agenda 1/4 */
+    height: 100vh; /* Full viewport height */
+}
+
+button {
+  padding: 10px 15px;
+  background-color: #007bff;
+  color: white;
+  border: none;
+  cursor: pointer;
+  border-radius: 5px;
+}
+button:hover {
+  background-color: #0056b3;
+}
+
+</style>

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

@@ -0,0 +1,18 @@
+<template>
+    <div>
+      <header>
+        <HeaderCanvas />
+      </header>
+    </div>
+    <div>
+      <h1>Page Canvas</h1>
+      <LeanCanvas />
+    </div>
+</template>
+  
+<script setup lang="ts">
+// @ts-ignore
+import HeaderCanvas from "../components/canvas/HeaderCanvas.vue";
+import LeanCanvas from '../components/canvas/LeanCanvas.vue';
+</script>
+  

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

@@ -15,11 +15,13 @@ import ErrorModal from "@/components/errorModal.vue";
 </template>
 
 <style scoped>
-.error-wrapper {
+
+.error-wrapper{
   position: absolute;
   left: 70%;
-    //background-color: blue;
+  /*background-color: blue;*/
   height: 100%;
   width: 30%;
+
 }
 </style>

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>