fix: conflits

Reviewed-on: #6
Reviewed-by: Theo <tlelez@enseirb-matmeca.fr>
Reviewed-by: adnane <adnane.alami@bordeaux-inp.fr>
Reviewed-by: mohamed_maoulainine <mohamed_maoulainine.maoulainine@bordeaux-inp.fr>

.gitea/workflows/back.yaml

@@ -0,0 +1,18 @@
+name: Format
+
+on: [ push, pull_request ]
+
+jobs:
+
+  formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4 # v2 minimum required
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '21'
+
+      - uses: axel-op/googlejavaformat-action@v3
+        with:
+          args: "--set-exit-if-changed --skip-sorting-imports --skip-reflowing-long-strings --aosp -n"

.gitea/workflows/build-back.yaml

@@ -0,0 +1,33 @@
+name: Build
+
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+
+    - name: Load .env file
+      uses: xom9ikk/dotenv@v2.3.0
+      with:
+        path: ./config/
+        mode: dev
+        load-mode: strict
+
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 21
+    
+    - name: Setup Gradle
+      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 

.gitea/workflows/front.yaml

@@ -0,0 +1,24 @@
+name: CI
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install everything
+        working-directory: ./front/MyINPulse-front
+        run: npm i
+      
+      - name: Run ESLint
+        working-directory: ./front/MyINPulse-front
+        run: npx eslint
+
+      - name: Run prettier
+        working-directory: ./front/MyINPulse-front
+        run: npx prettier src --check
+
+      - name: Build frontend
+        working-directory: ./front/MyINPulse-front
+        run: npm run build

.gitignore

@@ -2,3 +2,4 @@
 .idea
 keycloak/CAS/target
 docker-compose.yaml
+postgres/data

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

@@ -1,13 +1,16 @@
 help:
-	@echo "make [clean dev-front prod dev-back]"
+	@echo "make [clean dev-front prod dev-back dev]"
 
 clean: 
+	@cp config/frontdev.env front/MyINPulse-front/.env
+	@cp config/frontdev.env .env
+	@cp config/frontdev.env MyINPulse-back/.env
 	@cp config/prod.docker-compose.yaml docker-compose.yaml
 	@docker compose down
 	@rm -f docker-compose.yaml
 	@rm -f .env
 	@rm -f front/MyINPulse-front/.env
-
+	@rm -f MyINPulse-back/.env
 
 # Install npm packages
 front/MyINPulse-front/.installed:
@@ -16,26 +19,58 @@ front/MyINPulse-front/.installed:
 
 vite: ./front/MyINPulse-front/.installed
 
+keycloak: ./keycloak/.installed
 
-dev-front: clean vite
-	@cp config/frontdev.front.env front/MyINPulse-front/.env
-	@cp config/frontdev.main.env .env
+keycloak/.installed:
+	@echo "running one time install"
+	@cd keycloak/CAS && sudo sh build.sh
+	@touch ./keycloak/.installed
+
+dev-front: clean vite keycloak
+	@cp config/frontdev.env front/MyINPulse-front/.env
+	@cp config/frontdev.env .env
+	@cp config/frontdev.env MyINPulse-back/.env
 	@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
-	@cp config/prod.front.env front/MyINPulse-front/.env
-	@cp config/prod.main.env .env
-	@cp config/frontdev.docker-compose.yaml docker-compose.yaml
+prod: clean keycloak
+	@cp config/prod.env front/MyINPulse-front/.env
+	@cp config/prod.env .env
+	@cp config/prod.env .env
+	@cp config/prod.docker-compose.yaml docker-compose.yaml
 	@docker compose up -d --build
 	
 
 
-dev-back:
-	@cp config/backdev.front.env front/MyINPulse-front/.env
-	@cp config/backdev.main.env .env
+
+dev-back: keycloak
+	@cp config/backdev.env front/MyINPulse-front/.env
+	@cp config/backdev.env .env
+	@cp config/backdev.env MyINPulse-back/.env
 	@cp config/backdev.docker-compose.yaml docker-compose.yaml
 	@docker compose up -d --build
-	@echo "cd MyINPulse-back"
+	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
 	@echo "./gradlew bootRun --args='--server.port=8081'"
+	
+dev: clean vite keycloak
+	@cp config/dev.env front/MyINPulse-front/.env
+	@cp config/dev.env .env
+	@cp config/dev.env MyINPulse-back/.env
+	@cp config/dev.docker-compose.yaml docker-compose.yaml
+	@docker compose up -d --build
+	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
+	@echo "./gradlew bootRun --args='--server.port=8081'"
+	@cd ./front/MyINPulse-front/ && npm run dev &
+
+test-back: clean keycloak
+	@cp config/dev.env front/MyINPulse-front/.env
+	@cp config/dev.env .env
+	@cp config/dev.env MyINPulse-back/.env
+	@cp config/dev.docker-compose.yaml docker-compose.yaml
+	@docker compose up -d --build
+	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
+	@cd ./MyINPulse-back/ && ./gradlew test && ./gradlew jacocoTestReport
+	@firefox ./MyINPulse-back/build/jacocoHtml/index.html

MyINPulse-back/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.4.2'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'jacoco'
 }
 
 group = 'enseirb'
@@ -20,10 +21,39 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-data-rest'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+    implementation 'org.postgresql:postgresql'
+    implementation group: 'com.itextpdf', name: 'itextpdf', version: '5.5.13.3'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.h2database:h2'
+
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+
+test {
+    finalizedBy jacocoTestReport // report is always generated after tests run
+}
+jacocoTestReport {
+    dependsOn test // tests are required to run before generating the report
+    reports {
+        xml.required = false
+        csv.required = false
+        html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
+    }
+}
+
+
+jacoco {
+    toolVersion = "0.8.12"
+    reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir')
+}

MyINPulse-back/src/main/java/enseirb/myinpulse/MyinpulseApplication.java

@@ -1,22 +1,10 @@
 package enseirb.myinpulse;
 
-import enseirb.myinpulse.security.KeycloakJwtRolesConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.oauth2.jwt.*;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
 
 @SpringBootApplication
 public class MyinpulseApplication {
@@ -24,6 +12,4 @@ public class MyinpulseApplication {
     public static void main(String[] args) {
         SpringApplication.run(MyinpulseApplication.class, args);
     }
-
-
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/api/GetUserInfo.java

@@ -1,43 +0,0 @@
-package enseirb.myinpulse.api;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.CrossOrigin;
-
-import java.security.Principal;
-
-@SpringBootApplication
-@RestController
-public class GetUserInfo {
-    // TODO: understand how to get data
-    @GetMapping("/getUserInfo")
-    public Object user(Principal principal) {
-        System.out.println("GetUserInfo + " + principal);
-        System.out.println(SecurityContextHolder.getContext().getAuthentication());
-        return SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-    }
-
-    @CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
-    @GetMapping("/random")
-    public boolean rand(){
-        System.err.println("HELLO");
-        return Math.random() > 0.5;
-    }
-
-    @CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
-    @GetMapping("/random2")
-    public boolean rand2(){
-        System.err.println("HELLO2");
-        return Math.random() > 0.5;
-    }
-
-    @CrossOrigin(methods = {RequestMethod.GET, RequestMethod.OPTIONS})
-    @GetMapping("/random3")
-    public boolean rand3(){
-        System.err.println("HELLO");
-        return Math.random() > 0.5;
-    }
-}

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

@@ -0,0 +1,107 @@
+/*
+ * Source: https://github.com/ChristianHuff-DEV/secure-spring-rest-api-using-keycloak/blob/main/src/main/java/io/betweendata/RestApi/security/oauth2/KeycloakJwtRolesConverter.java
+ * edited by Pierre Tellier
+ */
+package enseirb.myinpulse.config;
+
+import static java.util.stream.Collectors.toSet;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.jwt.Jwt;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class KeycloakJwtRolesConverter implements Converter<Jwt, AbstractAuthenticationToken> {
+    /** Prefix used for realm level roles. */
+    public static final String PREFIX_REALM_ROLE = "ROLE_REALM_";
+
+    /** Prefix used in combination with the resource (client) name for resource level roles. */
+    public static final String PREFIX_RESOURCE_ROLE = "ROLE_";
+
+    /** Name of the claim containing the realm level roles */
+    private static final String CLAIM_REALM_ACCESS = "realm_access";
+
+    /** Name of the claim containing the resources (clients) the user has access to. */
+    private static final String CLAIM_RESOURCE_ACCESS = "resource_access";
+
+    /** Name of the claim containing roles. (Applicable to realm and resource level.) */
+    private static final String CLAIM_ROLES = "roles";
+
+    @Override
+    public AbstractAuthenticationToken convert(Jwt source) {
+        return new JwtAuthenticationToken(
+                source,
+                Stream.concat(
+                                new JwtGrantedAuthoritiesConverter().convert(source).stream(),
+                                tokenRolesExtractor(source).stream())
+                        .collect(toSet()));
+    }
+
+    /**
+     * Extracts the realm and resource level roles from a JWT token distinguishing between them
+     * using prefixes.
+     */
+    public Collection<GrantedAuthority> tokenRolesExtractor(Jwt jwt) {
+        // Collection that will hold the extracted roles
+        Collection<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+
+        // Realm roles
+        // Get the part of the access token that holds the roles assigned on realm level
+        Map<String, Collection<String>> realmAccess = jwt.getClaim(CLAIM_REALM_ACCESS);
+
+        // Verify that the claim exists and is not empty
+        if (realmAccess != null && !realmAccess.isEmpty()) {
+            // From the realm_access claim get the roles
+            Collection<String> roles = realmAccess.get(CLAIM_ROLES);
+            // Check if any roles are present
+            if (roles != null && !roles.isEmpty()) {
+                // Iterate of the roles and add them to the granted authorities
+                Collection<GrantedAuthority> realmRoles =
+                        roles.stream()
+                                // Prefix all realm roles with "ROLE_realm_"
+                                .map(role -> new SimpleGrantedAuthority(PREFIX_REALM_ROLE + role))
+                                .collect(Collectors.toList());
+                grantedAuthorities.addAll(realmRoles);
+            }
+        }
+
+        // Resource (client) roles
+        // A user might have access to multiple resources all containing their own roles. Therefore,
+        // it is a map of
+        // resource each possibly containing a "roles" property.
+        Map<String, Map<String, Collection<String>>> resourceAccess =
+                jwt.getClaim(CLAIM_RESOURCE_ACCESS);
+
+        // Check if resources are assigned
+        if (resourceAccess != null && !resourceAccess.isEmpty()) {
+            // Iterate of all the resources
+            resourceAccess.forEach(
+                    (resource, resourceClaims) -> {
+                        // Iterate of the "roles" claim inside the resource claims
+                        resourceClaims
+                                .get(CLAIM_ROLES)
+                                .forEach(
+                                        // Add the role to the granted authority prefixed with ROLE_
+                                        // and the name of the resource
+                                        role ->
+                                                grantedAuthorities.add(
+                                                        new SimpleGrantedAuthority(
+                                                                PREFIX_RESOURCE_ROLE
+                                                                        + resource
+                                                                        + "_"
+                                                                        + role)));
+                    });
+        }
+
+        return grantedAuthorities;
+    }
+}

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

@@ -1,6 +1,8 @@
 package enseirb.myinpulse.config;
 
-import enseirb.myinpulse.security.KeycloakJwtRolesConverter;
+import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
+
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -12,39 +14,62 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.springframework.security.authorization.AuthorityAuthorizationManager.hasRole;
-
 @Configuration
 public class WebSecurityCustomConfiguration {
     // CORS configuration
-    // TODO: make sure to only accept our own domains
+
+    @Value("${VITE_APP_URL}")
+    private String frontendUrl;
+
+    /**
+     * Configure the CORS (Cross Origin Ressource Sharing -- a security feature) configuration. The
+     * only allowed website is the frontend, defined in the .env file.
+     *
+     * @return the CORS configuration used by the backend
+     */
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(List.of("*"));
+        configuration.setAllowedOrigins(List.of(frontendUrl));
         configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS"));
-        configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type",
-                "x-auth-token")); // Do not remove, this fixes the CORS errors when unauthenticated
-        UrlBasedCorsConfigurationSource source = new
-                UrlBasedCorsConfigurationSource();
+        configuration.setAllowedHeaders(
+                Arrays.asList("authorization", "content-type", "x-auth-token"));
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", configuration);
 
         return source;
     }
 
+    /**
+     * Configure the authorisation required for each path.
+     *
+     * <p>admin endpoints are under /admin/* and entrepreneur are under /entrepreneur/*
+     *
+     * <p>If endpoints dont require authentication, they are under /unauth/
+     *
+     * @param http automatically filled in by spring.
+     * @return a securityfilterchain, automatically used by spring.
+     * @throws Exception TODO: figure out when the exception are raised
+     */
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http
-                .authorizeHttpRequests(authorize -> authorize
-                        .requestMatchers("/random2").access(hasRole("REALM_MyINPulse-entrepreneur"))
-                        .requestMatchers("/random").access(hasRole("REALM_MyINPulse-admin"))
-                        .requestMatchers("/random3").permitAll()
-                        .anyRequest().authenticated()
-                )
-                .oauth2ResourceServer(oauth2 -> oauth2
-                        .jwt(jwt -> jwt.
-                                jwtAuthenticationConverter(new KeycloakJwtRolesConverter())));
+        http.authorizeHttpRequests(
+                        authorize ->
+                                authorize
+                                        .requestMatchers("/entrepreneur/**", "/shared/**")
+                                        .access(hasRole("REALM_MyINPulse-entrepreneur"))
+                                        .requestMatchers("/admin/**", "/shared/**")
+                                        .access(hasRole("REALM_MyINPulse-admin"))
+                                        .requestMatchers("/unauth/**")
+                                        .permitAll()
+                                        .anyRequest()
+                                        .authenticated())
+                .oauth2ResourceServer(
+                        oauth2 ->
+                                oauth2.jwt(
+                                        jwt ->
+                                                jwt.jwtAuthenticationConverter(
+                                                        new KeycloakJwtRolesConverter())));
         return http.build();
-
     }
 }

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

