[backend] wip

OpenBAS-Platform · Oct 3, 2024 · e8455f5 · e8455f5
1 parent 1952a29
commit e8455f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/utils/AtomicTestingUtils.java b/openbas-api/src/main/java/io/openbas/utils/AtomicTestingUtils.java
@@ -504,9 +504,7 @@ public static List<InjectTargetWithResult> getTargetsWithResultsWithRawQueries(f
           .toList());
     }
 
-    List<String> injectAssetIds = inject.getInject_assets().stream()
-        .map(RawAsset::getAsset_id)
-        .collect(Collectors.toList());
+    List<String> injectAssetIds = inject.getInject_assets();
 
     assetsToRefine.removeAll(
         assetsToRemove

diff --git a/openbas-api/src/main/java/io/openbas/utils/ResultUtils.java b/openbas-api/src/main/java/io/openbas/utils/ResultUtils.java
@@ -4,8 +4,10 @@
 import io.openbas.database.model.Inject;
 import io.openbas.database.model.InjectExpectation;
 import io.openbas.database.raw.RawInjectExpectationForCompute;
+import io.openbas.database.raw.RawTeam;
 import io.openbas.database.repository.InjectExpectationRepository;
 import io.openbas.database.repository.InjectRepository;
+import io.openbas.database.repository.TeamRepository;
 import io.openbas.rest.atomic_testing.form.InjectTargetWithResult;
 import io.openbas.rest.inject.form.InjectExpectationResultsByAttackPattern;
 import io.openbas.utils.AtomicTestingMapper.ExpectationResultsByType;
@@ -68,9 +70,12 @@ public static List<InjectTargetWithResult> computeTargetResults(@NotNull List<In
         .toList();
   }
 
-  public static List<InjectTargetWithResult> computeTargetResultsWithRawExercise(@NotNull List<Inject> injects, InjectRepository injectRepository, InjectExpectationRepository injectExpectationRepository) {
+  public static List<InjectTargetWithResult> computeTargetResultsWithRawExercise(@NotNull List<Inject> injects, InjectRepository injectRepository, InjectExpectationRepository injectExpectationRepository, TeamRepository teamRepository) {
+    List<String> injectIds = injects.stream().map(Inject::getId).toList();
+    Map<String, RawTeam> teamMap = teamRepository.rawTeamByInjectIds(injectIds).stream().collect(Collectors.toMap(RawTeam::getTeam_id, team -> team));
+
     return injects.stream()
-        .flatMap(inject -> getTargetsWithResultsWithRawQueries(inject.getId(), injectRepository, injectExpectationRepository).stream())
+        .flatMap(inject -> getTargetsWithResultsWithRawQueries(inject.getId(), injectRepository, injectExpectationRepository, teamMap, mapAssets, mapAssetsGroups).stream())
         .distinct()
         .toList();
   }

diff --git a/openbas-model/src/main/java/io/openbas/database/repository/TeamRepository.java b/openbas-model/src/main/java/io/openbas/database/repository/TeamRepository.java
@@ -52,6 +52,12 @@ public interface TeamRepository extends CrudRepository<Team, String>,
           "WHERE team_id IN :ids ;", nativeQuery = true)
   List<RawTeam> rawTeamByIds(@Param("ids") List<String> ids);
 
+  @Query(value="SELECT DISTINCT( team_id, team_name) "
+          + "FROM teams t "
+          + "LEFT JOIN injects_teams it ON t.team_id = it.team_id "
+          + "WHERE it.inject_id IN :ids ;", nativeQuery = true)
+  List<RawTeam> rawTeamByInjectIds(@Param("ids") List<String> ids);
+
   @Query(value="SELECT teams.team_id, teams.team_name, teams.team_description, teams.team_created_at, teams.team_updated_at, teams.team_organization, " +
           "       team_contextual, " +
           "       coalesce(array_agg(DISTINCT teams_tags.tag_id) FILTER ( WHERE teams_tags.tag_id IS NOT NULL ), '{}') as team_tags, " +