Merge remote-tracking branch 'origin/master' into release/current

guillaumejparis · guillaumejparis · commit 1bb103032796 · 2025-11-24T09:23:13.000+01:00
diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1,12 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 50%
+        threshold: 0
+        informational: true
+    patch:
+      default:
+        target: 50%
+        threshold: 0
+        informational: true
diff --git a/.drone.yml b/.drone.yml
@@ -21,6 +21,8 @@ steps:
       - mvn clean install -q -DskipTests
       - cd openaev-api
       - mvn test
+      - echo "Running coverage validation..."
+      - mvn jacoco:check || echo "⚠️ Coverage threshold check ⚠️"
       - cd ../openaev-framework
       - mvn test
 
diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/validate-pr-title.yml
@@ -20,7 +20,7 @@ jobs:
           
           # Regex for:
           # [category/subcategory] type(scope?): description (#123?)
-          PATTERN='^\[([a-z]+(/[a-z]+)*)\] (feat|fix|chore|docs|style|refactor|perf|test|build|ci|revert)(\([a-z]+\))?: [a-z].*( \(#[0-9]+\))$'
+          PATTERN='^\[([a-z]+(/[a-z]+)*)\] (feat|fix|chore|docs|style|refactor|perf|test|build|ci|revert)(\([a-z-]+\))?: [a-z].*( \(#[0-9]+\))$'
           
           if [[ ! "$TITLE" =~ $PATTERN ]]; then
             echo "❌ Invalid PR title."
diff --git a/openaev-api/pom.xml b/openaev-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.openaev</groupId>
         <artifactId>openaev-platform</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
 
     <artifactId>openaev-api</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>io.openaev</groupId>
             <artifactId>openaev-framework</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
         </dependency>
         <dependency>
             <groupId>co.elastic.clients</groupId>