@@ -0,0 +1,102 @@
+package enseirb.myinpulse.controller;
+
+import enseirb.myinpulse.model.*;
+import enseirb.myinpulse.service.AdminApiService;
+
+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 AdminApi {
+
+    private final AdminApiService adminApiService;
+
+    @Autowired
+    AdminApi(AdminApiService adminApiService) {
+        this.adminApiService = adminApiService;
+    }
+
+    /**
+     * TODO: description
+     *
+     * @return a list of all project managed by the current admin user
+     */
+    @GetMapping("/admin/projects")
+    public Iterable<Project> getProjects(@AuthenticationPrincipal Jwt principal) {
+        return adminApiService.getProjectsOfAdmin(principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: Why in admin instead of shared ? + desc
+     *
+     * @return a list of upcoming appointments for the current user
+     */
+    @GetMapping("/admin/appointments/upcoming")
+    public Iterable<Appointment> getUpcomingAppointments(@AuthenticationPrincipal Jwt principal) {
+        return adminApiService.getUpcomingAppointments(principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: description
+     *
+     * @return a list of current unvalidated projects, waiting to be accepted
+     */
+    @GetMapping("/admin/projects/pending")
+    public Iterable<Project> getPendingProjects() {
+        return adminApiService.getPendingProjects();
+    }
+
+    /**
+     * Endpoint used to make a decision about a project.
+     *
+     * <p>The decision must contain the administrator
+     *
+     * @return the status code of the request
+     */
+    @PostMapping("/admin/projects/decision")
+    public void validateProject(@RequestBody ProjectDecision decision) {
+        adminApiService.validateProject(decision);
+    }
+
+    /**
+     * Endpoint used to manually add a project by an admin
+     *
+     * @return the status code of the request
+     */
+    @PostMapping("/admin/project/add")
+    public void addNewProject(@RequestBody Project project) {
+        adminApiService.addNewProject(project);
+    }
+
+    /**
+     * TODO: shouldn't it be an PUT request ? / What is the rerun type
+     *
+     * <p>Endpoint used to add a new report to an appointment
+     *
+     * @return the status code of the request
+     */
+    @PostMapping("/admin/appoitements/report/{appointmentId}")
+    public void createAppointmentReport(
+            @PathVariable long appointmentId,
+            @RequestBody Report report,
+            @AuthenticationPrincipal Jwt principal) {
+        adminApiService.createAppointmentReport(
+                appointmentId, report, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: Shouldn't a project be kept in history ? 2 different endpoints ?
+     *
+     * <p>Endpoint used to completely remove a project.
+     *
+     * @return the status code of the request
+     */
+    @DeleteMapping("/admin/projects/remove/{projectId}")
+    public void deleteProject(@PathVariable long projectId) {
+        adminApiService.deleteProject(projectId);
+    }
+}

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

@@ -0,0 +1,78 @@
+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.*;
+
+@SpringBootApplication
+@RestController
+public class EntrepreneurApi {
+
+    private final EntrepreneurApiService entrepreneurApiService;
+
+    @Autowired
+    EntrepreneurApi(EntrepreneurApiService entrepreneurApiService) {
+        this.entrepreneurApiService = entrepreneurApiService;
+    }
+
+    /**
+     * TODO: check return type
+     *
+     * <p>Endpoint used to update a LC section.
+     *
+     * @return status code
+     */
+    @PutMapping("/entrepreneur/lcsection/modify/{sectionId}")
+    public void editSectionCell(
+            @PathVariable Long sectionId,
+            @RequestBody SectionCell sectionCell,
+            @AuthenticationPrincipal Jwt principal) {
+        entrepreneurApiService.editSectionCell(
+                sectionId, sectionCell, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: checkReturn Type
+     *
+     * <p>Endpoint used to delete a LC section
+     *
+     * @return status code
+     */
+    @DeleteMapping("/entrepreneur/lcsection/remove/{sectionId}")
+    public void removeSectionCell(
+            @PathVariable Long sectionId, @AuthenticationPrincipal Jwt principal) {
+        entrepreneurApiService.removeSectionCell(sectionId, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: check return type
+     *
+     * <p>Endpoint used to create a new LC section
+     *
+     * @return status code
+     */
+    @PostMapping("/entrepreneur/lcsection/add") // remove id from doc aswell
+    public void addLCSection(
+            @RequestBody SectionCell sectionCell, @AuthenticationPrincipal Jwt principal) {
+        entrepreneurApiService.addSectionCell(sectionCell, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * TODO: check return type
+     *
+     * <p>Endpoint used to request the creation of a new project
+     *
+     * @return status code
+     */
+    @PostMapping("/entrepreneur/project/request")
+    public void requestNewProject(
+            @RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
+        entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));
+    }
+}

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

@@ -0,0 +1,105 @@
+package enseirb.myinpulse.controller;
+
+import com.itextpdf.text.DocumentException;
+
+import enseirb.myinpulse.model.*;
+import enseirb.myinpulse.service.SharedApiService;
+
+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.*;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+@SpringBootApplication
+@RestController
+public class SharedApi {
+
+    private final SharedApiService sharedApiService;
+
+    @Autowired
+    SharedApi(SharedApiService sharedApiService) {
+        this.sharedApiService = sharedApiService;
+    }
+
+    /**
+     * Endpoint used to get the data inside the lean canvas
+     *
+     * @return a list of lean canvas sections
+     */
+    @GetMapping("/shared/project/lcsection/{projectId}/{sectionId}/{date}")
+    public Iterable<SectionCell> getLCSection(
+            @PathVariable("projectId") Long projectId,
+            @PathVariable("sectionId") Long sectionId,
+            @PathVariable("date") String date,
+            @AuthenticationPrincipal Jwt principal) {
+        return sharedApiService.getSectionCells(
+                projectId, sectionId, date, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * Endpoint used to get entrepreneurs details
+     *
+     * @return a list of all entrepreneurs in a project
+     */
+    @GetMapping("/shared/entrepreneurs/{projectId}")
+    public Iterable<Entrepreneur> getEntrepreneursByProjectId(
+            @PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
+        return sharedApiService.getEntrepreneursByProjectId(
+                projectId, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * Endpoint used to get the administrator of a project.
+     *
+     * @return the admin of a project
+     */
+    @GetMapping("/shared/projects/admin/{projectId}")
+    public Administrator getAdminByProjectId(
+            @PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
+        return sharedApiService.getAdminByProjectId(projectId, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * Endpoint used to get all appointments of a single project.
+     *
+     * @return a list of all appointments.
+     */
+    @GetMapping("/shared/projects/appointments/{projectId}")
+    public Iterable<Appointment> getAppointmentsByProjectId(
+            @PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
+        return sharedApiService.getAppointmentsByProjectId(
+                projectId, principal.getClaimAsString("email"));
+    }
+
+    /**
+     * Endpoint used to generate a PDF report
+     *
+     * @return a PDF file? TODO: how does that works ?
+     */
+    @GetMapping("/shared/projects/appointments/report/{appointmentId}")
+    public void getPDFReport(
+            @PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
+        try {
+            sharedApiService.getPDFReport(appointmentId, principal.getClaimAsString("email"));
+        } catch (DocumentException e) {
+            System.out.println(e + "Document exception");
+        } catch (URISyntaxException e) {
+            System.out.println(e + "Error with URI");
+        } catch (IOException e) {
+            System.out.println(e + "Failed to access file");
+        }
+    }
+
+    /**
+     * @return TODO
+     */
+    @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/exception/RoleNotFoudException.java

@@ -0,0 +1,7 @@
+package enseirb.myinpulse.exception;
+
+public class RoleNotFoudException extends RuntimeException {
+    public RoleNotFoudException(String message) {
+        super(message);
+    }
+}

MyINPulse-back/src/main/java/enseirb/myinpulse/exception/UserNotFoundException.java

@@ -0,0 +1,7 @@
+package enseirb.myinpulse.exception;
+
+public class UserNotFoundException extends RuntimeException {
+    public UserNotFoundException(String message) {
+        super(message);
+    }
+}

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

@@ -0,0 +1,66 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "administrator")
+@PrimaryKeyJoinColumn(name = "idAdministrator", referencedColumnName = "idUser")
+public class Administrator extends User {
+
+    @OneToMany(mappedBy = "projectAdministrator", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Project> listProject = new ArrayList<>();
+
+    /*@OneToMany(mappedBy = "administratorSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
+    private List<SectionCell> listSectionCell = new ArrayList<>();*/
+    // should now be useless
+
+    @OneToMany(mappedBy = "administratorAnnotation", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Annotation> listAnnotation = new ArrayList<>();
+
+    /*@OneToMany(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Appointment> listAppointment = new ArrayList<>();*/
+    // should now be useless
+
+    @OneToOne(mappedBy = "administratorAppointment", fetch = FetchType.LAZY, orphanRemoval = true)
+    private MakeAppointment makeAppointment;
+
+    public Administrator() {}
+
+    public Administrator(
+            String userSurname,
+            String username,
+            String primaryMail,
+            String secondaryMail,
+            String phoneNumber) {
+        super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber);
+    }
+
+    public List<Project> getListProject() {
+        return listProject;
+    }
+
+    public void updateListProject(Project project) {
+        listProject.add(project);
+    }
+
+    public List<Annotation> getListAnnotation() {
+        return listAnnotation;
+    }
+
+    public void updateListAnnotation(Annotation annotation) {
+        listAnnotation.add(annotation);
+    }
+
+    public MakeAppointment getMakeAppointment() {
+        return makeAppointment;
+    }
+
+    public void setMakeAppointment(MakeAppointment makeAppointment) {
+        this.makeAppointment = makeAppointment;
+    }
+}

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

@@ -0,0 +1,61 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "annotation")
+public class Annotation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idAnnotation;
+
+    private String comment;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idSectionCell")
+    private SectionCell sectionCellAnnotation;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAdministrator")
+    private Administrator administratorAnnotation;
+
+    public Annotation() {}
+
+    public Annotation(Long idAnnotation, String commentary) {
+        this.idAnnotation = idAnnotation;
+        this.comment = comment;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public Long getIdAnnotation() {
+        return idAnnotation;
+    }
+
+    public void setIdAnnotation(Long idAnnotation) {
+        this.idAnnotation = idAnnotation;
+    }
+
+    public SectionCell getSectionCellAnnotation() {
+        return sectionCellAnnotation;
+    }
+
+    public void setSectionCellAnnotation(SectionCell sectionCellAnnotation) {
+        this.sectionCellAnnotation = sectionCellAnnotation;
+    }
+
+    public Administrator getAdministratorAnnotation() {
+        return administratorAnnotation;
+    }
+
+    public void setAdministratorAnnotation(Administrator administratorAnnotation) {
+        this.administratorAnnotation = administratorAnnotation;
+    }
+}

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

@@ -0,0 +1,126 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "appointment")
+public class Appointment {
+
+    /*@OneToMany(mappedBy = "appointmentEntrepreneurs", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Entrepreneur> listEntrepreneur =
+            new ArrayList<>(); */
+    // should now be useless
+
+    @ManyToMany(
+            fetch = FetchType.LAZY,
+            cascade = {CascadeType.ALL})
+    @JoinTable(
+            name = "concern",
+            joinColumns = @JoinColumn(name = "idAppointment"),
+            inverseJoinColumns = @JoinColumn(name = "idSectionCell"))
+    List<SectionCell> listSectionCell = new ArrayList<>();
+
+    @OneToOne(mappedBy = "appointmentReport", fetch = FetchType.LAZY, orphanRemoval = true)
+    private Report report;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idAppointment;
+
+    private LocalDate appointmentDate;
+
+    private LocalTime appointmentTime;
+
+    private LocalTime appointmentDuration;
+
+    @Column(length = 255)
+    private String appointmentPlace;
+
+    private String appointmentSubject;
+
+    public Appointment() {}
+
+    public Appointment(
+            Long idAppointment,
+            LocalDate appointmentDate,
+            LocalTime appointmentTime,
+            LocalTime appointmentDuration,
+            String appointmentPlace,
+            String appointmentSubject) {
+        this.idAppointment = idAppointment;
+        this.appointmentDate = appointmentDate;
+        this.appointmentTime = appointmentTime;
+        this.appointmentDuration = appointmentDuration;
+        this.appointmentPlace = appointmentPlace;
+        this.appointmentSubject = appointmentSubject;
+    }
+
+    public Long getIdAppointment() {
+        return idAppointment;
+    }
+
+    public void setIdAppointment(Long idAppointment) {
+        this.idAppointment = idAppointment;
+    }
+
+    public LocalDate getAppointmentDate() {
+        return appointmentDate;
+    }
+
+    public void setAppointmentDate(LocalDate appointmentDate) {
+        this.appointmentDate = appointmentDate;
+    }
+
+    public LocalTime getAppointmentTime() {
+        return appointmentTime;
+    }
+
+    public void setAppointmentTime(LocalTime appointmentTime) {
+        this.appointmentTime = appointmentTime;
+    }
+
+    public LocalTime getAppointmentDuration() {
+        return appointmentDuration;
+    }
+
+    public void setAppointmentDuration(LocalTime appointmentDuration) {
+        this.appointmentDuration = appointmentDuration;
+    }
+
+    public String getAppointmentPlace() {
+        return appointmentPlace;
+    }
+
+    public void setAppointmentPlace(String appointmentPlace) {
+        this.appointmentPlace = appointmentPlace;
+    }
+
+    public String getAppointmentSubject() {
+        return appointmentSubject;
+    }
+
+    public void setAppointmentSubject(String appointmentSubject) {
+        this.appointmentSubject = appointmentSubject;
+    }
+
+    public List<SectionCell> getAppointmentListSectionCell() {
+        return listSectionCell;
+    }
+
+    public void updateListSectionCell(SectionCell sectionCell) {
+        listSectionCell.add(sectionCell);
+    }
+
+    public Report getAppointmentReport() {
+        return report;
+    }
+
+    public void setAppointmentReport(Report report) {
+        this.report = report;
+    }
+}

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

@@ -0,0 +1,123 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "entrepreneur")
+@PrimaryKeyJoinColumn(name = "idEntrepreneur", referencedColumnName = "idUser")
+public class Entrepreneur extends User {
+
+    @Column(length = 255)
+    private String school;
+
+    @Column(length = 255)
+    private String course;
+
+    private boolean sneeStatus;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idProjectParticipation", referencedColumnName = "idProject")
+    private Project projectParticipation;
+
+    // @Column(insertable=false, updatable=false)
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idProjectProposed", referencedColumnName = "idProject")
+    private Project projectProposed;
+
+    /*@ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAppointment")
+    private Appointment appointmentEntrepreneur;*/
+    // should now be useless
+
+    @OneToOne(mappedBy = "entrepreneurAppointment", fetch = FetchType.LAZY, orphanRemoval = true)
+    private MakeAppointment makeAppointment;
+
+    public Entrepreneur() {}
+
+    public Entrepreneur(
+            String userSurname,
+            String username,
+            String primaryMail,
+            String secondaryMail,
+            String phoneNumber,
+            String school,
+            String course,
+            boolean sneeStatus) {
+        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,
+            String secondaryMail,
+            String phoneNumber,
+            String school,
+            String course,
+            boolean sneeStatus,
+            Project projectParticipation,
+            Project projectProposed,
+            MakeAppointment makeAppointment) {
+        super(idUser, userSurname, userName, primaryMail, secondaryMail, phoneNumber);
+        this.school = school;
+        this.course = course;
+        this.sneeStatus = sneeStatus;
+        this.projectParticipation = projectParticipation;
+        this.projectProposed = projectProposed;
+        this.makeAppointment = makeAppointment;
+    }
+
+    public String getSchool() {
+        return school;
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    public String getCourse() {
+        return course;
+    }
+
+    public void setCourse(String course) {
+        this.course = course;
+    }
+
+    public boolean isSneeStatus() {
+        return sneeStatus;
+    }
+
+    public void setSneeStatus(boolean statusSnee) {
+        this.sneeStatus = sneeStatus;
+    }
+
+    public Project getProjectParticipation() {
+        return projectParticipation;
+    }
+
+    public void setProjectParticipation(Project projectParticipation) {
+        this.projectParticipation = projectParticipation;
+    }
+
+    public Project getProjectProposed() {
+        return projectProposed;
+    }
+
+    public void setProjectProposed(Project projectProposed) {
+        this.projectProposed = projectProposed;
+    }
+
+    public MakeAppointment getMakeAppointment() {
+        return makeAppointment;
+    }
+
+    public void setMakeAppointment(MakeAppointment makeAppointment) {
+        this.makeAppointment = makeAppointment;
+    }
+}

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

@@ -0,0 +1,26 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "make_appointment")
+public class MakeAppointment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idMakeAppointment;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAdministrator")
+    private Administrator administratorAppointment;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idEntrepreneur")
+    private Entrepreneur entrepreneurAppointment;
+
+    public MakeAppointment() {}
+
+    public MakeAppointment(Long idMakeAppointment) {
+        this.idMakeAppointment = idMakeAppointment;
+    }
+}

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

@@ -0,0 +1,140 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "project")
+public class Project {
+
+    @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Entrepreneur> listEntrepreneurParticipation = new ArrayList<>();
+
+    @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<SectionCell> listSectionCell = new ArrayList<>();
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idProject;
+
+    @Column(length = 255)
+    private String projectName;
+
+    private byte[] logo;
+    private LocalDate creationDate;
+
+    @Column private ProjectDecisionValue projectStatus;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAdministrator")
+    private Administrator projectAdministrator;
+
+    @OneToOne(mappedBy = "projectProposed", fetch = FetchType.LAZY, orphanRemoval = true)
+    private Entrepreneur entrepreneurProposed;
+
+    public Project() {}
+
+    public Project(
+            String projectName,
+            byte[] logo,
+            LocalDate creationDate,
+            ProjectDecisionValue projectStatus,
+            Administrator projectAdministrator) {
+        this.projectName = projectName;
+        this.logo = logo;
+        this.creationDate = creationDate;
+        // this.projectStatus = (long) projectStatus.ordinal();
+        this.projectStatus = projectStatus;
+        this.projectAdministrator = projectAdministrator;
+    }
+
+    public Project(
+            String projectName,
+            byte[] logo,
+            LocalDate creationDate,
+            ProjectDecisionValue projectStatus,
+            Administrator projectAdministrator,
+            Entrepreneur entrepreneurProposed) {
+        this.projectName = projectName;
+        this.logo = logo;
+        this.creationDate = creationDate;
+        this.projectStatus = projectStatus;
+        this.projectAdministrator = projectAdministrator;
+        this.entrepreneurProposed = entrepreneurProposed;
+    }
+
+    public Long getIdProject() {
+        return idProject;
+    }
+
+    public void setIdProject(Long idProject) {
+        this.idProject = idProject;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public byte[] getLogo() {
+        return logo;
+    }
+
+    public void setLogo(byte[] logo) {
+        this.logo = logo;
+    }
+
+    public LocalDate getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(LocalDate creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    public ProjectDecisionValue getProjectStatus() {
+        return projectStatus;
+    }
+
+    public void setProjectStatus(ProjectDecisionValue projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+
+    public List<Entrepreneur> getListEntrepreneurParticipation() {
+        return listEntrepreneurParticipation;
+    }
+
+    public void updateListEntrepreneurParticipation(Entrepreneur projectParticipant) {
+        listEntrepreneurParticipation.add(projectParticipant);
+    }
+
+    public List<SectionCell> getListSectionCell() {
+        return listSectionCell;
+    }
+
+    public void updateListSectionCell(SectionCell projectSectionCell) {
+        listSectionCell.add(projectSectionCell);
+    }
+
+    public Administrator getProjectAdministrator() {
+        return projectAdministrator;
+    }
+
+    public void setProjectAdministrator(Administrator projectAdministrator) {
+        this.projectAdministrator = projectAdministrator;
+    }
+
+    public Entrepreneur getEntrepreneurProposed() {
+        return entrepreneurProposed;
+    }
+
+    public void setEntrepreneurProposed(Entrepreneur entrepreneurProposed) {
+        this.entrepreneurProposed = entrepreneurProposed;
+    }
+}

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

@@ -0,0 +1,25 @@
+package enseirb.myinpulse.model;
+
+public class ProjectDecision {
+    public long projectId;
+    public long adminId;
+    public long isAccepted;
+
+    public ProjectDecision(long projectId, long adminId, long isAccepted) {
+        this.projectId = projectId;
+        this.adminId = adminId;
+        this.isAccepted = isAccepted;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectDecision{"
+                + "projectId="
+                + projectId
+                + ", adminId="
+                + adminId
+                + ", isAccepted="
+                + isAccepted
+                + '}';
+    }
+}

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.model;
+
+public enum ProjectDecisionValue {
+    PENDING,
+    ACTIVE,
+    ENDED,
+    ABORTED,
+    REJECTED,
+}

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

@@ -0,0 +1,48 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "report")
+public class Report {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idReport;
+
+    private String reportContent;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAppointment")
+    private Appointment appointmentReport;
+
+    public Report() {}
+
+    public Report(Long idReport, String reportContent) {
+        this.idReport = idReport;
+        this.reportContent = reportContent;
+    }
+
+    public Long getIdReport() {
+        return idReport;
+    }
+
+    public String getReportContent() {
+        return reportContent;
+    }
+
+    public void setReportContent(String reportContent) {
+        this.reportContent = reportContent;
+    }
+
+    public Appointment getAppointmentReport() {
+        return appointmentReport;
+    }
+
+    public void setAppointmentReport(Appointment appointmentReport) {
+        this.appointmentReport = appointmentReport;
+    }
+}

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

@@ -0,0 +1,7 @@
+package enseirb.myinpulse.model;
+
+public class RoleRepresentation {
+    public String id;
+    public String name;
+    public String description;
+}

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

@@ -0,0 +1,110 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "section_cell")
+public class SectionCell {
+
+    @ManyToMany(mappedBy = "listSectionCell")
+    private final List<Appointment> listAppointment = new ArrayList<>();
+
+    @OneToMany(mappedBy = "sectionCellAnnotation", fetch = FetchType.LAZY, orphanRemoval = true)
+    private final List<Annotation> listAnnotation = new ArrayList<>();
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idSectionCell;
+
+    @Column() private long sectionId;
+    private String contentSectionCell;
+
+    /*@ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idAdministrator")
+    private Administrator administratorSectionCell;*/
+    // should now be useless
+    private LocalDateTime modificationDate;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "idProject")
+    private Project projectSectionCell;
+
+    public SectionCell() {}
+
+    public SectionCell(
+            Long idSectionCell,
+            Long sectionId,
+            String contentSectionCell,
+            LocalDateTime modificationDate,
+            Project projectSectionCell) {
+        this.idSectionCell = idSectionCell;
+        this.sectionId = sectionId;
+        this.contentSectionCell = contentSectionCell;
+        this.modificationDate = modificationDate;
+        this.projectSectionCell = projectSectionCell;
+    }
+
+    public Long getIdSectionCell() {
+        return idSectionCell;
+    }
+
+    public void setIdSectionCell(Long idSectionCell) {
+        this.idSectionCell = idSectionCell;
+    }
+
+    public Long getSectionId() {
+        return sectionId;
+    }
+
+    public void setSectionId(Long sectionId) {
+        this.sectionId = sectionId;
+    }
+
+    public String getContentSectionCell() {
+        return contentSectionCell;
+    }
+
+    public void setContentSectionCell(String contentSectionCell) {
+        this.contentSectionCell = contentSectionCell;
+    }
+
+    public LocalDateTime getModificationDate() {
+        return modificationDate;
+    }
+
+    public void setModificationDate(LocalDateTime modificationDate) {
+        this.modificationDate = modificationDate;
+    }
+
+    public Project getProjectSectionCell() {
+        return projectSectionCell;
+    }
+
+    public List<Appointment> getAppointmentSectionCell() {
+        return listAppointment;
+    }
+
+    public void updateAppointmentSectionCell(Appointment appointment) {
+        listAppointment.add(appointment);
+    }
+
+    public List<Annotation> getListAnnotation() {
+        return listAnnotation;
+    }
+
+    public void updateListAnnotation(Annotation annotation) {
+        listAnnotation.add(annotation);
+    }
+
+    public void setSectionId(long sectionId) {
+        this.sectionId = sectionId;
+    }
+
+    public void setProjectSectionCell(Project projectSectionCell) {
+        this.projectSectionCell = projectSectionCell;
+    }
+}

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

@@ -0,0 +1,108 @@
+package enseirb.myinpulse.model;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "user_inpulse")
+@Inheritance(strategy = InheritanceType.JOINED)
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idUser;
+
+    @Column(length = 255)
+    private String userSurname;
+
+    @Column(length = 255)
+    private String userName;
+
+    @Column(length = 255)
+    private String primaryMail;
+
+    @Column(length = 255)
+    private String secondaryMail;
+
+    @Column(length = 20)
+    private String phoneNumber;
+
+    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) {
+        this.userSurname = userSurname;
+        this.userName = userName;
+        this.primaryMail = primaryMail;
+        this.secondaryMail = secondaryMail;
+        this.phoneNumber = phoneNumber;
+    }
+
+    public Long getIdUser() {
+        return idUser;
+    }
+
+    public void setIdUser(Long idUser) {
+        this.idUser = idUser;
+    }
+
+    public String getUserSurname() {
+        return userSurname;
+    }
+
+    public void setUserSurname(String userSurname) {
+        userSurname = userSurname;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        userName = userName;
+    }
+
+    public String getPrimaryMail() {
+        return primaryMail;
+    }
+
+    public void setPrimaryMail(String primaryMail) {
+        this.primaryMail = primaryMail;
+    }
+
+    public String getSecondaryMail() {
+        return secondaryMail;
+    }
+
+    public void setSecondaryMail(String secondaryMail) {
+        this.secondaryMail = secondaryMail;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        phoneNumber = phoneNumber;
+    }
+}

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

@@ -0,0 +1,6 @@
+package enseirb.myinpulse.model;
+
+public class UserRepresentation {
+    public String id;
+    public String name;
+}

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

@@ -0,0 +1,17 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Administrator;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.Optional;
+
+@RepositoryRestResource
+public interface AdministratorRepository extends JpaRepository<Administrator, Long> {
+
+    /* @Query("SELECT a from Administrators a")
+    Administrator findAllAdministrator(); */
+
+    Optional<Administrator> findByPrimaryMail(String PrimaryMail);
+}

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Annotation;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface AnnotationRepository extends JpaRepository<Annotation, Long> {}

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Appointment;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface AppointmentRepository extends JpaRepository<Appointment, Long> {}

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

@@ -0,0 +1,17 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Entrepreneur;
+import enseirb.myinpulse.model.Project;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface EntrepreneurRepository extends JpaRepository<Entrepreneur, Long> {
+
+    Iterable<Entrepreneur> getEntrepreneurByProjectParticipation(Project project);
+
+    /* @Query("SELECT e from Entrepreneur e")
+    Entrepreneur findAllEntrepreneurl(); */
+
+}

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.MakeAppointment;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface MakeAppointmentRepository extends JpaRepository<MakeAppointment, Long> {}

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

@@ -0,0 +1,19 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.ProjectDecisionValue;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.Optional;
+
+@RepositoryRestResource
+public interface ProjectRepository extends JpaRepository<Project, Long> {
+    Iterable<Project> findByProjectAdministrator(Administrator administrator);
+
+    Iterable<Project> findByProjectStatus(ProjectDecisionValue status);
+
+    Optional<Project> findByProjectName(String projectName);
+}

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

@@ -0,0 +1,9 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Report;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface ReportRepository extends JpaRepository<Report, Long> {}

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

@@ -0,0 +1,18 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.SectionCell;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.time.LocalDateTime;
+
+@RepositoryRestResource
+public interface SectionCellRepository extends JpaRepository<SectionCell, Long> {
+
+    Iterable<SectionCell> findByProjectSectionCellAndSectionId(Project project, long sectionId);
+
+    Iterable<SectionCell> findByProjectSectionCellAndSectionIdAndModificationDateBefore(
+            Project project, long sectionId, LocalDateTime date);
+}

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

@@ -0,0 +1,17 @@
+package enseirb.myinpulse.repository;
+
+import enseirb.myinpulse.model.User;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.Optional;
+
+@RepositoryRestResource
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByPrimaryMail(String email);
+
+    /* @Query("SELECT u from User u")
+    User findAllUser(); */
+
+}

MyINPulse-back/src/main/java/enseirb/myinpulse/security/KeycloakJwtRolesConverter.java

@@ -1,98 +0,0 @@
-package enseirb.myinpulse.security;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
-import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toSet;
-
-
-public class KeycloakJwtRolesConverter implements Converter<Jwt, AbstractAuthenticationToken> {
-    /**
-     * Prefix used for realm level roles.
-     */
-    public static final String PREFIX_REALM_ROLE = "ROLE_REALM_";
-    /**
-     * Prefix used in combination with the resource (client) name for resource level roles.
-     */
-    public static final String PREFIX_RESOURCE_ROLE = "ROLE_";
-
-    /**
-     * Name of the claim containing the realm level roles
-     */
-    private static final String CLAIM_REALM_ACCESS = "realm_access";
-    /**
-     * Name of the claim containing the resources (clients) the user has access to.
-     */
-    private static final String CLAIM_RESOURCE_ACCESS = "resource_access";
-    /**
-     * Name of the claim containing roles. (Applicable to realm and resource level.)
-     */
-    private static final String CLAIM_ROLES = "roles";
-
-    @Override
-    public AbstractAuthenticationToken convert(Jwt source)
-    {
-        return new JwtAuthenticationToken(source, Stream.concat(new JwtGrantedAuthoritiesConverter().convert(source)
-                        .stream(), TEMPORARNAME(source).stream())
-                .collect(toSet()));
-    }
-
-    /**
-     * Extracts the realm and resource level roles from a JWT token distinguishing between them using prefixes.
-     */
-    public Collection<GrantedAuthority> TEMPORARNAME(Jwt jwt) {
-        // Collection that will hold the extracted roles
-        Collection<GrantedAuthority> grantedAuthorities = new ArrayList<>();
-
-        // Realm roles
-        // Get the part of the access token that holds the roles assigned on realm level
-        Map<String, Collection<String>> realmAccess = jwt.getClaim(CLAIM_REALM_ACCESS);
-
-        // Verify that the claim exists and is not empty
-        if (realmAccess != null && !realmAccess.isEmpty()) {
-            // From the realm_access claim get the roles
-            Collection<String> roles = realmAccess.get(CLAIM_ROLES);
-            // Check if any roles are present
-            if (roles != null && !roles.isEmpty()) {
-                // Iterate of the roles and add them to the granted authorities
-                Collection<GrantedAuthority> realmRoles = roles.stream()
-                        // Prefix all realm roles with "ROLE_realm_"
-                        .map(role -> new SimpleGrantedAuthority(PREFIX_REALM_ROLE + role))
-                        .collect(Collectors.toList());
-                grantedAuthorities.addAll(realmRoles);
-            }
-        }
-
-        // Resource (client) roles
-        // A user might have access to multiple resources all containing their own roles. Therefore, it is a map of
-        // resource each possibly containing a "roles" property.
-        Map<String, Map<String, Collection<String>>> resourceAccess = jwt.getClaim(CLAIM_RESOURCE_ACCESS);
-
-        // Check if resources are assigned
-        if (resourceAccess != null && !resourceAccess.isEmpty()) {
-            // Iterate of all the resources
-            resourceAccess.forEach((resource, resourceClaims) -> {
-                // Iterate of the "roles" claim inside the resource claims
-                resourceClaims.get(CLAIM_ROLES).forEach(
-                        // Add the role to the granted authority prefixed with ROLE_ and the name of the resource
-                        role -> grantedAuthorities.add(new SimpleGrantedAuthority(PREFIX_RESOURCE_ROLE + resource + "_" + role))
-                );
-            });
-        }
-
-        return grantedAuthorities;
-    }
-
-
-}

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

@@ -0,0 +1,166 @@
+package enseirb.myinpulse.service;
+
+import static enseirb.myinpulse.model.ProjectDecisionValue.ACTIVE;
+import static enseirb.myinpulse.model.ProjectDecisionValue.REJECTED;
+
+import enseirb.myinpulse.model.*;
+import enseirb.myinpulse.service.database.*;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AdminApiService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final ProjectService projectService;
+    private final UserService userService;
+    private final AdministratorService administratorService;
+    private final UtilsService utilsService;
+    private final AppointmentService appointmentService;
+    private final ReportService reportService;
+    private final SectionCellService sectionCellService;
+
+    @Autowired
+    AdminApiService(
+            ProjectService projectService,
+            UserService userService,
+            AdministratorService administratorService,
+            UtilsService utilsService,
+            AppointmentService appointmentService,
+            ReportService reportService,
+            SectionCellService sectionCellService) {
+        this.projectService = projectService;
+        this.userService = userService;
+        this.administratorService = administratorService;
+        this.utilsService = utilsService;
+        this.appointmentService = appointmentService;
+        this.reportService = reportService;
+        this.sectionCellService = sectionCellService;
+    }
+
+    // TODO: check if tests are sufficient - peer verification required
+    public Iterable<Project> getProjectsOfAdmin(String mail) {
+        return projectService.getProjectsByAdminId(
+                administratorService.getAdministratorById(
+                        this.userService.getUserByEmail(mail).getIdUser()));
+    }
+
+    public Iterable<Appointment> getUpcomingAppointments(String mail) {
+        logger.info("User {} check their upcoming appointments", mail);
+        User user = this.userService.getUserByEmail(mail);
+        List<Appointment> appointments = new ArrayList<>();
+        if (user instanceof Administrator) {
+            List<Project> projects = new ArrayList<>(((Administrator) user).getListProject());
+            projects.forEach(
+                    project -> {
+                        project.getListSectionCell()
+                                .forEach(
+                                        sectionCell -> {
+                                            appointments.addAll(
+                                                    this.sectionCellService
+                                                            .getAppointmentsBySectionCellId(
+                                                                    sectionCell
+                                                                            .getIdSectionCell()));
+                                        });
+                    });
+        }
+        if (user instanceof Entrepreneur) {
+            Project project = ((Entrepreneur) user).getProjectParticipation();
+            project.getListSectionCell()
+                    .forEach(
+                            sectionCell -> {
+                                appointments.addAll(
+                                        this.sectionCellService.getAppointmentsBySectionCellId(
+                                                sectionCell.getIdSectionCell()));
+                            });
+        }
+        return appointments;
+    }
+
+    // TODO: check if tests are sufficient - peer verification required
+    public Iterable<Project> getPendingProjects() {
+        return this.projectService.getPendingProjects();
+    }
+
+    // TODO: check if tests are sufficient - peer verification required
+    public void validateProject(ProjectDecision decision) {
+        projectService.updateProject(
+                decision.projectId,
+                null,
+                null,
+                null,
+                (decision.isAccepted == 1) ? ACTIVE : REJECTED,
+                this.administratorService.getAdministratorById(decision.adminId));
+    }
+
+    // TODO: check if tests are sufficient - peer verification required
+    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 {
+            this.projectService.getProjectByName(project.getProjectName(), true);
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Project already exists");
+        } catch (ResponseStatusException e) {
+            if (e.getStatusCode() == HttpStatus.CONFLICT) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT, "Project already exists");
+            }
+        }
+        Project newProject = projectService.addNewProject(project);
+        if (project.getProjectAdministrator() != null) {
+            newProject.getProjectAdministrator().updateListProject(newProject);
+        }
+        if (newProject.getEntrepreneurProposed() != null) {
+            Entrepreneur proposed = newProject.getEntrepreneurProposed();
+            proposed.setProjectProposed(newProject);
+            proposed.setProjectParticipation(newProject);
+        }
+        newProject
+                .getListEntrepreneurParticipation()
+                .forEach(
+                        participation -> {
+                            participation.setProjectParticipation(newProject);
+                        });
+        newProject
+                .getListSectionCell()
+                .forEach(
+                        sectionCell -> {
+                            sectionCell.setProjectSectionCell(newProject);
+                        });
+    }
+
+    public void createAppointmentReport(long appointmentId, Report report, String mail) {
+        long projectId =
+                this.appointmentService
+                        .getAppointmentById(appointmentId)
+                        .getAppointmentListSectionCell()
+                        .getFirst()
+                        .getProjectSectionCell()
+                        .getIdProject();
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to add an report for appointment {} but is not allowed to.",
+                    mail,
+                    projectId);
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info("User {} added a report for appointment {}", mail, projectId);
+        Report addedReport = this.reportService.addNewReport(report);
+        addedReport.setAppointmentReport(this.appointmentService.getAppointmentById(appointmentId));
+        this.appointmentService.getAppointmentById(appointmentId).setAppointmentReport(addedReport);
+    }
+
+    // TODO: test
+    public void deleteProject(long projectId) {
+        this.projectService.deleteProjectById(projectId);
+    }
+}

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

@@ -0,0 +1,135 @@
+package enseirb.myinpulse.service;
+
+import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
+
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.SectionCell;
+import enseirb.myinpulse.service.database.ProjectService;
+import enseirb.myinpulse.service.database.SectionCellService;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+@Service
+public class EntrepreneurApiService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final SectionCellService sectionCellService;
+    private final ProjectService projectService;
+    private final UtilsService utilsService;
+
+    @Autowired
+    EntrepreneurApiService(
+            SectionCellService sectionCellService,
+            ProjectService projectService,
+            UtilsService utilsService) {
+        this.sectionCellService = sectionCellService;
+        this.projectService = projectService;
+        this.utilsService = utilsService;
+    }
+
+    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");
+        }
+        if (!utilsService.isAllowedToCheckProject(
+                mail, this.sectionCellService.getProjectId(sectionCellId))) {
+            logger.warn(
+                    "User {} tried to edit section cells {} of the project {} but is not allowed to.",
+                    mail,
+                    sectionCellId,
+                    this.sectionCellService.getProjectId(sectionCellId));
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info(
+                "User {} edited section cell {} of the project with id {}",
+                mail,
+                sectionCellId,
+                this.sectionCellService.getProjectId(sectionCellId));
+        sectionCellService.updateSectionCell(
+                sectionCellId,
+                sectionCell.getSectionId(),
+                sectionCell.getContentSectionCell(),
+                sectionCell.getModificationDate());
+    }
+
+    public void removeSectionCell(Long sectionCellId, String mail) {
+        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");
+        }
+        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.getSectionCellById(sectionCellId));
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info(
+                "User {} removed section cell {} of the project with id {}",
+                mail,
+                sectionCellId,
+                this.sectionCellService.getProjectId(sectionCellId));
+        sectionCellService.removeSectionCellById(sectionCellId);
+    }
+
+    public void addSectionCell(SectionCell sectionCell, String mail) {
+        if (sectionCell == null) {
+            System.err.println("Trying to create an empty section cell");
+            throw new ResponseStatusException(
+                    HttpStatus.BAD_REQUEST, "La cellule de section fournie est vide");
+        }
+        if (!utilsService.isAllowedToCheckProject(
+                mail, this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()))) {
+            logger.warn(
+                    "User {} tried to add a section cell to the project {} but is not allowed to.",
+                    mail,
+                    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 with id {}",
+                mail,
+                sectionCell.getIdSectionCell(),
+                this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
+        SectionCell newSectionCell = sectionCellService.addNewSectionCell(sectionCell);
+        newSectionCell.getProjectSectionCell().updateListSectionCell(newSectionCell);
+        newSectionCell
+                .getAppointmentSectionCell()
+                .forEach(
+                        appointment -> {
+                            appointment.updateListSectionCell(newSectionCell);
+                        });
+        newSectionCell
+                .getListAnnotation()
+                .forEach(
+                        annotation -> {
+                            annotation.setSectionCellAnnotation(newSectionCell);
+                        });
+    }
+
+    public void requestNewProject(Project project, String mail) {
+        if (project == null) {
+            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 with id {}", mail, project.getIdProject());
+        project.setProjectStatus(PENDING);
+        projectService.addNewProject(project);
+    }
+}

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

@@ -0,0 +1,135 @@
+package enseirb.myinpulse.service;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import enseirb.myinpulse.exception.UserNotFoundException;
+import enseirb.myinpulse.model.RoleRepresentation;
+import enseirb.myinpulse.model.UserRepresentation;
+
+import org.springframework.web.client.RestClient;
+
+import javax.management.relation.RoleNotFoundException;
+
+public class KeycloakApi {
+
+    static final String keycloakUrl;
+    static final String realmName;
+
+    static {
+        if (System.getenv("VITE_KEYCLOAK_URL") == null) {
+            System.exit(-1);
+        }
+        keycloakUrl = System.getenv("VITE_KEYCLOAK_URL");
+    }
+
+    static {
+        if (System.getenv("VITE_KEYCLOAK_REALM") == null) {
+            System.exit(-1);
+        }
+        realmName = System.getenv("VITE_KEYCLOAK_REALM");
+    }
+
+    /**
+     * Uses Keycloak API to retrieve a role representation of a role by its name
+     *
+     * @param roleName name of the role
+     * @param bearer authorization header used by the client to authenticate to keycloak
+     */
+    public static RoleRepresentation getRoleRepresentationByName(String roleName, String bearer)
+            throws RoleNotFoundException {
+        RoleRepresentation[] response =
+                RestClient.builder()
+                        .baseUrl(keycloakUrl)
+                        .defaultHeader("Authorization", bearer)
+                        .build()
+                        .get()
+                        .uri("/admin/realms/{realmName}/roles/{roleName}", realmName, roleName)
+                        .retrieve()
+                        .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 bearer bearer of the user, allowing access to database
+     * @return the userid, as a String
+     * @throws UserNotFoundException
+     */
+    public static String getUserIdByName(String username, String bearer)
+            throws UserNotFoundException {
+        UserRepresentation[] response =
+                RestClient.builder()
+                        .baseUrl(keycloakUrl)
+                        .defaultHeader("Authorization", bearer)
+                        .build()
+                        .get()
+                        .uri(
+                                "/admin/realms/{realmName}/users?username={username}",
+                                realmName,
+                                username)
+                        .retrieve()
+                        .body(UserRepresentation[].class);
+
+        if (response == null || response.length == 0) {
+            throw new UserNotFoundException("User not found");
+        }
+        return response[0].id;
+    }
+
+    /**
+     * TODO: check for error
+     *
+     * <p>Set a keycloak role to a keycloak user.
+     *
+     * <p>Usual roles should be `MyINPulse-admin` and `MyINPulse-entrepreneur`
+     *
+     * @param username
+     * @param roleName
+     * @param bearer
+     * @throws RoleNotFoundException
+     * @throws UserNotFoundException
+     */
+    public static void setRoleToUser(String username, String roleName, String bearer)
+            throws RoleNotFoundException, UserNotFoundException {
+        RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, bearer);
+        String userId = getUserIdByName(username, bearer);
+
+        RestClient.builder()
+                .baseUrl(keycloakUrl)
+                .defaultHeader("Authorization", bearer)
+                .build()
+                .post()
+                .uri(
+                        "/admin/realms/${realmName}/users/${userId}/role-mappings/realm",
+                        realmName,
+                        userId)
+                .body(roleRepresentation)
+                .contentType(APPLICATION_JSON)
+                .retrieve();
+    }
+
+    /**
+     * Delete a user from Keycloak database. TODO: check the bearer permission.
+     *
+     * @param username
+     * @param bearer
+     * @throws UserNotFoundException
+     */
+    public static void deleteUser(String username, String bearer) throws UserNotFoundException {
+        String userId = getUserIdByName(username, bearer);
+
+        RestClient.builder()
+                .baseUrl(keycloakUrl)
+                .defaultHeader("Authorization", bearer)
+                .build()
+                .delete()
+                .uri("/admin/realms/${realmName}/users/${userId}", realmName, userId)
+                .retrieve();
+    }
+}

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

@@ -0,0 +1,252 @@
+package enseirb.myinpulse.service;
+
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfWriter;
+
+import enseirb.myinpulse.model.*;
+import enseirb.myinpulse.service.database.*;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class SharedApiService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final ProjectService projectService;
+    private final EntrepreneurService entrepreneurService;
+    private final SectionCellService sectionCellService;
+    private final AppointmentService appointmentService;
+
+    private final UtilsService utilsService;
+
+    @Autowired
+    SharedApiService(
+            ProjectService projectService,
+            EntrepreneurService entrepreneurService,
+            SectionCellService sectionCellService,
+            AppointmentService appointmentService,
+            UtilsService utilsService) {
+        this.projectService = projectService;
+        this.entrepreneurService = entrepreneurService;
+        this.sectionCellService = sectionCellService;
+        this.appointmentService = appointmentService;
+        this.utilsService = utilsService;
+    }
+
+    // TODO filter this with date
+    public Iterable<SectionCell> getSectionCells(
+            long projectId, long sectionId, String date, 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");
+        }
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        LocalDateTime dateTime = LocalDateTime.parse(date, formatter);
+
+        Project project = this.projectService.getProjectById(projectId);
+        return this.sectionCellService.getSectionCellsByProjectAndSectionIdBeforeDate(
+                project, sectionId, dateTime);
+    }
+
+    // TODO: test
+    public Iterable<Entrepreneur> getEntrepreneursByProjectId(long projectId, String mail) {
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to check the member 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);
+        return this.entrepreneurService.GetEntrepreneurByProject(project);
+    }
+
+    // TODO: test
+    public Administrator getAdminByProjectId(long projectId, String mail) {
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to check the admin 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);
+        return project.getProjectAdministrator();
+    }
+
+    public Iterable<Appointment> getAppointmentsByProjectId(long projectId, String mail) {
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to check the appointments related to the project {} but is not allowed to.",
+                    mail,
+                    projectId);
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info(
+                "User {} tried to check the appointments related to the project {}",
+                mail,
+                projectId);
+        Iterable<SectionCell> sectionCells =
+                this.sectionCellService.getSectionCellsByProject(
+                        projectService.getProjectById(projectId),
+                        2L); // sectionId useless in this function ?
+        List<Appointment> appointments = new ArrayList<Appointment>();
+        sectionCells.forEach(
+                sectionCell -> {
+                    appointments.addAll(
+                            this.sectionCellService.getAppointmentsBySectionCellId(
+                                    sectionCell.getIdSectionCell()));
+                });
+        return appointments;
+    }
+
+    public void getPDFReport(long appointmentId, String mail)
+            throws DocumentException, URISyntaxException, IOException {
+        long projectId =
+                this.appointmentService
+                        .getAppointmentById(appointmentId)
+                        .getAppointmentListSectionCell()
+                        .getFirst()
+                        .getProjectSectionCell()
+                        .getIdProject();
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to generate the PDF report {} related to the appointment {} but is not allowed to.",
+                    mail,
+                    this.appointmentService
+                            .getAppointmentById(appointmentId)
+                            .getAppointmentReport()
+                            .getIdReport(),
+                    appointmentId);
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info(
+                "User {} generated the PDF report related to appointment {}", mail, appointmentId);
+
+        String reportContent =
+                this.appointmentService
+                        .getAppointmentById(appointmentId)
+                        .getAppointmentReport()
+                        .getReportContent();
+
+        // PDF generation
+        Document document = new Document();
+        PdfWriter.getInstance(document, new FileOutputStream("Report" + appointmentId + ".pdf"));
+        document.open();
+
+        Paragraph title =
+                new Paragraph(
+                        new Phrase(
+                                "Compte Rendu - Réunion du "
+                                        + this.appointmentService
+                                                .getAppointmentById(appointmentId)
+                                                .getAppointmentDate()
+                                                .toString(),
+                                FontFactory.getFont(
+                                        FontFactory.HELVETICA,
+                                        20,
+                                        Font.BOLDITALIC,
+                                        BaseColor.BLACK)));
+        title.setAlignment(Element.ALIGN_CENTER);
+        document.add(title);
+
+        Font subsection =
+                FontFactory.getFont(FontFactory.HELVETICA, 14, Font.UNDERLINE, BaseColor.DARK_GRAY);
+        Font body = FontFactory.getFont(FontFactory.COURIER, 12, BaseColor.BLACK);
+
+        String[] split = reportContent.split(" ");
+
+        String tmp = "";
+        int counter = 1;
+        for (String s : split) {
+            if (s.equals("//")) {
+                Chunk chunk = new Chunk(tmp, body);
+                document.add(chunk);
+                document.add(new Paragraph("\n"));
+                tmp = "";
+                Paragraph paragraph = new Paragraph("Point n°" + counter + " : ", subsection);
+                document.add(paragraph);
+                document.add(new Paragraph("\n"));
+                counter++;
+            } else {
+                tmp = tmp.concat(s + " ");
+            }
+        }
+        Chunk chunk = new Chunk(tmp, body);
+        document.add(chunk);
+        document.add(new Paragraph("\n"));
+
+        document.close();
+
+        // Replace uri with website address
+        Files.copy(
+                new URI(
+                                "http://localhost:8080/shared/projects/appointments/report/"
+                                        + appointmentId)
+                        .toURL()
+                        .openStream(),
+                Paths.get("Report" + appointmentId + ".pdf"),
+                StandardCopyOption.REPLACE_EXISTING);
+
+        // delete file, we don't want to stock all reports on the server
+        File file = new File("Report" + appointmentId + ".pdf");
+        if (!file.delete()) {
+            logger.warn("Failed to delete report {}", file.getAbsolutePath());
+        }
+    }
+
+    public void createAppointmentRequest(Appointment appointment, String mail) {
+        long projectId =
+                appointment
+                        .getAppointmentListSectionCell()
+                        .getFirst()
+                        .getProjectSectionCell()
+                        .getIdProject();
+        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
+            logger.warn(
+                    "User {} tried to create for the project {} but is not allowed to.",
+                    mail,
+                    projectId);
+            throw new ResponseStatusException(
+                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
+        }
+        logger.info("User {} tried to create an appointment for project {}", mail, projectId);
+        Appointment newAppointment = this.appointmentService.addNewAppointment(appointment);
+        newAppointment
+                .getAppointmentListSectionCell()
+                .forEach(
+                        sectionCell -> {
+                            sectionCell.updateAppointmentSectionCell(newAppointment);
+                        });
+        newAppointment.getAppointmentReport().setAppointmentReport(newAppointment);
+    }
+}

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

