From 828a904f9f4cd5ae14101669f5a4bd246743707c Mon Sep 17 00:00:00 2001 From: GuillaumeParis Date: Tue, 17 Dec 2024 17:23:11 +0100 Subject: [PATCH] [backend] fix thatMustBeFinisehd query to exclude disabled injects from count (#2091) --- .../java/io/openbas/database/repository/ExerciseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbas-model/src/main/java/io/openbas/database/repository/ExerciseRepository.java b/openbas-model/src/main/java/io/openbas/database/repository/ExerciseRepository.java index b2be2d5836..2014ab9288 100644 --- a/openbas-model/src/main/java/io/openbas/database/repository/ExerciseRepository.java +++ b/openbas-model/src/main/java/io/openbas/database/repository/ExerciseRepository.java @@ -82,7 +82,7 @@ List userCountGroupByWeek( @Query( value = "select e.*, se.scenario_id from exercises e " - + "left join injects as inject on e.exercise_id = inject.inject_exercise " + + "left join injects as inject on e.exercise_id = inject.inject_exercise and inject.inject_enabled = 'true' " + "left join injects_statuses as status on inject.inject_id = status.status_inject and status.status_name != 'PENDING'" + "left join scenarios_exercises as se on e.exercise_id = se.exercise_id " + "where e.exercise_status = 'RUNNING' group by e.exercise_id, se.scenario_id having count(status) = count(inject);",