@@ -326,6 +326,26 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco-plugin.version}</version>
+                <configuration>
+                    <haltOnFailure>false</haltOnFailure>
+                    <rules>
+                        <rule>
+                            <element>BUNDLE</element>
+                            <limits>
+                                <limit>
+                                    <counter>LINE</counter>
+                                    <value>COVEREDRATIO</value>
+                                    <minimum>0.50</minimum> <!-- 50% minimum coverage -->
+                                </limit>
+                                <limit>
+                                    <counter>BRANCH</counter>
+                                    <value>COVEREDRATIO</value>
+                                    <minimum>0.30</minimum>
+                                </limit>
+                            </limits>
+                        </rule>
+                    </rules>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -339,6 +359,14 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <!-- Enforce coverage threshold -->
+                    <execution>
+                        <id>check</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/openaev-api/src/main/java/io/openaev/rest/challenge/SimulationChallengeApi.java b/openaev-api/src/main/java/io/openaev/rest/challenge/SimulationChallengeApi.java
@@ -62,10 +62,7 @@ public Iterable<ChallengeOutput> exerciseChallenges(
   }
 
   @PostMapping("/api/player/challenges/{exerciseId}/{challengeId}/validate")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.WRITE,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   @jakarta.transaction.Transactional(rollbackOn = Exception.class)
   public SimulationChallengesReader validateChallenge(
       @PathVariable String exerciseId,
@@ -84,10 +81,7 @@ public SimulationChallengesReader validateChallenge(
   }
 
   @GetMapping("/api/player/simulations/{simulationId}/documents")
-  @RBAC(
-      resourceId = "#simulationId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public List<Document> playerDocuments(
       @PathVariable String simulationId, @RequestParam Optional<String> userId) {
     Optional<Exercise> exerciseOpt = this.exerciseRepository.findById(simulationId);
@@ -125,10 +119,7 @@ public SimulationChallengesReader observerChallenges(@PathVariable String simula
   }
 
   @GetMapping("/api/player/simulations/{simulationId}/challenges")
-  @RBAC(
-      resourceId = "#simulationId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public SimulationChallengesReader playerChallenges(
       @PathVariable String simulationId, @RequestParam Optional<String> userId) {
     final User user = impersonateUser(userRepository, userId);
diff --git a/openaev-api/src/main/java/io/openaev/rest/channel/ChannelApi.java b/openaev-api/src/main/java/io/openaev/rest/channel/ChannelApi.java
@@ -145,10 +145,7 @@ public ChannelReader observerArticles(
   }
 
   @GetMapping("/api/player/channels/{exerciseId}/{channelId}")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public ChannelReader playerArticles(
       @PathVariable String exerciseId,
       @PathVariable String channelId,
diff --git a/openaev-api/src/main/java/io/openaev/rest/comcheck/ComcheckApi.java b/openaev-api/src/main/java/io/openaev/rest/comcheck/ComcheckApi.java
@@ -47,7 +47,7 @@ public void setExerciseRepository(ExerciseRepository exerciseRepository) {
   }
 
   @GetMapping("/api/comcheck/{comcheckStatusId}")
-  @RBAC(actionPerformed = Action.READ, resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   @Transactional(rollbackOn = Exception.class)
   public ComcheckStatus checkValidation(@PathVariable String comcheckStatusId) {
     ComcheckStatus comcheckStatus =
diff --git a/openaev-api/src/main/java/io/openaev/rest/document/DocumentApi.java b/openaev-api/src/main/java/io/openaev/rest/document/DocumentApi.java
@@ -557,10 +557,7 @@ public void deleteDocument(@PathVariable String documentId) {
 
   // -- EXERCISE & SENARIO--
   @GetMapping("/api/player/{exerciseOrScenarioId}/documents")
-  @RBAC(
-      resourceId = "#exerciseOrScenarioId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION_OR_SCENARIO)
+  @RBAC(skipRBAC = true)
   public List<Document> playerDocuments(
       @PathVariable String exerciseOrScenarioId, @RequestParam Optional<String> userId) {
     Optional<Exercise> exerciseOpt = this.exerciseRepository.findById(exerciseOrScenarioId);
@@ -589,10 +586,7 @@ public List<Document> playerDocuments(
   }
 
   @GetMapping("/api/player/{exerciseOrScenarioId}/documents/{documentId}/file")
-  @RBAC(
-      resourceId = "#exerciseOrScenarioId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION_OR_SCENARIO)
+  @RBAC(skipRBAC = true)
   public void downloadPlayerDocument(
       @PathVariable String exerciseOrScenarioId,
       @PathVariable String documentId,
diff --git a/openaev-api/src/main/java/io/openaev/rest/exercise/ExercisePlayerApi.java b/openaev-api/src/main/java/io/openaev/rest/exercise/ExercisePlayerApi.java
@@ -1,9 +1,7 @@
 package io.openaev.rest.exercise;
 
 import io.openaev.aop.RBAC;
-import io.openaev.database.model.Action;
 import io.openaev.database.model.Exercise;
-import io.openaev.database.model.ResourceType;
 import io.openaev.database.repository.ExerciseRepository;
 import io.openaev.database.repository.UserRepository;
 import io.openaev.rest.exception.ElementNotFoundException;
@@ -26,10 +24,7 @@ public class ExercisePlayerApi extends RestBehavior {
   private final ExerciseRepository exerciseRepository;
 
   @GetMapping(EXERCISE_URI + "/{exerciseId}")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public PublicExercise playerExercise(
       @PathVariable String exerciseId, @RequestParam Optional<String> userId) {
     impersonateUser(this.userRepository, userId);
diff --git a/openaev-api/src/main/java/io/openaev/rest/lessons/ExerciseLessonsApi.java b/openaev-api/src/main/java/io/openaev/rest/lessons/ExerciseLessonsApi.java
@@ -334,21 +334,15 @@ public List<LessonsAnswer> exerciseLessonsAnswers(
   }
 
   @GetMapping("/api/player/lessons/exercise/{exerciseId}/lessons_categories")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public List<LessonsCategory> playerLessonsCategories(
       @PathVariable String exerciseId, @RequestParam Optional<String> userId) {
     impersonateUser(userRepository, userId); // Protection for ?
     return lessonsCategoryRepository.findAll(LessonsCategorySpecification.fromExercise(exerciseId));
   }
 
   @GetMapping("/api/player/lessons/exercise/{exerciseId}/lessons_questions")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public List<LessonsQuestion> playerLessonsQuestions(
       @PathVariable String exerciseId, @RequestParam Optional<String> userId) {
     impersonateUser(userRepository, userId); // Protection for ?
@@ -364,10 +358,7 @@ public List<LessonsQuestion> playerLessonsQuestions(
   }
 
   @GetMapping("/api/player/lessons/exercise/{exerciseId}/lessons_answers")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public List<LessonsAnswer> playerLessonsAnswers(
       @PathVariable String exerciseId, @RequestParam Optional<String> userId) {
     impersonateUser(userRepository, userId); // Protection for ?
@@ -391,10 +382,7 @@ public List<LessonsAnswer> playerLessonsAnswers(
 
   @PostMapping(
       "/api/player/lessons/exercise/{exerciseId}/lessons_categories/{lessonsCategoryId}/lessons_questions/{lessonsQuestionId}/lessons_answers")
-  @RBAC(
-      resourceId = "#exerciseId",
-      actionPerformed = Action.WRITE,
-      resourceType = ResourceType.SIMULATION)
+  @RBAC(skipRBAC = true)
   public LessonsAnswer createExerciseLessonsQuestion(
       @PathVariable String exerciseId,
       @PathVariable String lessonsQuestionId,
diff --git a/openaev-api/src/main/java/io/openaev/rest/scenario/ScenarioChallengesApi.java b/openaev-api/src/main/java/io/openaev/rest/scenario/ScenarioChallengesApi.java
@@ -38,10 +38,7 @@ public List<Document> getScenarioPlayerDocuments(Scenario scenario) {
   }
 
   @GetMapping("/api/player/scenarios/{scenarioId}/documents")
-  @RBAC(
-      resourceId = "#scenarioId",
-      actionPerformed = Action.READ,
-      resourceType = ResourceType.SCENARIO)
+  @RBAC(skipRBAC = true)
   public List<Document> playerDocuments(
       @PathVariable String scenarioId, @RequestParam Optional<String> userId) {
     Optional<Scenario> scenarioOpt = this.scenarioRepository.findById(scenarioId);
diff --git a/openaev-api/src/main/java/io/openaev/rest/user/PlayerApi.java b/openaev-api/src/main/java/io/openaev/rest/user/PlayerApi.java
@@ -59,7 +59,7 @@ public Page<PlayerOutput> players(
   }
 
   @GetMapping("/api/player/{userId}/communications")
-  @RBAC(resourceId = "#userId", actionPerformed = Action.READ, resourceType = ResourceType.PLAYER)
+  @RBAC(skipRBAC = true)
   public Iterable<Communication> playerCommunications(@PathVariable String userId) {
     return communicationRepository.findByUser(userId);
   }
diff --git a/openaev-framework/pom.xml b/openaev-framework/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.openaev</groupId>
         <artifactId>openaev-platform</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
 
     <artifactId>openaev-framework</artifactId>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>io.openaev</groupId>
             <artifactId>openaev-model</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
         </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>
diff --git a/openaev-front/package.json b/openaev-front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openaev-front",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "private": true,
   "main": "src/index.tsx",
   "license": "Apache-2.0",
diff --git a/openaev-model/pom.xml b/openaev-model/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.openaev</groupId>
         <artifactId>openaev-platform</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
 
     <artifactId>openaev-model</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>io.openaev</groupId>
     <artifactId>openaev-platform</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>pom</packaging>
 
     <name>OpenAEV platform</name>
diff --git a/renovate.json b/renovate.json

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void setExerciseRepository(ExerciseRepository exerciseRepository) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@GetMapping("/api/comcheck/{comcheckStatusId}")`
`50`		`- @RBAC(actionPerformed = Action.READ, resourceType = ResourceType.SIMULATION)`
	`50`	`+ @RBAC(skipRBAC = true)`
`51`	`51`	`@Transactional(rollbackOn = Exception.class)`
`52`	`52`	`public ComcheckStatus checkValidation(@PathVariable String comcheckStatusId) {`
`53`	`53`	`ComcheckStatus comcheckStatus =`