@@ -0,0 +1,62 @@
+package enseirb.myinpulse.service;
+
+import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.model.Entrepreneur;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.User;
+import enseirb.myinpulse.service.database.AdministratorService;
+import enseirb.myinpulse.service.database.EntrepreneurService;
+import enseirb.myinpulse.service.database.ProjectService;
+import enseirb.myinpulse.service.database.UserService;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+@Service
+public class UtilsService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final UserService userService;
+    private final ProjectService projectService;
+    private final EntrepreneurService entrepreneurService;
+    private final AdministratorService administratorService;
+
+    @Autowired
+    UtilsService(
+            ProjectService projectService,
+            UserService userService,
+            EntrepreneurService entrepreneurService,
+            AdministratorService administratorService) {
+        this.userService = userService;
+        this.projectService = projectService;
+        this.entrepreneurService = entrepreneurService;
+        this.administratorService = administratorService;
+    }
+
+    // TODO: test?
+    public Boolean isAllowedToCheckProject(String mail, long projectId) {
+        if (isAnAdmin(mail)) {
+            return true;
+        }
+        User user = this.userService.getUserByEmail(mail);
+        Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(user.getIdUser());
+        Project project = this.projectService.getProjectById(projectId);
+        return entrepreneur.getProjectParticipation() == project;
+    }
+
+    // TODO: test
+    Boolean isAnAdmin(String mail) {
+        try {
+            long userId = this.userService.getUserByEmail(mail).getIdUser();
+            Administrator a = this.administratorService.getAdministratorById(userId);
+            return true;
+        } catch (ResponseStatusException e) {
+            logger.info(e);
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,60 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.repository.AdministratorRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.Optional;
+
+@Service
+public class AdministratorService {
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final AdministratorRepository administratorRepository;
+
+    @Autowired
+    AdministratorService(AdministratorRepository administratorRepository) {
+        this.administratorRepository = administratorRepository;
+    }
+
+    public Iterable<Administrator> allAdministrators() {
+        return this.administratorRepository.findAll();
+    }
+
+    public Administrator getAdministratorById(long id) {
+        Optional<Administrator> administrator = this.administratorRepository.findById(id);
+        if (administrator.isEmpty()) {
+            logger.error("No administrator found with id {}", id);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
+        }
+        return administrator.get();
+    }
+
+    public Administrator getAdministratorByPrimaryMain(String primaryMail) {
+        Optional<Administrator> administrator =
+                this.administratorRepository.findByPrimaryMail(primaryMail);
+        if (administrator.isEmpty()) {
+            logger.error("No administrator found with the mail {}", primaryMail);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
+        }
+        return administrator.get();
+    }
+
+    public Administrator addAdministrator(Administrator administrator) {
+        return this.administratorRepository.save(administrator);
+    }
+
+    /*
+    public Administrator getAdministratorByProject(Project project) {
+        r
+    }
+     */
+}

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

@@ -0,0 +1,61 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Annotation;
+import enseirb.myinpulse.repository.AnnotationRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.Optional;
+
+@Service
+public class AnnotationService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final AnnotationRepository annotationRepository;
+
+    @Autowired
+    AnnotationService(AnnotationRepository annotationRepository) {
+        this.annotationRepository = annotationRepository;
+    }
+
+    public Iterable<Annotation> getAllAnnotations() {
+        return annotationRepository.findAll();
+    }
+
+    public Annotation getAnnotationById(Long id) {
+        Optional<Annotation> annotation = annotationRepository.findById(id);
+        if (annotation.isEmpty()) {
+            logger.error("getAnnotationById : No annotation found with id {}", id);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cette annotation n'existe pas");
+        }
+        return annotation.get();
+    }
+
+    public Annotation addNewAnnotation(Annotation annotation) {
+        return this.annotationRepository.save(annotation);
+    }
+
+    public void deleteAnnotationById(Long id) {
+        this.annotationRepository.deleteById(id);
+    }
+
+    public Annotation updateAnnotation(Long id, String comment) {
+        Optional<Annotation> annotation = annotationRepository.findById(id);
+        if (annotation.isEmpty()) {
+            logger.error("updateAnnotation : No annotation found with id {}", id);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cette annotation n'existe pas");
+        }
+        if (comment != null) {
+            annotation.get().setComment(comment);
+        }
+        return this.annotationRepository.save(annotation.get());
+    }
+}

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

@@ -0,0 +1,79 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Appointment;
+import enseirb.myinpulse.repository.AppointmentRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.Optional;
+
+@Service
+public class AppointmentService {
+
+    private static final Logger logger = LogManager.getLogger(AppointmentService.class);
+
+    private AppointmentRepository appointmentRepository;
+
+    @Autowired
+    AppointmentService(AppointmentRepository appointmentRepository) {
+        this.appointmentRepository = appointmentRepository;
+    }
+
+    public Iterable<Appointment> getallAppointments() {
+        return this.appointmentRepository.findAll();
+    }
+
+    public Appointment getAppointmentById(Long id) {
+        Optional<Appointment> appointment = this.appointmentRepository.findById(id);
+        if (appointment.isEmpty()) {
+            logger.error("getAppointmentById : No appointment found with id {}", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas");
+        }
+        return appointment.get();
+    }
+
+    public Appointment addNewAppointment(Appointment appointment) {
+        return this.appointmentRepository.save(appointment);
+    }
+
+    public void deleteAppointmentById(Long id) {
+        this.appointmentRepository.deleteById(id);
+    }
+
+    public Appointment updateAppointment(
+            Long id,
+            LocalDate appointmentDate,
+            LocalTime appointmentTime,
+            LocalTime appointmentDuration,
+            String appointmentPlace,
+            String appointmentSubject) {
+        Optional<Appointment> appointment = this.appointmentRepository.findById(id);
+        if (appointment.isEmpty()) {
+            logger.error("updateAppointment : No appointment found with id {}", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce rendez vous n'existe pas");
+        }
+        if (appointmentDate != null) {
+            appointment.get().setAppointmentDate(appointmentDate);
+        }
+        if (appointmentTime != null) {
+            appointment.get().setAppointmentTime(appointmentTime);
+        }
+        if (appointmentDuration != null) {
+            appointment.get().setAppointmentDuration(appointmentDuration);
+        }
+        if (appointmentPlace != null) {
+            appointment.get().setAppointmentPlace(appointmentPlace);
+        }
+        if (appointmentSubject != null) {
+            appointment.get().setAppointmentSubject(appointmentSubject);
+        }
+        return this.appointmentRepository.save(appointment.get());
+    }
+}

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

@@ -0,0 +1,67 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Entrepreneur;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.repository.EntrepreneurRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.Optional;
+
+@Service
+public class EntrepreneurService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final EntrepreneurRepository entrepreneurRepository;
+
+    EntrepreneurService(EntrepreneurRepository entrepreneurRepository) {
+        this.entrepreneurRepository = entrepreneurRepository;
+    }
+
+    public Iterable<Entrepreneur> getAllEntrepreneurs() {
+        return this.entrepreneurRepository.findAll();
+    }
+
+    public Entrepreneur getEntrepreneurById(Long id) {
+        Optional<Entrepreneur> entrepreneur = entrepreneurRepository.findById(id);
+        if (entrepreneur.isEmpty()) {
+            logger.error("getEntrepreneurById : No entrepreneur found with id {}", id);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas");
+        }
+        return entrepreneur.get();
+    }
+
+    public Entrepreneur addEntrepreneur(Entrepreneur entrepreneur) {
+        return this.entrepreneurRepository.save(entrepreneur);
+    }
+
+    public Entrepreneur updateEntrepreneur(
+            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);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cet entrepreneur n'existe pas");
+        }
+        if (school != null) {
+            entrepreneur.get().setSchool(school);
+        }
+        if (course != null) {
+            entrepreneur.get().setCourse(course);
+        }
+        if (sneeStatus != null) {
+            entrepreneur.get().setSneeStatus(sneeStatus);
+        }
+        return this.entrepreneurRepository.save(entrepreneur.get());
+    }
+
+    public Iterable<Entrepreneur> GetEntrepreneurByProject(Project project) {
+        return this.entrepreneurRepository.getEntrepreneurByProjectParticipation(project);
+    }
+}

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

