[backend] refact

OpenBAS-Platform · Oct 25, 2024 · bc3ae33 · bc3ae33
1 parent 5361ea0
commit bc3ae33
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java b/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java
@@ -638,7 +638,12 @@ public Page<ExerciseSimple> exercises(@RequestBody @Valid final SearchPagination
 
         if (currentUser().isAdmin()) {
             return buildPaginationCriteriaBuilder(
-                this.exerciseService::exercises,
+                (Specification<Exercise> specification, Specification<Exercise> specificationCount, Pageable pageable) -> this.exerciseService.exercises(
+                    findGrantedFor(currentUser().getId()).and(specification),
+                    findGrantedFor(currentUser().getId()).and(specificationCount),
+                    pageable,
+                    joinMap
+                ),
                     searchPaginationInput,
                     Exercise.class,
                     joinMap
@@ -648,7 +653,8 @@ public Page<ExerciseSimple> exercises(@RequestBody @Valid final SearchPagination
                     (Specification<Exercise> specification, Specification<Exercise> specificationCount, Pageable pageable) -> this.exerciseService.exercises(
                         findGrantedFor(currentUser().getId()).and(specification),
                         findGrantedFor(currentUser().getId()).and(specificationCount),
-                        pageable
+                        pageable,
+                        joinMap
                     ),
                     searchPaginationInput,
                     Exercise.class,

diff --git a/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java b/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java
@@ -1,10 +1,12 @@
 package io.openbas.rest.scenario;
 
 import io.openbas.aop.LogExecutionTime;
+import io.openbas.database.model.Base;
 import io.openbas.database.model.Exercise;
 import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.exercise.form.ExerciseSimple;
 import io.openbas.utils.pagination.SearchPaginationInput;
+import jakarta.persistence.criteria.Join;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
@@ -14,6 +16,9 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static io.openbas.database.model.User.ROLE_USER;
 import static io.openbas.database.specification.ExerciseSpecification.fromScenario;
 import static io.openbas.rest.scenario.ScenarioApi.SCENARIO_URI;
@@ -39,11 +44,13 @@ public Iterable<ExerciseSimple> scenarioExercises(@PathVariable @NotBlank final
   public Iterable<ExerciseSimple> scenarioExercises(
       @PathVariable @NotBlank final String scenarioId,
       @RequestBody @Valid final SearchPaginationInput searchPaginationInput) {
+    Map<String, Join<Base, Base>> joinMap = new HashMap<>();
     return buildPaginationCriteriaBuilder(
         (Specification<Exercise> specification, Specification<Exercise> specificationCount, Pageable pageable) -> this.exerciseService.exercises(
             fromScenario(scenarioId).and(specification),
             fromScenario(scenarioId).and(specificationCount),
-            pageable
+            pageable,
+            joinMap
         ),
         searchPaginationInput,
         Exercise.class