[backend/frontend] refact

OpenBAS-Platform · Oct 11, 2024 · bc45db4 · bc45db4
1 parent b05ca5c
commit bc45db4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/utils/ExerciseMapper.java b/openbas-api/src/main/java/io/openbas/utils/ExerciseMapper.java
@@ -36,10 +36,8 @@ public ExerciseSimple fromRawExercise(RawExercise rawExercise) {
     simple.setStatus(ExerciseStatus.valueOf(rawExercise.getExercise_status()));
     simple.setStart(rawExercise.getExercise_start_date());
     simple.setUpdatedAt(rawExercise.getExercise_updated_at());
-
-    simple.setExpectationResultByTypes(resultUtils.getResultsByTypes(rawExercise.getInject_ids()));
-
     simple.setTargets(resultUtils.getInjectTargetWithResults(rawExercise.getInject_ids()));
+    simple.setExpectationResultByTypes(resultUtils.getResultsByTypes(rawExercise.getInject_ids()));
 
     return simple;
   }

diff --git a/openbas-api/src/main/java/io/openbas/utils/ResultUtils.java b/openbas-api/src/main/java/io/openbas/utils/ResultUtils.java
@@ -37,11 +37,7 @@ public class ResultUtils {
 
   // -- UTILS --
   public List<AtomicTestingMapper.ExpectationResultsByType> getResultsByTypes(List<String> injectIds) {
-    if (injectIds != null) {
-      return computeGlobalExpectationResults(injectIds);
-    } else {
-      return emptyList();
-    }
+    return computeGlobalExpectationResults(injectIds);
   }
 
   public List<InjectTargetWithResult> getInjectTargetWithResults(List<String> injectIds) {