@@ -0,0 +1,124 @@
+package enseirb.myinpulse.service.database;
+
+import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
+
+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;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@Service
+public class ProjectService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final ProjectRepository projectRepository;
+
+    @Autowired
+    ProjectService(ProjectRepository projectRepository) {
+        this.projectRepository = projectRepository;
+    }
+
+    public Iterable<Project> getAllProjects() {
+        return this.projectRepository.findAll();
+    }
+
+    public Project getProjectById(Long id) {
+        Optional<Project> project = this.projectRepository.findById(id);
+        if (project.isEmpty()) {
+            logger.error("No project found with id {}", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
+        }
+        return project.get();
+    }
+
+    public Iterable<Project> getProjectsByAdminId(Administrator administrator) {
+        return this.projectRepository.findByProjectAdministrator(administrator);
+    }
+
+    // TODO: validation
+    public Project addNewProject(Project project) {
+        return this.projectRepository.save(project);
+    }
+
+    public Project updateProject(
+            Long id,
+            String projectName,
+            byte[] logo,
+            LocalDate creationDate,
+            ProjectDecisionValue projectStatus,
+            Administrator administrator) {
+        Optional<Project> project = this.projectRepository.findById(id);
+
+        if (project.isEmpty()) {
+            logger.error("Project with id {} not found.", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
+        }
+
+        if (projectName != null) {
+            project.get().setProjectName(projectName);
+        }
+
+        if (logo != null) {
+            project.get().setLogo(logo);
+        }
+
+        if (creationDate != null) {
+            project.get().setCreationDate(creationDate);
+        }
+
+        if (projectStatus != null) {
+            // TODO: check if this is really useful
+            /*
+            if (!validateStatus(projectStatus)) {
+                logger.error("updateProjectStatus: Invalid status {}", projectStatus);
+                throw new ResponseStatusException(
+                        HttpStatus.NOT_ACCEPTABLE, "Ce status n'est pas accepté");
+            }
+            */
+            project.get().setProjectStatus(projectStatus);
+        }
+
+        if (administrator != null) {
+            project.get().setProjectAdministrator(administrator);
+        }
+
+        return this.projectRepository.save(project.get());
+    }
+
+    public Boolean validateStatus(String status) {
+        return List.of("PENDING", "ACTIVE", "ENDED").contains(status);
+    }
+
+    public Iterable<Project> getPendingProjects() {
+        return this.projectRepository.findByProjectStatus(PENDING);
+    }
+
+    public void deleteProjectById(Long id) {
+        this.projectRepository.deleteById(id);
+    }
+
+    public Project getProjectByName(String name, boolean noerror) {
+        Optional<Project> project = this.projectRepository.findByProjectName(name);
+        if (project.isEmpty()) {
+            if (noerror) logger.error("No project found with name {}", name);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
+        }
+        return project.get();
+    }
+
+    public Project getProjectByName(String name) {
+        return getProjectByName(name, false);
+    }
+}

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

@@ -0,0 +1,60 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Report;
+import enseirb.myinpulse.repository.ReportRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.Optional;
+
+@Service
+public class ReportService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final ReportRepository reportRepository;
+
+    @Autowired
+    ReportService(ReportRepository reportRepository) {
+        this.reportRepository = reportRepository;
+    }
+
+    public Iterable<Report> getAllReports() {
+        return this.reportRepository.findAll();
+    }
+
+    public Report getReportById(Long id) {
+        Optional<Report> report = this.reportRepository.findById(id);
+        if (report.isEmpty()) {
+            logger.error("getReportById : No report found with id {}", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas");
+        }
+        return report.get();
+    }
+
+    // TODO: do some validation
+    public Report addNewReport(Report report) {
+        return this.reportRepository.save(report);
+    }
+
+    public void deleteReportById(Long id) {
+        this.reportRepository.deleteById(id);
+    }
+
+    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);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce compte rendu n'existe pas");
+        }
+        if (reportContent != null) {
+            report.get().setReportContent(reportContent);
+        }
+        return this.reportRepository.save(report.get());
+    }
+}

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

