[frontend/backend] fix and improve dashboard statistics (#1697)

openbas-api/src/main/java/io/openbas/rest/statistic/StatisticApi.java

@@ -1,5 +1,6 @@
 package io.openbas.rest.statistic;
 
+import io.openbas.aop.LogExecutionTime;
 import io.openbas.config.OpenBASPrincipal;
 import io.openbas.database.model.AttackPattern;
 import io.openbas.database.raw.RawGlobalInjectExpectation;
@@ -25,6 +26,7 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -34,6 +36,11 @@
 import static io.openbas.utils.AtomicTestingUtils.getExpectationResultByTypesFromRaw;
 import static java.util.stream.Collectors.groupingBy;
 
+enum Type {
+  GLOBAL,
+  USER,
+}
+
 @RestController
 @RequiredArgsConstructor
 public class StatisticApi extends RestBehavior {
@@ -46,6 +53,7 @@
   private final AssetGroupRepository assetGroupRepository;
   private final InjectRepository injectRepository;
 
+  @LogExecutionTime
   @GetMapping("/api/statistics")
   @Transactional(rollbackOn = Exception.class)
   @Operation(summary = "Retrieve platform statistics")
@@ -65,6 +73,9 @@
       statistic.setInjectsCount(computeGlobalStat(now, injectRepository));
       statistic.setResults(computeGlobalExpectationResults(now));
       statistic.setInjectResults(computeGlobalInjectExpectationResults(now));
+      statistic.setExerciseCountByCategory(computeExerciseCountGroupByCategory(Type.GLOBAL, now));
+      statistic.setExercisesCountByWeek(computeExerciseCountGroupByWeek(Type.GLOBAL, now));
+      statistic.setInjectsCountByAttackPattern(computeInjectCountGroupByAttackPattern(Type.GLOBAL, now));
     } else {
       statistic.setScenariosCount(computeUserStat(now, scenarioRepository));
       statistic.setExercisesCount(computeUserStat(now, exerciseRepository));
@@ -75,48 +86,61 @@
       statistic.setInjectsCount(computeUserStat(now, injectRepository));
       statistic.setResults(computeUserExpectationResults(now));
       statistic.setInjectResults(computeUserInjectExpectationResults(now));
+      statistic.setExerciseCountByCategory(computeExerciseCountGroupByCategory(Type.USER, now));
+      statistic.setExercisesCountByWeek(computeExerciseCountGroupByWeek(Type.USER, now));
+      statistic.setInjectsCountByAttackPattern(computeInjectCountGroupByAttackPattern(Type.USER, now));
     }
     return statistic;
   }
 
   // -- GLOBAL STATISTIC --
 
   private StatisticElement computeGlobalStat(Instant from, StatisticRepository repository) {
-    long global = repository.globalCount(from);
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    long global = repository.globalCount(minus3Months);
     Instant minusMonth = from.minus(30, ChronoUnit.DAYS);
-    long progression = global - repository.globalCount(minusMonth);
+    long progression = repository.globalCount(minusMonth);
     return new StatisticElement(global, progression);
   }
 
   private StatisticElement computeUserStat(Instant from, StatisticRepository repository) {
     OpenBASPrincipal user = currentUser();
-    long global = repository.userCount(user.getId(), from);
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    long global = repository.userCount(user.getId(), minus3Months);
     Instant minusMonth = from.minus(30, ChronoUnit.DAYS);
-    long progression = global - repository.userCount(user.getId(), minusMonth);
+    long progression = repository.userCount(user.getId(), minusMonth);
     return new StatisticElement(global, progression);
   }
 
   private List<ExpectationResultsByType> computeGlobalExpectationResults(@NotNull final Instant from) {
-    List<RawInjectExpectation> rawInjectExpectations = fromIterable(this.exerciseRepository.allInjectExpectationsFromDate(from));
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<RawInjectExpectation> rawInjectExpectations = fromIterable(
+        this.exerciseRepository.allInjectExpectationsFromDate(minus3Months));
     return getExpectationResultByTypesFromRaw(rawInjectExpectations);
   }
 
   private List<ExpectationResultsByType> computeUserExpectationResults(@NotNull final Instant from) {
     OpenBASPrincipal user = currentUser();
-    List<RawInjectExpectation> rawInjectExpectations = fromIterable(this.exerciseRepository.allGrantedInjectExpectationsFromDate(from, user.getId()));
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<RawInjectExpectation> rawInjectExpectations = fromIterable(
+        this.exerciseRepository.allGrantedInjectExpectationsFromDate(minus3Months, user.getId()));
     return getExpectationResultByTypesFromRaw(rawInjectExpectations);
   }
 
   private List<InjectExpectationResultsByAttackPattern> computeGlobalInjectExpectationResults(
       @NotNull final Instant from) {
-    List<RawGlobalInjectExpectation> rawGlobalInjectExpectations = fromIterable(this.exerciseRepository.rawGlobalInjectExpectationResultsFromDate(from));
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<RawGlobalInjectExpectation> rawGlobalInjectExpectations = fromIterable(
+        this.exerciseRepository.rawGlobalInjectExpectationResultsFromDate(minus3Months));
     return injectExpectationResultsByAttackPatternFromRawGlobalInjectExpectation(rawGlobalInjectExpectations);
   }
 
   private List<InjectExpectationResultsByAttackPattern> computeUserInjectExpectationResults(
       @NotNull final Instant from) {
     OpenBASPrincipal user = currentUser();
-    List<RawGlobalInjectExpectation> rawGlobalInjectExpectations = fromIterable(this.exerciseRepository.rawGrantedInjectExpectationResultsFromDate(from, user.getId()));
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<RawGlobalInjectExpectation> rawGlobalInjectExpectations = fromIterable(
+        this.exerciseRepository.rawGrantedInjectExpectationResultsFromDate(minus3Months, user.getId()));
     return injectExpectationResultsByAttackPatternFromRawGlobalInjectExpectation(rawGlobalInjectExpectations);
   }
 
