[backend/frontend] Improve latency on exercise overview

openbas-api/src/main/java/io/openbas/opencti/OpenCTIApi.java

@@ -5,6 +5,7 @@
 import io.openbas.aop.LogExecutionTime;
 import io.openbas.rest.exercise.form.ExerciseSimple;
 import io.openbas.service.ScenarioService;
+import io.openbas.telemetry.Tracing;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -42,6 +43,7 @@ public class OpenCTIApi {
       })
   @LogExecutionTime
   @GetMapping(OPENCTI_URI + "/exercises/latest/{externalReferenceId}")
+  @Tracing(name = "Get latest exercise by external reference", layer = "api", operation = "GET")
   public ExerciseSimple latestExerciseByExternalReference(
       @PathVariable @NotBlank final String externalReferenceId) {
     return scenarioService.latestExerciseByExternalReference(externalReferenceId);

openbas-api/src/main/java/io/openbas/rest/asset_group/AssetGroupApi.java

@@ -54,6 +54,7 @@ public List<AssetGroup> assetGroups() {
   @LogExecutionTime
   @PostMapping(ASSET_GROUP_URI + "/search")
   @PreAuthorize("isObserver()")
+  @Tracing(name = "Get a page of assetgroups", layer = "api", operation = "POST")
   public Page<AssetGroupOutput> assetGroups(
       @RequestBody @Valid SearchPaginationInput searchPaginationInput) {
     return this.assetGroupCriteriaBuilderService.assetGroupPagination(searchPaginationInput);

openbas-api/src/main/java/io/openbas/rest/atomic_testing/AtomicTestingApi.java

@@ -6,10 +6,11 @@
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.rest.atomic_testing.form.AtomicTestingInput;
 import io.openbas.rest.atomic_testing.form.AtomicTestingUpdateTagsInput;
-import io.openbas.rest.atomic_testing.form.InjectResultDTO;
+import io.openbas.rest.atomic_testing.form.InjectResultOutput;
+import io.openbas.rest.atomic_testing.form.InjectResultOverviewOutput;
 import io.openbas.rest.helper.RestBehavior;
-import io.openbas.rest.inject.output.AtomicTestingOutput;
 import io.openbas.service.AtomicTestingService;
+import io.openbas.telemetry.Tracing;
 import io.openbas.utils.pagination.SearchPaginationInput;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -34,31 +35,35 @@ public class AtomicTestingApi extends RestBehavior {
   @LogExecutionTime
   @PostMapping("/search")
   @Transactional(readOnly = true)
-  public Page<AtomicTestingOutput> findAllAtomicTestings(
+  @Tracing(name = "Get a page of atomic testings", layer = "api", operation = "POST")
+  public Page<InjectResultOutput> findAllAtomicTestings(
       @RequestBody @Valid final SearchPaginationInput searchPaginationInput) {
     return atomicTestingService.findAllAtomicTestings(searchPaginationInput);
   }
 
   @LogExecutionTime
   @GetMapping("/{injectId}")
-  public InjectResultDTO findAtomicTesting(@PathVariable String injectId) {
+  @Tracing(name = "Get a atomic testing", layer = "api", operation = "GET")
+  public InjectResultOverviewOutput findAtomicTesting(@PathVariable String injectId) {
     return atomicTestingService.findById(injectId);
   }
 
   @PostMapping()
   @Transactional(rollbackFor = Exception.class)
-  public InjectResultDTO createAtomicTesting(@Valid @RequestBody AtomicTestingInput input) {
+  public InjectResultOverviewOutput createAtomicTesting(
+      @Valid @RequestBody AtomicTestingInput input) {
     return this.atomicTestingService.createOrUpdate(input, null);
   }
 
   @PostMapping("/{atomicTestingId}")
-  public InjectResultDTO duplicateAtomicTesting(@PathVariable final String atomicTestingId) {
+  public InjectResultOverviewOutput duplicateAtomicTesting(
+      @PathVariable final String atomicTestingId) {
     return atomicTestingService.getDuplicateAtomicTesting(atomicTestingId);
   }
 
   @PutMapping("/{injectId}")
   @Transactional(rollbackFor = Exception.class)
-  public InjectResultDTO updateAtomicTesting(
+  public InjectResultOverviewOutput updateAtomicTesting(
       @PathVariable @NotBlank final String injectId,
       @Valid @RequestBody final AtomicTestingInput input) {
     return atomicTestingService.createOrUpdate(input, injectId);
@@ -86,7 +91,7 @@ public List<InjectExpectation> findTargetResult(
 
   @PutMapping("/{injectId}/tags")
   @Transactional(rollbackFor = Exception.class)
-  public InjectResultDTO updateAtomicTestingTags(
+  public InjectResultOverviewOutput updateAtomicTestingTags(
       @PathVariable @NotBlank final String injectId,
       @Valid @RequestBody final AtomicTestingUpdateTagsInput input) {
     return atomicTestingService.updateAtomicTestingTags(injectId, input);

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/AtomicTestingInput.java

@@ -6,12 +6,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class AtomicTestingInput {
 
   @JsonProperty("inject_title")
@@ -39,7 +37,7 @@
   private List<InjectDocumentInput> documents = new ArrayList<>();
 
   @JsonProperty("inject_all_teams")
-  private boolean allTeams = false;
+  private boolean allTeams;
 
   @JsonProperty("inject_tags")
   private List<String> tagIds = new ArrayList<>();

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/AttackPatternSimple.java

@@ -0,0 +1,25 @@
+package io.openbas.rest.atomic_testing.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Builder
+public class AttackPatternSimple {
+
+  @JsonProperty("attack_pattern_id")
+  @NotBlank
+  private String id;
+
+  @JsonProperty("attack_pattern_name")
+  @NotBlank
+  private String name;
+
+  @JsonProperty("attack_pattern_external_id")
+  @NotBlank
+  private String externalId;
+}

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/InjectExpectationSimple.java

@@ -0,0 +1,20 @@
+package io.openbas.rest.atomic_testing.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Builder
+public class InjectExpectationSimple {
+
+  @JsonProperty("inject_expectation_id")
+  @NotBlank
+  private String id;
+
+  @JsonProperty("inject_expectation_name")
+  private String name;
+}

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/InjectResultOutput.java

@@ -0,0 +1,59 @@
+package io.openbas.rest.atomic_testing.form;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.openbas.utils.AtomicTestingUtils.ExpectationResultsByType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class InjectResultOutput {
+
+  @Schema(description = "Id of inject")
+  @JsonProperty("inject_id")
+  @NotBlank
+  private String id;
+
+  @Schema(description = "Title of inject")
+  @JsonProperty("inject_title")
+  @NotBlank
+  private String title;
+
+  @Schema(description = "Timestamp when the inject was last updated")
+  @JsonProperty("inject_updated_at")
+  @NotNull
+  private Instant updatedAt;
+
+  @Schema(description = "Type of inject")
+  @JsonProperty("inject_type")
+  private String injectType;
+
+  @Schema(description = "Injector contract")
+  @JsonProperty("inject_injector_contract")
+  private InjectorContractSimple injectorContract;
+
+  @Schema(description = "Status")
+  @JsonProperty("inject_status")
+  private InjectStatusSimple status;
+
+  @JsonIgnore private String[] teamIds;
+  @JsonIgnore private String[] assetIds;
+  @JsonIgnore private String[] assetGroupIds;
+
+  // -- COMPUTED ATTRIBUTES --
+
+  @Schema(description = "Result of expectations")
+  @JsonProperty("inject_expectation_results")
+  @NotNull
+  private List<ExpectationResultsByType> expectationResultByTypes = new ArrayList<>();
+
+  @JsonProperty("inject_targets")
+  private List<TargetSimple> targets = new ArrayList<>();
+}

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/InjectResultDTO.java → openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/InjectResultOverviewOutput.java

@@ -1,12 +1,11 @@
 package io.openbas.rest.atomic_testing.form;
 
-import static java.time.Instant.now;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.openbas.database.model.*;
-import io.openbas.utils.AtomicTestingMapper.ExpectationResultsByType;
+import io.openbas.database.model.InjectStatusCommandLine;
+import io.openbas.utils.AtomicTestingUtils.ExpectationResultsByType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -19,75 +18,82 @@
 @Setter
 @Getter
 @Builder
-public class InjectResultDTO {
+public class InjectResultOverviewOutput {
 
-  @Schema(description = "Id")
+  @Schema(description = "Id of inject")
   @JsonProperty("inject_id")
-  @NotNull
+  @NotBlank
   private String id;
 
-  @Schema(description = "Title")
+  @Schema(description = "Title of inject")
   @JsonProperty("inject_title")
-  @NotNull
+  @NotBlank
   private String title;
 
-  @Schema(description = "Description")
+  @Schema(description = "Description of inject")
   @JsonProperty("inject_description")
-  @NotNull
   private String description;
 
+  @Schema(description = "Content of inject")
   @JsonProperty("inject_content")
   private ObjectNode content;
 
+  @Schema(description = "Command lines for inject")
   @JsonProperty("inject_commands_lines")
   private InjectStatusCommandLine commandsLines;
 
-  @JsonProperty("inject_expectations")
-  private List<InjectExpectation> expectations;
-
+  @Schema(description = "Type of inject")
   @JsonProperty("inject_type")
   private String type;
 
-  @Schema(description = "Kill Chain Phases")
-  @JsonProperty("inject_kill_chain_phases")
-  @NotNull
-  private List<KillChainPhase> killChainPhases;
+  @Schema(description = "Tags")
+  @JsonProperty("injects_tags")
+  private List<String> tagIds;
 
-  @Schema(description = "Attack Patterns")
-  @JsonProperty("inject_attack_patterns")
-  @NotNull
-  private List<AttackPattern> attackPatterns;
+  @Schema(description = "Documents")
+  @JsonProperty("injects_documents")
+  private List<String> documentIds;
 
   @Schema(description = "Full contract")
   @JsonProperty("inject_injector_contract")
   @NotNull
-  private InjectorContract injectorContract;
+  private InjectorContractSimple injectorContract;
 
+  @Schema(description = "status")
   @JsonProperty("inject_status")
-  private InjectStatus status;
+  private InjectStatusOutput status;
 
-  @Schema(
-      description = "Specifies the categories of targetResults for atomic testing.",
-      example = "assets, asset groups, teams, players")
-  @JsonProperty("inject_targets")
-  @NotNull
-  private List<InjectTargetWithResult> targets;
+  @Schema(description = "Expectations")
+  @JsonProperty("inject_expectations")
+  private List<InjectExpectationSimple> expectations;
+
+  @Schema(description = "Kill chain phases")
+  @JsonProperty("inject_kill_chain_phases")
+  private List<KillChainPhaseSimple> killChainPhases;
+
+  @Schema(description = "Attack pattern")
+  @JsonProperty("inject_attack_patterns")
+  private List<AttackPatternSimple> attackPatterns;
+
+  @Schema(description = "Indicates whether the inject is ready for use")
+  @JsonProperty("inject_ready")
+  private boolean isReady;
+
+  @Schema(description = "Timestamp when the inject was last updated")
+  @JsonProperty("inject_updated_at")
+  private Instant updatedAt;
+
+  // -- COMPUTED ATTRIBUTES --
 
   @Default
   @Schema(description = "Result of expectations")
   @JsonProperty("inject_expectation_results")
   @NotNull
   private List<ExpectationResultsByType> expectationResultByTypes = new ArrayList<>();
 
-  @JsonProperty("injects_tags")
-  private List<String> tagIds;
-
-  @JsonProperty("injects_documents")
-  private List<String> documents;
-
-  @JsonProperty("inject_ready")
-  private Boolean isReady;
-
-  @JsonProperty("inject_updated_at")
-  private Instant updatedAt = now();
+  @Default
+  @Schema(description = "Results of expectations for each target")
+  @JsonProperty("inject_targets")
+  @NotNull
+  private List<InjectTargetWithResult> targets = new ArrayList<>();
 }