@@ -0,0 +1,93 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.Appointment;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.SectionCell;
+import enseirb.myinpulse.repository.SectionCellRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class SectionCellService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final SectionCellRepository sectionCellRepository;
+
+    @Autowired
+    SectionCellService(SectionCellRepository sectionCellRepository) {
+        this.sectionCellRepository = sectionCellRepository;
+    }
+
+    public Iterable<SectionCell> getAllSectionCells() {
+        return this.sectionCellRepository.findAll();
+    }
+
+    public SectionCell getSectionCellById(Long id) {
+        Optional<SectionCell> sectionCell = this.sectionCellRepository.findById(id);
+        if (sectionCell.isEmpty()) {
+            logger.error("getSectionCellById : No sectionCell found with id {}", id);
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
+        }
+        return sectionCell.get();
+    }
+
+    public SectionCell addNewSectionCell(SectionCell sectionCell) {
+        return this.sectionCellRepository.save(sectionCell);
+    }
+
+    public void removeSectionCellById(Long id) {
+        this.sectionCellRepository.deleteById(id);
+    }
+
+    public SectionCell updateSectionCell(
+            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);
+        }
+        if (modificationDate != null) {
+            sectionCell.get().setModificationDate(modificationDate);
+        }
+        return this.sectionCellRepository.save(sectionCell.get());
+    }
+
+    public Iterable<SectionCell> getSectionCellsByProject(Project project, Long sectionId) {
+        return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId);
+    }
+
+    public Long getProjectId(Long sectionCellId) {
+        SectionCell sectionCell = getSectionCellById(sectionCellId);
+        Project sectionProject = sectionCell.getProjectSectionCell();
+        return sectionProject.getIdProject();
+    }
+
+    public List<Appointment> getAppointmentsBySectionCellId(Long sectionCellId) {
+        SectionCell sectionCell = getSectionCellById(sectionCellId);
+        return sectionCell.getAppointmentSectionCell();
+    }
+
+    public Iterable<SectionCell> getSectionCellsByProjectAndSectionIdBeforeDate(
+            Project project, long sectionId, LocalDateTime date) {
+        return sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
+                project, sectionId, date);
+    }
+}

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

@@ -0,0 +1,81 @@
+package enseirb.myinpulse.service.database;
+
+import enseirb.myinpulse.model.User;
+import enseirb.myinpulse.repository.UserRepository;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.Optional;
+
+@Service
+public class UserService {
+
+    protected static final Logger logger = LogManager.getLogger();
+
+    private final UserRepository userRepository;
+
+    @Autowired
+    UserService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public Iterable<User> getAllUsers() {
+        return this.userRepository.findAll();
+    }
+
+    // TODO
+    public User getUserByEmail(String email) {
+        Optional<User> opt_user = this.userRepository.findByPrimaryMail(email);
+
+        if (opt_user.isEmpty()) {
+            logger.error("getUserByEmail : No user found with email {}", email);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
+        }
+        return opt_user.get();
+    }
+
+    public Iterable<User> allUsers() {
+        return this.userRepository.findAll();
+    }
+
+    public User addUser(@RequestBody User user) {
+        return this.userRepository.save(user);
+    }
+
+    public User updateUser(
+            @PathVariable Long id,
+            String userSurname,
+            String userName,
+            String primaryMail,
+            String secondaryMail,
+            String phoneNumber) {
+        Optional<User> user = userRepository.findById(id);
+        if (user.isEmpty()) {
+            logger.error("updateUser : No user found with id {}", id);
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
+        }
+        if (userName != null) {
+            user.get().setUserName(userName);
+        }
+        if (userSurname != null) {
+            user.get().setUserSurname(userSurname);
+        }
+        if (primaryMail != null) {
+            user.get().setPrimaryMail(primaryMail);
+        }
+        if (secondaryMail != null) {
+            user.get().setSecondaryMail(secondaryMail);
+        }
+        if (phoneNumber != null) {
+            user.get().setPhoneNumber(phoneNumber);
+        }
+        return this.userRepository.save(user.get());
+    }
+}

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

@@ -1,4 +1,8 @@
 spring.application.name=myinpulse
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
 spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