@@ -174,4 +198,58 @@
         .collect(Collectors.toList());
   }
 
+  private Map<String, Long> computeExerciseCountGroupByCategory(final Type type, @NotNull final Instant from) {
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<Object[]> result = new ArrayList<>();
+    if (type == Type.GLOBAL) {
+      result = exerciseRepository.globalCountGroupByCategory(minus3Months);
+    } else if (type == Type.USER) {
+      OpenBASPrincipal user = currentUser();
+      result = exerciseRepository.userCountGroupByCategory(user.getId(), minus3Months);
+    }
+    Map<String, Long> categoryCountMap = new HashMap<>();
+    for (Object[] row : result) {
+      String category = (String) row[0];
+      Long count = (Long) row[1];
+      categoryCountMap.put(category, count);
+    }
+    return categoryCountMap;
+  }
+
+  private Map<Instant, Long> computeExerciseCountGroupByWeek(final Type type, @NotNull final Instant from) {
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<Object[]> result = new ArrayList<>();
+    if (type == Type.GLOBAL) {
+      result = exerciseRepository.globalCountGroupByWeek(minus3Months);
+    } else if (type == Type.USER) {
+      OpenBASPrincipal user = currentUser();
+      result = exerciseRepository.userCountGroupByWeek(user.getId(), minus3Months);
+    }
+    Map<Instant, Long> weekCountMap = new HashMap<>();
+    for (Object[] row : result) {
+      Instant week = (Instant) row[0];
+      Long count = (Long) row[1];
+      weekCountMap.put(week, count);
+    }
+    return weekCountMap;
+  }
+
+  private Map<String, Long> computeInjectCountGroupByAttackPattern(final Type type, @NotNull final Instant from) {
+    Instant minus3Months = from.minus(180, ChronoUnit.DAYS);
+    List<Object[]> result = new ArrayList<>();
+    if (type == Type.GLOBAL) {
+      result = injectRepository.globalCountGroupByAttackPatternInExercise(minus3Months);
+    } else if (type == Type.USER) {
+      OpenBASPrincipal user = currentUser();
+      result = injectRepository.userCountGroupByAttackPatternInExercise(user.getId(), minus3Months);
+    }
+    Map<String, Long> attackPatternMap = new HashMap<>();
+    for (Object[] row : result) {
+      String attackPattern = (String) row[0];
+      Long count = (Long) row[1];
+      attackPatternMap.put(attackPattern, count);
+    }
+    return attackPatternMap;
+  }
+
 }

openbas-api/src/main/java/io/openbas/rest/statistic/response/PlatformStatistic.java

@@ -6,44 +6,54 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 
 @Setter
 @Getter
 public class PlatformStatistic {
 
-    @JsonProperty("platform_id")
-    private String platformId = "openbas";
+  @JsonProperty("platform_id")
+  private String platformId = "openbas";
 
-    @JsonProperty("scenarios_count")
-    private StatisticElement scenariosCount;
+  @JsonProperty("scenarios_count")
+  private StatisticElement scenariosCount;
 
-    @JsonProperty("exercises_count")
-    private StatisticElement exercisesCount;
+  @JsonProperty("exercises_count")
+  private StatisticElement exercisesCount;
 
-    @JsonProperty("users_count")
-    private StatisticElement usersCount;
+  @JsonProperty("users_count")
+  private StatisticElement usersCount;
 
-    @JsonProperty("teams_count")
-    private StatisticElement teamsCount;
+  @JsonProperty("teams_count")
+  private StatisticElement teamsCount;
 
-    @JsonProperty("assets_count")
-    private StatisticElement assetsCount;
+  @JsonProperty("assets_count")
+  private StatisticElement assetsCount;
 
-    @JsonProperty("asset_groups_count")
-    private StatisticElement assetGroupsCount;
+  @JsonProperty("asset_groups_count")
+  private StatisticElement assetGroupsCount;
 
-    @JsonProperty("injects_count")
-    private StatisticElement injectsCount;
+  @JsonProperty("injects_count")
+  private StatisticElement injectsCount;
 
-    @JsonProperty("expectation_results")
-    private List<ExpectationResultsByType> results;
+  @JsonProperty("expectation_results")
+  private List<ExpectationResultsByType> results;
 
-    @JsonProperty("inject_expectation_results")
-    private List<InjectExpectationResultsByAttackPattern> injectResults;
+  @JsonProperty("inject_expectation_results")
+  private List<InjectExpectationResultsByAttackPattern> injectResults;
 
-    public PlatformStatistic() {
-        // Default constructor
-    }
+  @JsonProperty("exercises_count_by_category")
+  private Map<String, Long> exerciseCountByCategory;
 
+  @JsonProperty("exercises_count_by_week")
+  private Map<Instant, Long> exercisesCountByWeek;
+
+  @JsonProperty("injects_count_by_attack_pattern")
+  private Map<String, Long> injectsCountByAttackPattern;
+
+  public PlatformStatistic() {
+    // Default constructor
+  }
 }

openbas-front/src/actions/payloads/Payload.d.ts

@@ -7,4 +7,5 @@ export type PayloadStore = Omit<Payload, 'payload_collector'> & {
   dns_resolution_hostname?: string;
   file_drop_file?: string;
   executable_file?: string;
+  executable_arch?: string;
 };