[frontend/backend] Add missing attributes and tests

gabriel-peze · gabriel-peze · commit 5d3e7e5a78dd · 2025-10-29T09:29:56.000+01:00
diff --git a/openaev-api/src/main/java/io/openaev/rest/inject/output/InjectOutput.java b/openaev-api/src/main/java/io/openaev/rest/inject/output/InjectOutput.java
@@ -152,6 +152,18 @@ public class InjectOutput {
   @ArraySchema(schema = @Schema(type = "string", description = "Expectation of the inject"))
   private List<InjectExpectation> expectations = new ArrayList<>();
 
+  @JsonProperty("listened")
+  @Schema(description = "Stream listener value of the inject")
+  private boolean isListened;
+
+  @JsonProperty("header")
+  @Schema(description = "Header of the inject")
+  private String header;
+
+  @JsonProperty("footer")
+  @Schema(description = "Footer of the inject")
+  private String footer;
+
   @JsonProperty("inject_users_number")
   @Schema(description = "Count of users targeted by the inject")
   public Long numberOfTargetUsers;
diff --git a/openaev-api/src/main/java/io/openaev/utils/mapper/InjectMapper.java b/openaev-api/src/main/java/io/openaev/utils/mapper/InjectMapper.java
@@ -174,6 +174,9 @@ public InjectOutput toInjectOutput(
       List<InjectDocument> documents,
       List<Communication> communications,
       List<InjectExpectation> expectations,
+      boolean isListened,
+      String header,
+      String footer,
       Long numberOfTargetUsers,
       Instant date,
       Long communicationsNumber,
@@ -210,6 +213,9 @@ public InjectOutput toInjectOutput(
     injectOutput.setDocuments(documents);
     injectOutput.setCommunications(communications);
     injectOutput.setExpectations(expectations);
+    injectOutput.setListened(isListened);
+    injectOutput.setHeader(header);
+    injectOutput.setFooter(footer);
     injectOutput.setNumberOfTargetUsers(numberOfTargetUsers);
     injectOutput.setDate(date);
     injectOutput.setCommunicationsNumber(communicationsNumber);
@@ -250,6 +256,9 @@ public InjectOutput toInjectOutput(Inject inject, List<HealthCheck> healthchecks
         inject.getDocuments(),
         inject.getCommunications(),
         inject.getExpectations(),
+        inject.isListened(),
+        inject.getHeader(),
+        inject.getFooter(),
         inject.getNumberOfTargetUsers(),
         inject.getDate().orElse(null),
         inject.getCommunicationsNumber(),
diff --git a/openaev-api/src/test/java/io/openaev/rest/scenario/ScenarioInjectApiTest.java b/openaev-api/src/test/java/io/openaev/rest/scenario/ScenarioInjectApiTest.java
@@ -20,17 +20,12 @@
 import io.openaev.service.EndpointService;
 import io.openaev.service.ScenarioService;
 import io.openaev.utils.fixtures.*;
-import io.openaev.utils.fixtures.composers.AttackPatternComposer;
-import io.openaev.utils.fixtures.composers.InjectorContractComposer;
-import io.openaev.utils.fixtures.composers.PayloadComposer;
+import io.openaev.utils.fixtures.composers.*;
 import io.openaev.utils.fixtures.files.AttackPatternFixture;
 import io.openaev.utils.mockUser.WithMockUser;
 import jakarta.servlet.ServletException;
 import jakarta.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import org.json.JSONArray;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +59,13 @@ class ScenarioInjectApiTest extends IntegrationTest {
   @Autowired private ScenarioService scenarioService;
 
   List<InjectorContractComposer.Composer> injectorContractWrapperComposers = new ArrayList<>();
+  @Autowired private InjectComposer injectComposer;
+  @Autowired private ScenarioComposer scenarioComposer;
+  @Autowired private TeamComposer teamComposer;
+  @Autowired private TagComposer tagComposer;
+  @Autowired private EndpointComposer endpointComposer;
+  @Autowired private AssetGroupComposer assetGroupComposer;
+  @Autowired private ExerciseComposer exerciseComposer;
 
   @BeforeAll
   void beforeAll() {
@@ -478,5 +480,81 @@ void given_TwoInjectByTTPNumber_should_createTwoInjects() throws Exception {
       assertEquals(2, jsonArray.length());
       assertEquals(2, injects.size());
     }
+
+    @DisplayName("Retrieve injects simple list for scenario with asset")
+    @Test
+    @Transactional
+    @WithMockUser(isAdmin = true)
+    void retrieveInjectSimpleForScenarioTestWithAsset() throws Exception {
+      // -- PREPARE --
+      ScenarioComposer.Composer composer =
+          scenarioComposer
+              .forScenario(ScenarioFixture.createDefaultCrisisScenario())
+              .withInject(
+                  injectComposer
+                      .forInject(InjectFixture.getDefaultInject())
+                      .withTeam(teamComposer.forTeam(TeamFixture.getDefaultTeam()))
+                      .withExercise(
+                          exerciseComposer.forExercise(ExerciseFixture.createDefaultExercise()))
+                      .withTag(tagComposer.forTag(TagFixture.getTagWithText("test")))
+                      .withEndpoint(endpointComposer.forEndpoint(EndpointFixture.createEndpoint())))
+              .persist();
+
+      // -- EXECUTE --
+      String response =
+          mvc.perform(
+                  get(SCENARIO_URI + "/" + composer.get().getId() + "/injects/simple")
+                      .accept(MediaType.APPLICATION_JSON))
+              .andExpect(status().is2xxSuccessful())
+              .andReturn()
+              .getResponse()
+              .getContentAsString();
+
+      // -- ASSERT --
+      assertNotNull(response);
+      assertEquals(composer.get().getId(), JsonPath.read(response, "$[0].inject_scenario"));
+
+      // -- CLEAN --
+      composer.delete();
+    }
+
+    @DisplayName("Retrieve injects simple list for scenario with asset group")
+    @Test
+    @Transactional
+    @WithMockUser(isAdmin = true)
+    void retrieveInjectSimpleForScenarioTestWithAssetGroup() throws Exception {
+      // -- PREPARE --
+      ScenarioComposer.Composer composer =
+          scenarioComposer
+              .forScenario(ScenarioFixture.createDefaultCrisisScenario())
+              .withInject(
+                  injectComposer
+                      .forInject(InjectFixture.getDefaultInject())
+                      .withTeam(teamComposer.forTeam(TeamFixture.getDefaultTeam()))
+                      .withExercise(
+                          exerciseComposer.forExercise(ExerciseFixture.createDefaultExercise()))
+                      .withTag(tagComposer.forTag(TagFixture.getTagWithText("test")))
+                      .withAssetGroup(
+                          assetGroupComposer.forAssetGroup(
+                              AssetGroupFixture.createDefaultAssetGroup("test"))))
+              .persist();
+
+      // -- EXECUTE --
+      String response =
+          mvc.perform(
+                  get(SCENARIO_URI + "/" + composer.get().getId() + "/injects/simple")
+                      .accept(MediaType.APPLICATION_JSON))
+              .andExpect(status().is2xxSuccessful())
+              .andReturn()
+              .getResponse()
+              .getContentAsString();
+
+      // -- ASSERT --
+      assertNotNull(response);
+      assertEquals(composer.get().getId(), JsonPath.read(response, "$[0].inject_scenario"));
+
+      // -- CLEAN --
+      composer.delete();
+    }
   }
 }
diff --git a/openaev-api/src/test/java/io/openaev/rest/scenario/ScenarioSimulationApiTest.java b/openaev-api/src/test/java/io/openaev/rest/scenario/ScenarioSimulationApiTest.java
@@ -57,6 +57,7 @@ void beforeEach() {
     scenario = this.scenarioRepository.save(defaultScenario);
 
     // Create exercises linked to the scenario
+    exerciseRepository.deleteAll();
     Exercise exercise1 = ExerciseFixture.createDefaultCrisisExercise();
     exercise1.setScenario(scenario);
     exercise1FromScenario = this.exerciseRepository.save(exercise1);
diff --git a/openaev-api/src/test/java/io/openaev/utils/fixtures/composers/InjectComposer.java b/openaev-api/src/test/java/io/openaev/utils/fixtures/composers/InjectComposer.java
@@ -25,6 +25,7 @@ public class Composer extends InnerComposerBase<Inject> {
         Optional.empty();
     private final List<DocumentComposer.Composer> documentComposers = new ArrayList<>();
     private final List<TeamComposer.Composer> teamComposers = new ArrayList<>();
+    private final List<ExerciseComposer.Composer> exerciseComposers = new ArrayList<>();
     private final List<AssetGroupComposer.Composer> assetGroupComposers = new ArrayList<>();
     private final List<InjectExpectationComposer.Composer> expectationComposers = new ArrayList<>();
     private final List<FindingComposer.Composer> findingComposers = new ArrayList<>();
@@ -67,6 +68,12 @@ public Composer withTeam(TeamComposer.Composer teamComposer) {
       return this;
     }
 
+    public Composer withExercise(ExerciseComposer.Composer exerciseComposer) {
+      this.exerciseComposers.add(exerciseComposer);
+      this.inject.setExercise(exerciseComposer.get());
+      return this;
+    }
+
     public Composer withId(String id) {
       this.inject.setId(id);
       return this;
@@ -142,6 +149,7 @@ public Composer persist() {
       endpointComposers.forEach(EndpointComposer.Composer::persist);
       tagComposers.forEach(TagComposer.Composer::persist);
       teamComposers.forEach(TeamComposer.Composer::persist);
+      exerciseComposers.forEach(ExerciseComposer.Composer::persist);
       documentComposers.forEach(DocumentComposer.Composer::persist);
       injectRepository.save(inject);
       injectStatusComposers.ifPresent(InjectStatusComposer.Composer::persist);
@@ -160,6 +168,7 @@ public Composer delete() {
       assetGroupComposers.forEach(AssetGroupComposer.Composer::delete);
       injectStatusComposers.ifPresent(InjectStatusComposer.Composer::delete);
       teamComposers.forEach(TeamComposer.Composer::delete);
+      exerciseComposers.forEach(ExerciseComposer.Composer::delete);
       injectorContractComposer.ifPresent(InjectorContractComposer.Composer::delete);
       findingComposers.forEach(FindingComposer.Composer::delete);
       expectationComposers.forEach(InjectExpectationComposer.Composer::delete);
diff --git a/openaev-front/src/utils/api-types.d.ts b/openaev-front/src/utils/api-types.d.ts
@@ -2997,6 +2997,10 @@ export interface InjectInput {
 }
 
 export interface InjectOutput {
+  /** Footer of the inject */
+  footer?: string;
+  /** Header of the inject */
+  header?: string;
   /** All teams value of the inject */
   inject_all_teams?: boolean;
   inject_asset_groups?: string[];
@@ -3087,6 +3091,8 @@ export interface InjectOutput {
    * @format int64
    */
   inject_users_number?: number;
+  /** Stream listener value of the inject */
+  listened?: boolean;
 }
 
 export interface InjectReceptionInput {