-logging.level.org.springframework.security=DEBUG
+spring.datasource.url=jdbc:postgresql://${DATABASE_URL}/${BACKEND_DB}
+spring.datasource.username=${BACKEND_USER}
+spring.datasource.password=${BACKEND_PASSWORD}
+spring.jpa.hibernate.ddl-auto=update
+logging.pattern.console=%d{yyyy-MMM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n

MyINPulse-back/src/main/resources/data.sql

@@ -0,0 +1,99 @@
+TRUNCATE project, user_inpulse, entrepreneur, administrator, section_cell, appointment, report, annotation CASCADE;
+
+SELECT setval('annotation_id_annotation_seq', 1, false);
+SELECT setval('appointment_id_appointment_seq', 1, false);
+SELECT setval('make_appointment_id_make_appointment_seq', 1, false);
+SELECT setval('project_id_project_seq', 1, false);
+SELECT setval('report_id_report_seq', 1, false);
+SELECT setval('section_cell_id_section_cell_seq', 1, false);
+SELECT setval('user_inpulse_id_user_seq', 1, false);
+
+INSERT INTO user_inpulse (user_surname, user_name, primary_mail, secondary_mail, phone_number)
+VALUES ('Dupont', 'Dupond', 'super@mail.fr', 'super2@mail.fr', '06 45 72 45 98'),
+       ('Martin', 'Matin', 'genial@mail.fr', 'genial2@mail.fr', '06 52 14 58 73'),
+       ('Charvet', 'Lautre', 'mieux@tmail.fr', 'mieux2@tmail.fr', '07 49 82 16 35'),
+       ('Leguez', 'Theo', 'bof@mesmails.fr', 'bof2@mesmails.fr', '+33 6 78 14 25 29'),
+       ('Kia', 'Bi', 'special@mail.fr', 'special2@mail.fr', '07 65 31 38 95'),
+       ('Ducaillou', 'Pierre', 'maildefou@xyz.fr', 'maildefou2@xyz.fr', '06 54 78 12 62'),
+       ('Janine', 'Dave', 'janine@labri.fr', 'janine2@labri.fr', '06 87 12 45 95');
+
+INSERT INTO administrator (id_administrator)
+VALUES (7);
+
+INSERT INTO project (project_name, logo, creation_date, project_status, id_administrator)
+VALUES ('Eau du robinet', decode('013d7d16d7ad4fefb61bd95b765c8ceb', 'hex'), TO_DATE('01-OCT-2023', 'DD-MON-YYYY'),
+        'En cours', 7),
+       ('Air oxygéné', decode('150647a0984e8f228cd14b54', 'hex'), TO_DATE('04-APR-2024', 'DD-MON-YYYY'), 'En cours', 7),
+       ('Débat concours', decode('022024abd5486e245c145dda65116f', 'hex'), TO_DATE('22-NOV-2023', 'DD-MON-YYYY'),
+        'Suspendu', 7),
+       ('HDeirbMI', decode('ab548d6c1d595a2975e6476f544d14c55a', 'hex'), TO_DATE('07-DEC-2024', 'DD-MON-YYYY'),
+        'Lancement', 7);
+
+
+INSERT INTO entrepreneur (school, course, snee_status, id_entrepreneur, id_project_participation, id_project_proposed)
+VALUES ('ENSEIRB-MATMECA', 'INFO', TRUE, 1, 4, 4),
+       ('ENSC', 'Cognitique', TRUE, 2, 2, null),
+       ('ENSEIRB-MATMECA', 'MATMECA', FALSE, 3, 3, 3),
+       ('SupOptique', 'Classique', TRUE, 4, 1, 1),
+       ('ENSEGID', 'Géoscience', FALSE, 5, 1, null),
+       ('ENSMAC', 'Matériaux composites - Mécanique', FALSE, 6, 2, 2);
+
+
+INSERT INTO section_cell (title, content_section_cell, modification_date, id_project)
+VALUES ('Problème', 'les problèmes...', TO_TIMESTAMP('15-JAN-2025 09:30:20', 'DD-MON-YYYY, HH24:MI:SS'), 2),
+       ('Segment de client', 'Le segment AB passant le client n°8 est de longueur 32mm.
+    Le segment BC a quant à lui un longueur de 28mm. Quelle la longueur du segment AC ?',
+        TO_TIMESTAMP('12-OCT-2022 17:47:38', 'DD-MON-YYYY, HH24:MI:SS'), 3),
+       ('Proposition de valeur unique', '''Son prix est de 2594€'' ''Ah oui c''est unique en effet',
+        TO_TIMESTAMP('25-MAY-2024 11:12:04', 'DD-MON-YYYY, HH24:MI:SS'), 2),
+       ('Solution', 'Un problème ? Une solution', TO_TIMESTAMP('08-FEB-2024 10:17:53', 'DD-MON-YYYY, HH24:MI:SS'), 1),
+       ('Canaux', 'Ici nous avons la Seine, là-bas le Rhin, oh et plus loin le canal de Suez',
+        TO_TIMESTAMP('19-JUL-2023 19:22:45', 'DD-MON-YYYY, HH24:MI:SS'), 4),
+       ('Sources de revenus', 'Y''en n''a pas on est pas payé. Enfin y''a du café quoi',
+        TO_TIMESTAMP('12-JAN-2025 11:40:26', 'DD-MON-YYYY, HH24:MI:SS'), 1),
+       ('Structure des coûts', '''Ah oui là ça va faire au moins 1000€ par mois'', Eirbware',
+        TO_TIMESTAMP('06-FEB-2025 13:04:06', 'DD-MON-YYYY, HH24:MI:SS'), 3),
+       ('Indicateurs clés', 'On apprend les clés comme des badges, ça se fait',
+        TO_TIMESTAMP('05-FEB-2025 12:42:38', 'DD-MON-YYYY, HH24:MI:SS'), 4),
+       ('Avantages concurrentiel', 'On est meilleur', TO_TIMESTAMP('23-APR-2024 16:24:02', 'DD-MON-YYYY, HH24:MI:SS'),
+        2);
+
+INSERT INTO appointment (appointment_date, appointment_time, appointment_duration, appointment_place,
+                         appointment_subject)
+VALUES (TO_DATE('24-DEC-2023', 'DD-MON-YYYY'), '00:00:00', '00:37:53', 'À la maison', 'Ouvrir les cadeaux'),
+       (TO_DATE('15-AUG-2024', 'DD-MON-YYYY'), '22:35:00', '00:12:36', 'Sur les quais ou dans un champ probablement',
+        'BOUM BOUM les feux d''artifices (on fête quoi déjà ?)'),
+       (TO_DATE('28-FEB-2023', 'DD-MON-YYYY'), '14:20:00', '00:20:00', 'Salle TD 15',
+        'Ah mince c''est pas une année bissextile !'),
+       (TO_DATE('23-JAN-2024', 'DD-MON-YYYY'), '12:56:27', '11:03:33', 'Là où le vent nous porte',
+        'Journée la plus importante de l''année'),
+       (TO_DATE('25-AUG-2025', 'DD-MON-YYYY'), '00:09:00', '01:00:00', 'Euh c''est par où l''amphi 56 ?',
+        'Rentrée scolaire (il fait trop froid c''est quoi ça on est en août)');
+
+INSERT INTO report (report_content, id_appointment)
+VALUES ('Ah oui ça c''est super, ah ouais j''aime bien, bien vu de penser à ça', 1),
+       ('Bonne réunion', 3),
+       ('Ouais, j''ai rien compris mais niquel on fait comme vous avez dit', 3),
+       ('Non non ça va pas du tout ce que tu me proposes, faut tout refaire', 4),
+       ('Réponse de la DSI : non', 2),
+       ('Trop dommage qu''Apple ait sorti leur logiciel avant nous, on avait la même idée et tout on aurait tellement pu leur faire de la concurrence',
+        5);
+
+INSERT INTO annotation (comment, id_administrator, id_section_cell)
+VALUES ('faut changer ça hein', 7, 5),
+       ('??? sérieusement, vous pensez que c''est une bonne idée ?', 7, 7),
+       ('ok donc ça c''est votre business plan, bah glhf la team', 7, 2);
+
+
+
+
+
+
+
+
+
+
+
+
+
+

MyINPulse-back/src/main/resources/delete.sql

@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS administrateurs, projets, utilisateurs, entrepreneurs, sections, rendez_vous, comptes_rendus, concerner CASCADE;
+DROP TABLE IF EXISTS administrator, project, user_inpulse, entrepreneur, section_cell, appointment, make_appointment, report, annotation, concern CASCADE;

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

@@ -0,0 +1,224 @@
+package enseirb.myinpulse;
+
+import static enseirb.myinpulse.model.ProjectDecisionValue.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import enseirb.myinpulse.model.Administrator;
+import enseirb.myinpulse.model.Entrepreneur;
+import enseirb.myinpulse.model.Project;
+import enseirb.myinpulse.model.ProjectDecision;
+import enseirb.myinpulse.service.AdminApiService;
+import enseirb.myinpulse.service.database.AdministratorService;
+import enseirb.myinpulse.service.database.EntrepreneurService;
+import enseirb.myinpulse.service.database.ProjectService;
+
+import org.junit.jupiter.api.BeforeAll;
+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.util.ArrayList;
+import java.util.List;
+
+@SpringBootTest
+@Transactional
+public class AdminApiServiceTest {
+    private static long administratorid;
+    private static Administrator administrator;
+    private static Entrepreneur entrepreneur;
+    @Autowired private AdminApiService adminApiService;
+    @Autowired private ProjectService projectService;
+
+    @BeforeAll
+    static void setup(
+            @Autowired AdministratorService administratorService,
+            @Autowired ProjectService projectService,
+            @Autowired EntrepreneurService entrepreneurService) {
+        administratorService.addAdministrator(
+                new Administrator(
+                        "admin",
+                        "admin",
+                        "testAdminEmpty@example.com",
+                        "testAdmin@example.com",
+                        ""));
+        administrator =
+                administratorService.addAdministrator(
+                        new Administrator(
+                                "admin2",
+                                "admin2",
+                                "testAdminFull@example.com",
+                                "testAdmin@example.com",
+                                ""));
+        administratorid = administrator.getIdUser();
+        entrepreneur =
+                new Entrepreneur(
+                        "JeSuisUnEntrepreneurDeCompet",
+                        "EtUé",
+                        "Entrepreneur@inpulse.com",
+                        "mail2",
+                        "phone",
+                        "Ensimag    nan jdeconne ENSEIRB (-matmeca mais on s'en fout)",
+                        "info ofc",
+                        false);
+        entrepreneurService.addEntrepreneur(entrepreneur);
+        projectService.addNewProject(
+                new Project(
+                        "sampleProjectAdminApiService",
+                        null,
+                        LocalDate.now(),
+                        ACTIVE,
+                        administratorService.getAdministratorByPrimaryMain(
+                                "testAdminFull@example.com")));
+    }
+
+    private <T> List<T> IterableToList(Iterable<T> iterable) {
+        List<T> l = new ArrayList<>();
+        iterable.forEach(l::add);
+        return l;
+    }
+
+    @Test
+    void getProjectOfAdminIsEmpty() {
+        Iterable<Project> projects =
+                adminApiService.getProjectsOfAdmin("testAdminEmpty@example.com");
+        assertEquals(0, IterableToList(projects).size());
+    }
+
+    @Test
+    void getProjectOfInexistantAdminFails() {
+        String nonExistentAdminEmail = "testInexistantAdmin@example.com";
+
+        assertThrows(
+                ResponseStatusException.class,
+                () -> {
+                    adminApiService.getProjectsOfAdmin(nonExistentAdminEmail);
+                });
+    }
+
+    @Test
+    void getProjectOfAdminNotEmpty() {
+        Iterable<Project> projects =
+                adminApiService.getProjectsOfAdmin("testAdminFull@example.com");
+        List<Project> l = IterableToList(projects);
+        assertEquals(1, l.size());
+        Project p = l.getFirst();
+        assertEquals(p.getProjectName(), "sampleProjectAdminApiService");
+    }
+
+    @Test
+    void getPendingProjectsEmpty() {
+        assertEquals(0, IterableToList(this.adminApiService.getPendingProjects()).size());
+    }
+
+    @Test
+    void getPendingProjectsNotEmpty() {
+        this.projectService.addNewProject(
+                new Project(
+                        "PendingProjectAdminApiService1", null, LocalDate.now(), PENDING, null));
+        this.projectService.addNewProject(
+                new Project(
+                        "PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null));
+        Iterable<Project> pendingProjects = this.adminApiService.getPendingProjects();
+        List<Project> pendingProjectsList = IterableToList(pendingProjects);
+        assertEquals(2, pendingProjectsList.size());
+        assertTrue(
+                List.of("PendingProjectAdminApiService1", "PendingProjectAdminApiService2")
+                        .contains(pendingProjectsList.getFirst().getProjectName()));
+        assertTrue(
+                List.of("PendingProjectAdminApiService1", "PendingProjectAdminApiService2")
+                        .contains(pendingProjectsList.getLast().getProjectName()));
+    }
+
+    @Test
+    void validateInexistantProject() {
+        ProjectDecision d = new ProjectDecision(-1, 0, 1);
+        assertThrows(ResponseStatusException.class, () -> this.adminApiService.validateProject(d));
+    }
+
+    @Test
+    void validateExistantProject() {
+        Project p =
+                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
+        this.projectService.addNewProject(p);
+        assertEquals(PENDING, p.getProjectStatus());
+        ProjectDecision d = new ProjectDecision(p.getIdProject(), administratorid, 1);
+        this.adminApiService.validateProject(d);
+        assertEquals(ACTIVE, p.getProjectStatus());
+
+        // Check if the project was really updated in the database
+        assertEquals(0, IterableToList(this.adminApiService.getPendingProjects()).size());
+    }
+
+    @Test
+    void refuseExistantProject() {
+        Project p =
+                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
+        this.projectService.addNewProject(p);
+        assertEquals(PENDING, p.getProjectStatus());
+        ProjectDecision d = new ProjectDecision(p.getIdProject(), administratorid, 0);
+        this.adminApiService.validateProject(d);
+        assertEquals(REJECTED, p.getProjectStatus());
+
+        // Check if the project was really updated in the database
+        assertEquals(0, IterableToList(this.adminApiService.getPendingProjects()).size());
+    }
+
+    @Test
+    void addProject() {
+        assertEquals(0, IterableToList(this.adminApiService.getPendingProjects()).size());
+        Project p1 =
+                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
+        this.adminApiService.addNewProject(p1);
+
+        assertEquals(1, IterableToList(this.adminApiService.getPendingProjects()).size());
+    }
+
+    @Test
+    void addProjectToAdmin() {
+        assertEquals(0, administrator.getListProject().size());
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(1, administrator.getListProject().size());
+    }
+
+    @Test
+    void addProjectToUser() {
+        assertNull(entrepreneur.getProjectParticipation());
+        Project p1 =
+                new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(p1, entrepreneur.getProjectParticipation());
+    }
+
+    @Test
+    void addProjectWithManyUsers() {
+        Entrepreneur e1 = new Entrepreneur();
+        Entrepreneur e2 = new Entrepreneur();
+        Entrepreneur e3 = new Entrepreneur();
+        assertNull(e1.getProjectParticipation());
+        assertNull(e2.getProjectParticipation());
+        assertNull(e3.getProjectParticipation());
+        Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
+        p1.updateListEntrepreneurParticipation(e1);
+        p1.updateListEntrepreneurParticipation(e2);
+        p1.updateListEntrepreneurParticipation(e3);
+        this.adminApiService.addNewProject(p1);
+        assertEquals(p1, e1.getProjectParticipation());
+        assertEquals(p1, e2.getProjectParticipation());
+        assertEquals(p1, e3.getProjectParticipation());
+    }
+
+    @Test
+    void addDuplicateProject() {
+        Project p1 =
+                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
+        Project p2 =
+                new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
+        this.adminApiService.addNewProject(p1);
+        assertThrows(ResponseStatusException.class, () -> this.adminApiService.addNewProject(p2));
+    }
+}

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

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

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

@@ -0,0 +1,10 @@
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=sa
+spring.sql.init.mode=never
+spring.application.name=myinpulse-test
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
+spring.jpa.hibernate.ddl-auto=update
+logging.pattern.console=%d{yyyy-MMM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n

config/.env.dev

@@ -0,0 +1,22 @@
+POSTGRES_DB=postgres_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres_db_user_password
+
+KEYCLOAK_ADMIN=admin
+KEYCLOAK_ADMIN_PASSWORD=admin
+KEYCLOAK_HOSTNAME=localhost
+KEYCLOAK_DB=keycloak_db
+KEYCLOAK_USER=keycloak_db_user
+KEYCLOAK_PASSWORD=keycloak_db_user_password
+
+BACKEND_DB=backend_db
+BACKEND_USER=backend_db_user
+BACKEND_PASSWORD=backend_db_user_password
+
+DATABASE_URL=localhost:5433
+
+VITE_KEYCLOAK_URL=http://localhost:7080
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_REALM=test
+VITE_APP_URL=http://localhost:5173
+VITE_BACKEND_URL=http://localhost:8081/

config/backdev.docker-compose.yaml

@@ -1,15 +1,14 @@
 services:
   postgres:
-    image: postgres:latest
+    env_file: .env
+    build:
+      context: postgres/
+      dockerfile: Dockerfile
     container_name: MyINPulse-DB
-    #ports:
-    #  - 5432:5432
+    ports:
+      - 5433:5432
     volumes:
-      - ./postgres:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      - ./postgres/data:/var/lib/postgresql/data
 
   keycloak:
     container_name: MyINPulse-keycloak

config/backdev.env

@@ -0,0 +1,22 @@
+POSTGRES_DB=postgres_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres_db_user_password
+
+KEYCLOAK_ADMIN=admin
+KEYCLOAK_ADMIN_PASSWORD=admin
+KEYCLOAK_HOSTNAME=localhost
+KEYCLOAK_DB=keycloak_db
+KEYCLOAK_USER=keycloak_db_user
+KEYCLOAK_PASSWORD=keycloak_db_user_password
+
+BACKEND_DB=backend_db
+BACKEND_USER=backend_db_user
+BACKEND_PASSWORD=backend_db_user_password
+
+DATABASE_URL=localhost:5433
+
+VITE_KEYCLOAK_URL=http://localhost:7080
+VITE_KEYCLOAK_CLIENT_ID=myinpulse
+VITE_KEYCLOAK_REALM=test
+VITE_APP_URL=http://localhost:8080
+VITE_BACKEND_URL=http://localhost:8081/

config/backdev.front.env

@@ -1,5 +0,0 @@
-VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=myinpulse
-VITE_KEYCLOAK_REALM=test
-VITE_APP_URL=http://localhost:8080
-VITE_BACKEND_URL=http://localhost:8081/

config/backdev.main.env

@@ -1,6 +0,0 @@
-POSTGRES_DB=keycloak_db
-POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=keycloak_db_user_password
-KEYCLOAK_ADMIN=admin
-KEYCLOAK_ADMIN_PASSWORD=admin
-KEYCLOAK_HOSTNAME=localhost

config/dev.docker-compose.yaml

@@ -0,0 +1,52 @@
+services:
+  postgres:
+    env_file: .env
+    build:
+      context: postgres/
+      dockerfile: Dockerfile
+    container_name: MyINPulse-DB
+    ports:
+      - 5433:5432
+    volumes:
+      - ./postgres/data:/var/lib/postgresql/data
+
+
+  keycloak:
+    container_name: MyINPulse-keycloak
+    build:
+      context: ./keycloak
+      dockerfile: Dockerfile
+      args:
+        KC_DB: postgres
+        KC_DB_URL: jdbc:postgresql://postgres/${POSTGRES_DB}
+        KC_DB_USERNAME: ${POSTGRES_USER}
+        KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
+    environment:
+      KC_HOSTNAME_PORT: 7080
+      KC_HOSTNAME_STRICT_BACKCHANNEL: "true"
+      KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN}
+      KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
+      KC_LOG_LEVEL: info
+    command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"]
+    ports:
+      - "7080:7080"
+      - "7443:7443"
+    depends_on:
+      - postgres
+
+  #front:
+  #  build:
+  #    context: ./front/
+  #    dockerfile: Dockerfile
+  #  container_name: MyINPulse-front
+  #  ports:
+  #    - "8080:80"
+
+  #back:
+  #  build:
+  #    context: ./MyINPulse-back/
+  #    dockerfile: Dockerfile
+  #  container_name: MyINPulse-back
+  #  ports:
+  #    - "8081:8080"
+  

config/dev.env

@@ -0,0 +1,22 @@
+POSTGRES_DB=postgres_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres_db_user_password
+
+KEYCLOAK_ADMIN=admin
+KEYCLOAK_ADMIN_PASSWORD=admin
+KEYCLOAK_HOSTNAME=localhost
+KEYCLOAK_DB=keycloak_db
+KEYCLOAK_USER=keycloak_db_user
+KEYCLOAK_PASSWORD=keycloak_db_user_password
+
+BACKEND_DB=backend_db
+BACKEND_USER=backend_db_user
+BACKEND_PASSWORD=backend_db_user_password
+
+DATABASE_URL=localhost:5433
+
+VITE_KEYCLOAK_URL=http://localhost:7080
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_REALM=test
+VITE_APP_URL=http://localhost:5173
+VITE_BACKEND_URL=http://localhost:8081/

config/frontdev.docker-compose.yaml

@@ -1,15 +1,15 @@
 services:
   postgres:
-    image: postgres:latest
+    env_file: .env
+    build:
+      context: postgres/
+      dockerfile: Dockerfile
     container_name: MyINPulse-DB
     #ports:
     #  - 5432:5432
     volumes:
-      - ./postgres:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      - ./postgres/data:/var/lib/postgresql/data
+
 
   keycloak:
     container_name: MyINPulse-keycloak

config/frontdev.env

@@ -0,0 +1,22 @@
+POSTGRES_DB=postgres_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres_db_user_password
+
+KEYCLOAK_ADMIN=admin
+KEYCLOAK_ADMIN_PASSWORD=admin
+KEYCLOAK_HOSTNAME=localhost
+KEYCLOAK_DB=keycloak_db
+KEYCLOAK_USER=keycloak_db_user
+KEYCLOAK_PASSWORD=keycloak_db_user_password
+
+BACKEND_DB=backend_db
+BACKEND_USER=backend_db_user
+BACKEND_PASSWORD=backend_db_user_password
+
+DATABASE_URL=MyINPulse-DB
+
+VITE_KEYCLOAK_URL=http://localhost:7080
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_REALM=test
+VITE_APP_URL=http://localhost:5173
+VITE_BACKEND_URL=http://localhost:8081/

config/frontdev.front.env

@@ -1,5 +0,0 @@
-VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
-VITE_KEYCLOAK_REALM=test
-VITE_APP_URL=http://localhost:5173
-VITE_BACKEND_URL=http://localhost:8081/

config/frontdev.main.env

@@ -1,6 +0,0 @@
-POSTGRES_DB=keycloak_db
-POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=keycloak_db_user_password
-KEYCLOAK_ADMIN=admin
-KEYCLOAK_ADMIN_PASSWORD=admin
-KEYCLOAK_HOSTNAME=localhost

config/prod.docker-compose.yaml

@@ -1,11 +1,14 @@
 services:
   postgres:
-    image: postgres:latest
+    env_file: .env
+    build:
+      context: postgres/
+      dockerfile: Dockerfile
     container_name: MyINPulse-DB
     #ports:
     #  - 5432:5432
     volumes:
-      - ./postgres:/var/lib/postgresql/data
+      - ./postgres/data:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}
@@ -27,10 +30,10 @@ services:
       KC_BOOTSTRAP_ADMIN_USERNAME: ${KEYCLOAK_ADMIN}
       KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
       KC_LOG_LEVEL: info
-    command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"]
-    ports:
-      - "7080:7080"
-      - "7443:7443"
+    command: ["start-dev", "--http-port", "7080", "--https-port", "7443", "--hostname", "${KEYCLOAK_HOSTNAME}"] # TODO: remove start-dev
+    #ports:
+    #  - "7080:7080"
+    #  - "7443:7443"
     depends_on:
       - postgres
 
@@ -47,6 +50,6 @@ services:
       context: ./MyINPulse-back/
       dockerfile: Dockerfile
     container_name: MyINPulse-back
-    ports:
-      - "8081:8080"
+    #ports:
+    #  - "8081:8080"
   

config/prod.env

@@ -0,0 +1,22 @@
+POSTGRES_DB=postgres_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres_db_user_password
+
+KEYCLOAK_ADMIN=admin
+KEYCLOAK_ADMIN_PASSWORD=admin
+KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr
+KEYCLOAK_DB=keycloak_db
+KEYCLOAK_USER=keycloak_db_user
+KEYCLOAK_PASSWORD=keycloak_db_user_password
+
+BACKEND_DB=backend_db
+BACKEND_USER=backend_db_user
+BACKEND_PASSWORD=backend_db_user_password
+
+DATABASE_URL=MyINPulse-DB
+
+VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr
+VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb
+VITE_KEYCLOAK_REALM=test
+VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev
+VITE_BACKEND_URL=http://TODO/

config/prod.front.env

@@ -1,5 +0,0 @@
-VITE_KEYCLOAK_URL=https://0549cd63f912d5dc9b31278d6f.eirb.fr
-VITE_KEYCLOAK_CLIENT_ID=myinpulse-eirb
-VITE_KEYCLOAK_REALM=test
-VITE_APP_URL=https://0549cd63f912d5dc9b31278d6f.piair.dev
-VITE_BACKEND_URL=http://TODO/

config/prod.main.env

@@ -1,6 +0,0 @@
-POSTGRES_DB=keycloak_db
-POSTGRES_USER=keycloak_db_user
-POSTGRES_PASSWORD=keycloak_db_user_password
-KEYCLOAK_ADMIN=admin
-KEYCLOAK_ADMIN_PASSWORD=admin
-KEYCLOAK_HOSTNAME=0549cd63f912d5dc9b31278d6f.eirb.fr

documentation/Doc.txt

@@ -0,0 +1,12 @@
+Format des comptes rendus de réunion :
+Texte organisé par bullet point, chaque bullet point est séparé par "//" pour pouvoir être correctement généré.
+
+Exemple :
+Le texte "// blablabla // oui bonjour"
+donne le résultat
+
+Point n°1 :
+  blablabla
+
+Point n°2 :
+  oui bonjour

front/MyINPulse-front/.gitignore

@@ -36,4 +36,4 @@ playwright-report/
 # Custom
 
 .installed
-package-lock.json
+./package-lock.json

front/MyINPulse-front/.prettierrc

@@ -0,0 +1,7 @@
+{
+  "useTabs":false,
+  "semi":true,
+  "trailingComma":"es5",
+  "arrowParens":"always",
+  "tabWidth":4
+}

front/MyINPulse-front/eslint.config.js

@@ -0,0 +1,29 @@
+import eslint from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import eslintPluginVue from "eslint-plugin-vue";
+import globals from "globals";
+import typescriptEslint from "typescript-eslint";
+
+export default typescriptEslint.config(
+    { ignores: ["*.d.ts", "**/coverage", "**/dist"] },
+    {
+        extends: [
+            eslint.configs.recommended,
+            ...typescriptEslint.configs.recommended,
+            ...eslintPluginVue.configs["flat/recommended"],
+        ],
+        files: ["**/*.{ts,vue}"],
+        languageOptions: {
+            ecmaVersion: "latest",
+            sourceType: "module",
+            globals: globals.browser,
+            parserOptions: {
+                parser: typescriptEslint.parser,
+            },
+        },
+        rules: {
+            // your rules
+        },
+    },
+    eslintConfigPrettier
+);

front/MyINPulse-front/fake_data/db.json

@@ -5,6 +5,59 @@
     { "id": 3, "name": "Charlie", "email": "charlie@example.com" }
   ],
   "data": [
-      { "canva_data": "this is a fake data to test api" }
+    {
+      "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/package.json

@@ -18,7 +18,8 @@
     "pinia": "^2.3.1",
     "pinia-plugin-persistedstate": "^4.2.0",
     "vue": "^3.5.13",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.5.0",
+    "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.49.1",
@@ -26,8 +27,15 @@
     "@types/node": "^22.10.7",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vue/tsconfig": "^0.7.0",
+    "eslint": "^9.20.0",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-vue": "^9.32.0",
+    "globals": "^15.14.0",
+    "jiti": "^2.4.2",
     "npm-run-all2": "^7.0.2",
+    "prettier": "3.5.0",
     "typescript": "~5.7.3",
+    "typescript-eslint": "^8.23.0",
     "vite": "^6.0.11",
     "vite-plugin-vue-devtools": "^7.7.0",
     "vue-tsc": "^2.2.0"

front/MyINPulse-front/src/App.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
-import { RouterLink, RouterView } from 'vue-router'
+import { /*RouterLink,*/ RouterView } from 'vue-router'
 import ErrorWrapper from "@/views/errorWrapper.vue";
 </script>
 
 <template>
 
 <Header />
-    <RouterLink to="/">Home</RouterLink> |
-    <RouterLink to="/canvas">Canvas</RouterLink>
+    <ErrorWrapper />
+    <!--<RouterLink to="/">Home</RouterLink> | -->
+    <!--<RouterLink to="/canvas">Canvas</RouterLink> -->
     <RouterView />
 </template>
 

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

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

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

@@ -2,12 +2,22 @@
     <div id="agenda">
         <h3>Rendez-vous</h3>
         <table>
+          <thead>
+            <tr>
+              <th>Projet</th>
+              <th>Date</th>
+              <th>Lieu</th>
+            </tr>
+          </thead>
           <tbody>
             <tr v-for="(p, index) in projectRDV" :key="index">
-                <td>{{ p.projectName }} </td> <td>{{ p.date }}</td> <td>{{ p.lieu }}</td>
+              <td>{{ p.projectName }}</td>
+              <td>{{ p.date }}</td>
+              <td>{{ p.lieu }}</td>
             </tr>
           </tbody>
         </table>
+
     </div>
 </template>
 
@@ -15,21 +25,35 @@
     import { defineProps } from "vue";
 
     interface rendezVous{
-        projectName: String,
-        date: String,
-        lieu: String,
+        projectName: string,
+        date: string,
+        lieu: string,
     }
     
     const props = defineProps<{
         projectRDV: rendezVous[]
     }>();
+    
 </script>
 
 <style scoped>
+
+  h3{
+    font-size: 1.5rem;
+    color: #333;
+    margin-bottom: 1.2rem;
+    border-bottom: 2px solid #ddd;
+    padding-bottom: 0.5rem;
+  }
+
  #agenda {
   padding: 20px;
+  background-color: white;
+  border-radius: 10px;
+  box-shadow: 0 4px 6px rgba(0,0,0,0.05);
 }
 
+
   /* Table Styling */
  table {
     width: 100%;
@@ -40,14 +64,14 @@
     border: 1px solid #ccc;
   }
   
-  /* Header Row (if exists) */
   th {
-    background-color: #f4f4f4;
+  background-color: #f0f2f5;
   padding: 12px;
-    font-weight: bold;
-    border: 1px solid #ccc;
+  font-weight: 600;
+  color: #333;
 }
 
+  
   /* Table Body Rows */
   tbody tr {
     border-bottom: 1px solid #ddd;

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

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 export default {
-    name: 'Header',
+    name: "HeaderComponent",
 };
 </script>
 

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

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

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

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

front/MyINPulse-front/src/components/Project-comp.vue

@@ -1,129 +0,0 @@
-<template>
-    <div @click="goToLink" class="project">
-        <div class="project-header">
-            <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 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/ProjectComponent.vue

@@ -0,0 +1,233 @@
+<template>
+    <div class="project" @click="goToLink" >
+        <div class="project-header">
+            <h2 >{{ projectName }}</h2>
+              <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"
+                      @click="contactSingle(email)"
+                    >
+                      {{ email }}
+                    </button>
+                  </div>
+                </div>
+              </div>
+
+        </div>
+        <div class="project-body">   
+            <ul>
+                <li v-for="(name, index) in listName" :key="index">{{ name }}</li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+
+
+<script setup lang="ts">
+import { defineProps } from "vue";
+import { useRouter } from 'vue-router'
+import { ref, onMounted } from "vue";
+import axios from "axios";
+const IS_MOCK_MODE = true;
+
+const props = defineProps<{
+    projectName: string;
+    listName: string[];
+    projectLink: string;
+    projectId: number;
+}>();
+
+const router = useRouter();
+
+const goToLink = () => {
+  if (props.projectLink) {
+    router.push(props.projectLink);
+  }
+ 
+};
+
+type Entrepreneur = {
+  idUser: number;
+  userSurname: string;
+  userName: string;
+  primaryMail: string;
+  secondaryMail: string;
+  phoneNumber: string;
+  school: string;
+  course: string;
+  sneeStatus: boolean;
+};
+
+const isDropdownOpen = ref(false);
+const entrepreneurEmails = ref<string[]>([]);
+
+const toggleDropdown = () => {
+  isDropdownOpen.value = !isDropdownOpen.value;
+  console.log("Dropdown toggled:", isDropdownOpen.value);
+};
+
+const fetchEntrepreneurs = async (projectId: number, useMock = IS_MOCK_MODE) => {
+  try {
+    const responseData: Entrepreneur[] = useMock
+      ? await mockFetchEntrepreneurs(projectId)
+      : (await axios.get(`http://localhost:5000/shared/projects/entrepreneurs/${projectId}`)).data;
+
+    if (responseData.length > 0) {
+      entrepreneurEmails.value = responseData.map((item: Entrepreneur) => item.primaryMail);
+    } else {
+      console.warn("Aucun entrepreneur trouvé.");
+    }
+  } catch (error) {
+    console.error("Erreur lors de la récupération des entrepreneurs :", error);
+  }
+};
+
+// Fonction de simulation de l'API
+const mockFetchEntrepreneurs = async (projectId :number) => {
+  console.log(`Mock fetch pour projectId: ${projectId}`);
+
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve([
+        {
+          idUser: 1,
+          userSurname: "Doe",
+          userName: "John",
+          primaryMail: "john.doe@example.com",
+          secondaryMail: "johndoe@backup.com",
+          phoneNumber: "612345678",
+          school: "ENSEIRB",
+          course: "Info",
+          sneeStatus: false
+        },
+        {
+          idUser: 2,
+          userSurname: "Smith",
+          userName: "Jane",
+          primaryMail: "jane.smith@example.com",
+          secondaryMail: "janesmith@backup.com",
+          phoneNumber: "698765432",
+          school: "ENSEIRB",
+          course: "Info",
+          sneeStatus: true
+        }
+      ]);
+    }, 500);
+  });
+};
+
+const contactAll = () => {
+  const allEmails = entrepreneurEmails.value.join(", ");
+  navigator.clipboard.writeText(allEmails)
+    .then(() => {
+      alert("Tous les emails copiés dans le presse-papiers !");
+      window.open("https://partage.bordeaux-inp.fr/", "_blank");
+    })
+    .catch(err => {
+      console.error("Erreur lors de la copie :", err);
+    });
+};
+
+const contactSingle = (email: string) => {
+  navigator.clipboard.writeText(email)
+    .then(() => {
+      alert(`Adresse copiée : ${email}`);
+      window.open("https://partage.bordeaux-inp.fr/", "_blank");
+    })
+    .catch(err => {
+      console.error("Erreur lors de la copie :", err);
+    });
+};
+
+onMounted(() => fetchEntrepreneurs(props.projectId, IS_MOCK_MODE));
+</script>
+
+
+<style scoped>
+.project {
+  background: linear-gradient(to right, #f8f9fb, #ffffff);
+  border: 1px solid #e0e0e0;
+  border-radius: 16px;
+  padding: 1.5rem;
+  margin: 1.5rem 0;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  transition: box-shadow 0.3s ease;
+  cursor: pointer;
+}
+
+.project:hover {
+  box-shadow: 0 6px 18px rgba(0, 0, 0, 0.08);
+}
+
+.project-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
+
+.project-header h2 {
+  font-size: 1.25rem;
+  color: #222;
+  margin: 0;
+  font-weight: 600;
+}
+
+.project-buttons {
+  display: flex;
+  gap: 0.5rem;
+}
+
+.contact-btn {
+  background-color: #007bff;
+  color: #fff;
+  padding: 0.5rem 1rem;
+  border: none;
+  border-radius: 8px;
+  font-size: 0.9rem;
+  font-weight: 500;
+  transition: background-color 0.2s ease, transform 0.2s ease;
+}
+
+.contact-btn:hover {
+  background-color: #0056b3;
+  transform: translateY(-2px);
+}
+
+.project-body {
+  margin-top: 1rem;
+}
+
+.project-body ul {
+  list-style-type: disc;
+  padding-left: 1.25rem;
+  margin: 0;
+}
+
+.project-body ul li {
+  font-size: 0.95rem;
+  color: #555;
+  line-height: 1.6;
+}
+
+
+  button {
+  padding: 10px 15px;
+  background-color: #007bff;
+  color: white;
+  border: none;
+  cursor: pointer;
+  border-radius: 5px;
+}
+  button:hover {
+    background-color: #0056b3;
+  }
+
+</style>

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

@@ -1,50 +1,233 @@
 <template>
-    <div :class="['cell', { expanded }]"
-    @click="toggleExpand"
-    :style="{ justifyContent: expanded ? 'flex-start' : 'center' }"> <!-- Looking for finding a way 
-                                                          to make this style in the toggleExpand event -->
+  <div :class="['cell', { expanded }]" @click="handleClick">
+    <h3 class="fs-5 fw-medium">{{ titleText }}</h3>
 
-      <h3>{{ title }}</h3>
-      <p>{{ currentDescription }}</p>
+    <div v-for="(desc, index) in currentDescriptions" :key="index" class="section-bloc">
+
+<!-- ADMIN -------------------------------------------------------------------------------------------->
+
+      <template v-if="IS_ADMIN">
+        <div class="description">
+          <p class="m-0">{{ desc }}</p>
+        </div>
+      </template>
+      
+<!-- ENTREP ------------------------------------------------------------------------------------------->
+      
+      <template v-if="!IS_ADMIN">
+        <!-- Mode affichage -->
+        <template v-if="!isEditing[index]">
+          <div class="description">
+            <p class="m-0">{{ desc }}</p>
+          </div>
+          <div class="button-container">
+            <button v-if="expanded" class="edit-button" @click.stop="startEditing(index)">Éditer</button>
+          </div>
+        </template>
+
+        <!-- Mode édition -->
+        <template v-else>
+          <textarea v-model="editedDescriptions[index]" class="edit-input"></textarea>
+          <div class="button-container">
+            <button class="save-button" @click.stop="saveEdit(index)">Enregistrer</button>
+            <button class="cancel-button" @click.stop="cancelEdit(index)">Annuler</button>
+          </div>
+        </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, onMounted } from "vue";
 import axios from "axios";
+import { axiosInstance } from "@/services/api.ts";
+
+const IS_MOCK_MODE = true; 
 
 const props = defineProps<{
-    title: string;
+  projectId: number;
+  title: number;
+  titleText: string;
   description: string;
+  isAdmin: number;
 }>();
 
-const expanded = ref(false);
-const currentDescription = ref(props.description);
+const IS_ADMIN = props.isAdmin;
 
+const expanded = ref(false);
+const currentDescriptions = ref<string[]>([]);
+currentDescriptions.value[0] = props.description;
+const editedDescriptions = ref<string[]>([]);
+const isEditing = ref<boolean[]>([]);
+
+onMounted(() => {
+  fetchData(props.projectId, props.title, "NaN", IS_MOCK_MODE);
+});
+
+
+/* FOR LOCAL DATABASE
 const fetchData = async () => {
   try {
-    const response = await axios.get("http://localhost:5000/data"); // Update the URL if needed
+    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
+/* FOR FETCHING WITH AXIOS DIRECTLY
+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 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 axiosInstance.get<{ txt: string }[]>(
+          `/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);
   }
 };
 
-const toggleExpand = async () => {
-  if (!expanded.value) {
-    await fetchData();
-  } else {
-    currentDescription.value = props.description;
-  }
-  expanded.value = !expanded.value;
+// 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."},
+      {txt: "Deuxième description."},
+      {txt: "Troisième description."}
+      ]);
+    }, 500); // Simule un délai réseau de 500ms
+  });
 };
 
-</script>
+// 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;
@@ -56,23 +239,30 @@ const toggleExpand = async () => {
   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: 20px;
+  font-size: 15px;
   font-weight: 500;
-    /*margin-bottom: 10px;*/
+  font-family: 'Arial', sans-serif;
 }
 
-.cell p {
-    font-size: 14px;
+.p {
+  font-size: 10px;
   color: #666;
+  font-family: 'Arial', sans-serif;
 }
 
 .expanded {
+  padding-top: 10%;
   position: fixed;
   top: 0;
   left: 0;
@@ -82,7 +272,125 @@ const toggleExpand = async () => {
   z-index: 10;
   display: flex;
   align-items: center;
-	justify-content: 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

@@ -1,98 +1,199 @@
 <template>
-  <header>
-    <img src="../icons/logo inpulse.png" alt="INPulse Logo">
-    <div class="header-buttons">
-      <div class="menu">
+  <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" v-bind:class="{ 'dropdown-visible': isDropdownOpen }">
-          <button @click="contactAll">Contact All</button>
-          <button v-for="(email, index) in entrepreneurEmails" :key="index">
+        <div class="contact-dropdown" :class="{ 'dropdown-visible': isDropdownOpen }">
+          <button @click="contactAll">Contacter tous</button>
+          <button
+            v-for="(email, index) in entrepreneurEmails"
+            :key="index"
+            @click="contactSingle(email)"
+          >
             {{ email }}
           </button>
         </div>
-        <button class="return-button">
-            <RouterLink to="/">Return to list project</RouterLink>
-        </button>
       </div>
+      <RouterLink to="/" class="return-button">Retour</RouterLink>
     </div>
   </header>
 </template>
 
 
-<script setup>
+<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 = {
+  idUser: number;
+  userSurname: string;
+  userName: string;
+  primaryMail: string;
+  secondaryMail: string;
+  phoneNumber: string;
+  school: string;
+  course: string;
+  sneeStatus: boolean;
+};
+
 const isDropdownOpen = ref(false);
-const entrepreneurEmails = ref([]);
+const entrepreneurEmails = ref<string[]>([]);
 
 const toggleDropdown = () => {
   isDropdownOpen.value = !isDropdownOpen.value;
-  console.log("Dropdown toggled:", isDropdownOpen.value); // for debug purposes
+  console.log("Dropdown toggled:", isDropdownOpen.value);
 };
 
-const fetchEntrepreneurs = async () => {
+const fetchEntrepreneurs = async (projectId: number, useMock = IS_MOCK_MODE) => {
   try {
-    const response = await axios.get("http://localhost:5000/entrepreneurs");
-    entrepreneurEmails.value = response.data.map(e => e.email);
+    const responseData: Entrepreneur[] = useMock
+      ? await mockFetchEntrepreneurs(projectId)
+      : (await axios.get(`http://localhost:5000/shared/projects/entrepreneurs/${projectId}`)).data;
+
+    if (responseData.length > 0) {
+      entrepreneurEmails.value = responseData.map((item: Entrepreneur) => item.primaryMail);
+    } else {
+      console.warn("Aucun entrepreneur trouvé.");
+    }
   } catch (error) {
     console.error("Erreur lors de la récupération des entrepreneurs :", error);
   }
 };
 
-const contactAll = () => {
-  alert("Contacter tous les entrepreneurs : " + entrepreneurEmails.value.join(", "));
+// 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);
+  });
 };
 
-onMounted(fetchEntrepreneurs);
-</script>
+const contactAll = () => {
+  const allEmails = entrepreneurEmails.value.join(", ");
+  navigator.clipboard.writeText(allEmails)
+    .then(() => {
+      alert("Tous les emails copiés dans le presse-papiers !");
+      window.open("https://partage.bordeaux-inp.fr/", "_blank");
+    })
+    .catch(err => {
+      console.error("Erreur lors de la copie :", err);
+    });
+};
 
+const contactSingle = (email: string) => {
+  navigator.clipboard.writeText(email)
+    .then(() => {
+      alert(`Adresse copiée : ${email}`);
+      window.open("https://partage.bordeaux-inp.fr/", "_blank");
+    })
+    .catch(err => {
+      console.error("Erreur lors de la copie :", err);
+    });
+};
+
+/*
+const copyToClipboard = (email: string) => {
+  navigator.clipboard.writeText(email).then(() => {
+    alert(`Adresse copiée : ${email}`);
+  }).catch(err => {
+    console.error("Erreur lors de la copie :", err);
+  });
+};
+*/
+
+onMounted(() => fetchEntrepreneurs(props.projectId, IS_MOCK_MODE));
+</script>
 
 <style scoped>
 @import "@/components/canvas/style-project.css";
 
-header {
+.header {
   display: flex;
   justify-content: space-between;
-  align-items: flex-start;
-  padding: 10px;
+  align-items: center;
+  padding: 15px 30px;
+  background-color: #f9f9f9;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 }
 
-.header-buttons {
+.logo {
+  height: 50px;
+}
+
+.header-actions {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
+  gap: 20px;
+  position: relative;
 }
 
-.menu {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-
-.contact-button, .return-button {
-  background-color: #000;
+.contact-button,
+.return-button {
+  background-color: #009CDE;
   color: white;
   border: none;
-  padding: 10px;
+  padding: 10px 15px;
   cursor: pointer;
   font-size: 14px;
-  text-align: center;
+  border-radius: 5px;
+  text-decoration: none;
+  transition: background-color 0.2s ease;
+  font-family: Arial, sans-serif;
 }
 
-.return-button a {
-  color: white;
-  text-decoration: none;
+.return-button:hover,
+.contact-button:hover {
+  background-color: #007bad;
 }
 
+
 .contact-dropdown {
-  display: none;
   position: absolute;
-  background-color: white;
-  box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
+  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 {
@@ -103,18 +204,16 @@ header {
   border: none;
   background: none;
   cursor: pointer;
+  color: white;
 }
 
 .contact-dropdown button:hover {
-  background-color: #f0f0f0;
+  background-color: #009CDE;
 }
 
-.dropdown-visible {
+.contact-dropdown.dropdown-visible {
   display: block;
 }
 
-header img {
-  width: 100px;
-  height: auto;
-}
+
 </style>

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

@@ -1,30 +1,52 @@
 <template>
-  <div class="canvas">
+  <div class="canvas container-fluid">  
     <CanvasItem
       v-for="(item, index) in items"
       :key="index"
       :title="item.title"
+      :title-text="item.title_text"
       :description="item.description"
-      :class="item.class"
+      :project-id="item.projectId"
+      :class="['canvas-item', item.class, 'card', 'shadow', 'p-3']"
+      :is-admin= props.isAdmin
     />
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import CanvasItem from "@/components/canvas/CanvasItem.vue";
 
+const props = defineProps<{
+  isAdmin: number;
+}>();
+
 const items = ref([
-  { title: "1. Problème", description: "3 problèmes essentiels à résoudre pour le client", class: "Probleme" },
-  { title: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },
-  { title: "3. Valeur", description: "La proposition de valeur", class: "Valeur" },
-  { title: "4. Solution", description: "Les solutions proposées", class: "Solution" },
-  { title: "5. Avantage", description: "Les avantages concurrentiels", class: "Avantage" },
-  { title: "6. Canaux", description: "Les canaux de distribution", class: "Canaux" },
-  { title: "7. Indicateurs", description: "Les indicateurs clés de performance", class: "Indicateurs" },
-  { title: "8. Coûts", description: "Les coûts associés", class: "Couts" },
-  { title: "9. Revenus", description: "Les sources de revenus", class: "Revenus" }
+  { projectId: 1, title: 1, title_text: "1. Problème", description: "3 problèmes essentiels à résoudre pour le client", class: "Probleme" },
+  { projectId: 1, title: 2, title_text: "2. Segments", description: "Les segments de clientèle visés", class: "Segments" },
+  { projectId: 1, title: 3, title_text: "3. Valeur", description: "La proposition de valeur", class: "Valeur" },
+  { projectId: 1, title: 4, title_text: "4. Solution", description: "Les solutions proposées", class: "Solution" },
+  { projectId: 1, title: 5, title_text: "5. Avantage", description: "Les avantages concurrentiels", class: "Avantage" },
+  { projectId: 1, title: 6, title_text: "6. Canaux", description: "Les canaux de distribution", class: "Canaux" },
+  { projectId: 1, title: 7, title_text: "7. Indicateurs", description: "Les indicateurs clés de performance", class: "Indicateurs" },
+  { projectId: 1, title: 8, title_text: "8. Coûts", description: "Les coûts associés", class: "Couts" },
+  { projectId: 1, title: 9, title_text: "9. Revenus", description: "Les sources de revenus", class: "Revenus" }
 ]);
+
+onMounted(() => {
+  const bootstrapCss = document.createElement('link')
+  bootstrapCss.rel = 'stylesheet'
+  bootstrapCss.href = 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css'
+  bootstrapCss.integrity = 'sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+Fpc+NC'
+  bootstrapCss.crossOrigin = 'anonymous'
+  document.head.appendChild(bootstrapCss)
+
+  const bootstrapJs = document.createElement('script')
+  bootstrapJs.src = 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js'
+  bootstrapJs.integrity = 'sha384-mQ93S0EhrF4Z1nM+fTflmYf0DyzsY5j7F5H3WlClDD6H3WUJh6kxBkF3GDW8n1j6'
+  bootstrapJs.crossOrigin = 'anonymous'
+  document.body.appendChild(bootstrapJs)
+})
 </script>
 
 <style scoped>
@@ -34,13 +56,11 @@ const items = ref([
   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; 
+  gap: 12px;
+  padding: 30px;
+  /*background-color: #f8f9fa;*/
   position: relative;
-  height: 80vh;
+  height: 90vh;
   overflow: auto;
 }
 
@@ -53,4 +73,10 @@ const items = ref([
 .Indicateurs { grid-column: 3 / 5; grid-row: 3 / 5; }
 .Couts { grid-column: 1 / 6; grid-row: 5 / 7; }
 .Revenus { grid-column: 6 / 11; grid-row: 5 / 7; }
+
+.canvas-item {
+  /*background-color: white;*/
+  border: 1px solid #dee2e6;
+  border-radius: 0.5rem;
+}
 </style>

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

@@ -1,12 +1,38 @@
 <script setup lang="ts">
-const props = defineProps(['data']);
+import { color } from "@/services/popupDisplayer.ts";
+import type { PropType } from "vue";
+
+defineProps({
+    errorMessage: {
+        type: Object as PropType<string>,
+        required: true,
+    },
+    errorColor: {
+        type: Object as PropType<color>,
+        default: color.Red,
+    },
+});
 </script>
 
 <template>
-  <div :class='["red", "yellow", "blue", "green"][data.type]' class="error-modal">
-    <p>{{["Erreur :(", "Warning :|", "Info :)", "Succes ;)"][data.type]}}</p>
-    <p>{{data.errorMessage}}</p>
-    <div class="loading" :class='["red-loader", "yellow-loader", "blue-loader", "green-loader"][data.type]'></div>
+    <div
+        :class="['red', 'yellow', 'blue', 'green'][errorColor]"
+        class="error-modal"
+    >
+        <p>
+            {{
+                ["Erreur :(", "Warning :|", "Info :)", "Succes ;)"][errorColor]
+            }}
+        </p>
+        <p>{{ errorMessage }}</p>
+        <div
+            class="loading"
+            :class="
+                ['red-loader', 'yellow-loader', 'blue-loader', 'green-loader'][
+                    errorColor
+                ]
+            "
+        ></div>
     </div>
 </template>
 
@@ -25,14 +51,16 @@ const props = defineProps(['data']);
     background-color: #ee6055;
     color: white;
 }
+
 .red-loader {
     background-color: #fa8383;
 }
 
 .yellow {
-    background-color: #FF9D23;
+    background-color: #ff9d23;
     color: white;
 }
+
 .yellow-loader {
     background-color: #ffbf81;
 }
@@ -41,6 +69,7 @@ const props = defineProps(['data']);
     background-color: #809bce;
     color: white;
 }
+
 .blue-loader {
     background-color: #95b8d1;
 }
@@ -49,6 +78,7 @@ const props = defineProps(['data']);
     background-color: green;
     color: white;
 }
+
 .green-loader {
     background-color: darkgreen;
 }

front/MyINPulse-front/src/components/temp-modal.vue

@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { addNewMessage } from "@/services/popupDisplayer.ts";
+</script>
+
+<template>
+    <button
+        @click="
+            addNewMessage(
+                'new error from another view',
+                Math.floor(Math.random() * 4)
+            )
+        "
+    >
+        Add an error
+    </button>
+</template>
+
+<style scoped></style>

front/MyINPulse-front/src/main.ts

@@ -1,36 +1,36 @@
-import { createApp } from 'vue'
-import App from './App.vue'
-import router from './router/router.ts'
+import { createApp } from "vue";
+import App from "./App.vue";
+import router from "./router/router.ts";
 import { createPinia } from "pinia";
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
-import AuthStorePlugin from './plugins/authStore';
-import keycloakService from './services/keycloak';
-import {useAuthStore} from "@/stores/authStore.ts";
-let store: any;
+import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
+import keycloakService from "./services/keycloak";
+import { type AuthStore, useAuthStore } from "@/stores/authStore.ts";
+
+let store: AuthStore;
 
 keycloakService.CallInit(() => {
     try {
-        const app = createApp(App)
+        const app = createApp(App);
 
         // Setup pinia store, allowing user to keep logged in status after refresh
         const pinia = createPinia();
         pinia.use(piniaPluginPersistedstate);
         app.use(pinia);
-        app.use(AuthStorePlugin, { pinia });
         store = useAuthStore();
-        app.use(router)
+        keycloakService.CallInitStore(store);
+        app.use(router);
 
-        app.mount('#app');
+        app.mount("#app");
     } catch (e) {
-        console.error("Error while initiating Keycloak.")
-        console.error(e)
-        createApp(App).mount('#app');
+        console.error("Error while initiating Keycloak.");
+        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');
+//createApp(App).use(router).mount('#app');
 
 // TODO: fix the comment
 /*

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

@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory } from "vue-router";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -9,9 +9,13 @@ const router = createRouter({
       // 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/test.vue'),
+      component: () => import('../views/testComponent.vue'),
+    },
+    {
+      path: '/login',
+      name: 'login',
+      component: () => import('../components/LoginComponent.vue'),
     },
-
     {
       path: '/',
       name: 'Admin-main',
@@ -24,7 +28,19 @@ const router = createRouter({
       name: 'canvas',
       component: () => import('../views/CanvasView.vue'),
     },
+
+    {
+      path: '/signup',
+      name: 'signup',
+      component: () => import('../views/EntrepSignUp.vue'),
+    },
+
+    {
+      path: '/JorCproject',
+      name: 'JorCproject',
+      component: () => import('../views/JoinOrCreatProjectForEntrep.vue'),
+    },
   ],
 })
 
-export default router
+export default router;

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

@@ -1,31 +1,37 @@
-import axios from "axios";
+import axios, { type AxiosError, type AxiosResponse } from "axios";
 import { store } from "@/main.ts";
 import { addNewMessage, color } from "@/services/popupDisplayer.ts";
 
 const axiosInstance = axios.create({
     baseURL: import.meta.env.VITE_BACKEND_URL,
     headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
     },
 });
 
 axiosInstance.interceptors.response.use(
-    response => response, // Directly return successful responses.
-    async error => {
+    (response) => response, // Directly return successful responses.
+    async (error) => {
         const originalRequest = error.config;
-        if (error.response.status === 401 && !originalRequest._retry && store.authenticated) {
+        if (
+            ((error.response && error.response.status === 401) ||
+                error.code == "ERR_NETWORK") &&
+            !originalRequest._retry &&
+            store.authenticated
+        ) {
             originalRequest._retry = true; // Mark the request as retried to avoid infinite loops.
             try {
                 await store.refreshUserToken();
                 // Update the authorization header with the new access token.
-                axiosInstance.defaults.headers.common['Authorization'] = `Bearer ${store.user.token}`;
+                axiosInstance.defaults.headers.common["Authorization"] =
+                    `Bearer ${store.user.token}`;
                 return axiosInstance(originalRequest); // Retry the original request with the new access token.
             } catch (refreshError) {
                 // Handle refresh token errors by clearing stored tokens and redirecting to the login page.
-                console.error('Token refresh failed:', refreshError);
-                localStorage.removeItem('accessToken');
-                localStorage.removeItem('refreshToken');
-                window.location.href = '/login';
+                console.error("Token refresh failed:", refreshError);
+                localStorage.removeItem("accessToken");
+                localStorage.removeItem("refreshToken");
+                window.location.href = "/login";
                 return Promise.reject(refreshError);
             }
         }
@@ -34,23 +40,53 @@ axiosInstance.interceptors.response.use(
 );
 
 // TODO: spawn a error modal
-function defaultApiErrorHandler(err: string){
-    addNewMessage(err, color.Red);
+function defaultApiErrorHandler(err: AxiosError) {
+    addNewMessage(err.message, color.Red);
 }
 
-function defaultApiSuccessHandler(response: any){
-    addNewMessage(response.data, color.green)
-}
-function callApi(endpoint: string, onSuccessHandler?: any, onErrorHandler?: any): void {
-    axiosInstance.get(endpoint).then(
-        onSuccessHandler == null ? defaultApiSuccessHandler : onSuccessHandler
-    ).catch(
-        (err) => {
-            onErrorHandler == null ? defaultApiErrorHandler(err): onErrorHandler(err);
-            throw err;
+function defaultApiSuccessHandler(response: AxiosResponse) {
+    addNewMessage(response.data, color.Green);
 }
+
+function callApi(
+    endpoint: string,
+    onSuccessHandler?: (response: AxiosResponse) => void,
+    onErrorHandler?: (error: AxiosError) => void
+): void {
+    axiosInstance
+        .get(endpoint)
+        .then(
+            onSuccessHandler == null
+                ? defaultApiSuccessHandler
+                : onSuccessHandler
         )
+        .catch(
+            onErrorHandler == null ? defaultApiErrorHandler : onErrorHandler
+        );
+}
+
+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}
+export { axiosInstance, callApi, postApi, deleteApi };

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

@@ -1,11 +1,11 @@
-import Keycloak from 'keycloak-js';
+import Keycloak from "keycloak-js";
+import type { AuthStore } from "@/stores/authStore.ts";
 
 const options = {
     url: import.meta.env.VITE_KEYCLOAK_URL,
     clientId: import.meta.env.VITE_KEYCLOAK_CLIENT_ID,
-    realm: import.meta.env.VITE_KEYCLOAK_REALM
-}
-
+    realm: import.meta.env.VITE_KEYCLOAK_REALM,
+};
 
 const keycloak = new Keycloak(options);
 let authenticated: boolean | undefined;
@@ -13,21 +13,19 @@ let store = null;
 
 async function login() {
     try {
-        await keycloak.login() // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
+        await keycloak.login(); // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
         return keycloak;
     } catch (error) {
-        console.log(error)
+        console.log(error);
     }
 }
 
 async function signup() {
     try {
-        await keycloak.login(
-            {action: "register"}
-        ) // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
+        await keycloak.login({ action: "register" }); // https://www.keycloak.org/securing-apps/javascript-adapter#:~:text=when%20initialization%20completes.-,login(options),-Redirects%20to%20login
         return keycloak;
     } catch (error) {
-        console.log(error)
+        console.log(error);
     }
 }
 
@@ -42,31 +40,33 @@ async function init(onInitCallback: () => void) {
             onLoad: "check-sso",
             silentCheckSsoRedirectUri: `${location.origin}/silent-check-sso.htm`,
             responseMode: "query",
-        })
-        onInitCallback()
+        });
+        onInitCallback();
     } catch (error) {
-        console.error("Keycloak init failed")
-        console.error(error)
+        console.error("Keycloak init failed");
+        console.error(error);
+    }
 }
-};
 
 /**
  * Initializes store with Keycloak user data
  *
  */
-async function initStore(storeInstance: any) {
+async function initStore(storeInstance: AuthStore) {
     try {
-        store = storeInstance
-        console.log(keycloak)
-        await store.initOauth(keycloak)
+        store = storeInstance;
+        console.log(keycloak);
+        await store.initOauth(keycloak);
 
         // Show alert if user is not authenticated
-        if (!authenticated) { console.warn("not authenticated") }
-    } catch (error) {
-        console.error("Keycloak init failed")
-        console.error(error)
+        if (!authenticated) {
+            console.warn("not authenticated");
+        }
+    } catch (error) {
+        console.error("Keycloak init failed");
+        console.error(error);
+    }
 }
-};
 
 /**
  * Logout user
@@ -83,7 +83,7 @@ async function refreshToken() {
         await keycloak.updateToken(480);
         return keycloak;
     } catch (error) {
-        console.error('Failed to refresh token');
+        console.error("Failed to refresh token");
         console.error(error);
     }
 }

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

@@ -1,5 +1,24 @@
-import {ref} from "vue";
-enum color {Red, Yellow, Blue, green}
+import { ref, type Ref } from "vue";
+
+enum color {
+    Red,
+    Yellow,
+    Blue,
+    Green,
+}
+
+type ErrorMessageContent = {
+    message: string;
+    color: color;
+    id: number;
+    timeout: number;
+};
+
+let id: number = 0;
+const getId = () => {
+    id = id + 1;
+    return id;
+};
 
 function addNewMessage(errorMessage: string, type?: color, timeout?: number) {
     if (timeout == null) {
@@ -9,11 +28,16 @@ function addNewMessage(errorMessage: string, type?: color, timeout?: number){
         type = color.Red;
     }
 
-    const data = {errorMessage: errorMessage, timeout: timeout, type: type, uid: Math.random()*100000};
-    errorList.value.push(data)
-    setTimeout(() => errorList.value.slice(0, 1), timeout)
+    const data: ErrorMessageContent = {
+        message: errorMessage,
+        timeout: timeout,
+        color: type,
+        id: getId(),
+    };
+    errorList.value.push(data);
+    setTimeout(() => errorList.value.slice(0, 1), timeout);
 }
 
-const errorList: any= ref([])
+const errorList: Ref<ErrorMessageContent[]> = ref([]);
 
-export {addNewMessage, errorList, color}
+export { addNewMessage, errorList, color, type ErrorMessageContent };

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

@@ -1,27 +1,34 @@
 import { defineStore } from "pinia";
-import keycloakService from '@/services/keycloak';
+import keycloakService from "@/services/keycloak";
 import type Keycloak from "keycloak-js";
-export const useAuthStore = defineStore("storeAuth", {
+
+const useAuthStore = defineStore("storeAuth", {
     state: () => {
         return {
-            testv: true,
             authenticated: false,
             user: {
                 token: "",
                 refreshToken: "",
                 username: "",
             },
-        }
+        };
     },
     persist: true,
     getters: {},
     actions: {
         // Initialize Keycloak OAuth
         async initOauth(keycloak: Keycloak, clearData = true) {
-            if(clearData) { await this.clearUserData(); }
+            if (clearData) {
+                await this.clearUserData();
+            }
 
             this.authenticated = !!keycloak.authenticated; // the !! removes undefined
-            if (this.authenticated && keycloak.token && keycloak.idTokenParsed && keycloak.refreshToken){
+            if (
+                this.authenticated &&
+                keycloak.token &&
+                keycloak.idTokenParsed &&
+                keycloak.refreshToken
+            ) {
                 this.user.username = keycloak.idTokenParsed.given_name;
                 this.user.token = keycloak.token;
                 this.user.refreshToken = keycloak.refreshToken;
@@ -30,25 +37,25 @@ export const useAuthStore = defineStore("storeAuth", {
         async login() {
             try {
                 const keycloak = await keycloakService.callLogin();
-                if (keycloak)
-                    await this.initOauth(keycloak);
+                if (keycloak) await this.initOauth(keycloak);
             } catch (error) {
-                console.log(error)
+                console.log(error);
             }
         },
         async signup() {
             try {
                 const keycloak = await keycloakService.callSignup();
-                if (keycloak)
-                    await this.initOauth(keycloak);
+                if (keycloak) await this.initOauth(keycloak);
             } catch (error) {
-                console.log(error)
+                console.log(error);
             }
         },
         // Logout user
         async logout() {
             try {
-                await keycloakService.CallLogout(import.meta.env.VITE_APP_URL + "/test");
+                await keycloakService.CallLogout(
+                    import.meta.env.VITE_APP_URL + "/login" //redirect to login page instead of test...
+                );
                 await this.clearUserData();
             } catch (error) {
                 console.error(error);
@@ -58,15 +65,11 @@ export const useAuthStore = defineStore("storeAuth", {
         async refreshUserToken() {
             try {
                 const keycloak = await keycloakService.CallTokenRefresh();
-                if (keycloak)
-                    await this.initOauth(keycloak, false);
+                if (keycloak) await this.initOauth(keycloak, false);
             } catch (error) {
                 console.error(error);
             }
         },
-        test() {
-            this.testv = !this.testv;
-        },
         // Clear user's store data
         clearUserData() {
             this.authenticated = false;
@@ -75,6 +78,10 @@ export const useAuthStore = defineStore("storeAuth", {
                 refreshToken: "",
                 username: "",
             };
-        }
-    }
+        },
+    },
 });
+
+type AuthStore = ReturnType<typeof useAuthStore>;
+
+export { useAuthStore, type AuthStore };