[backend] Add the default Assets logic to scenario creation and update

openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java

@@ -401,12 +401,13 @@
   @PreAuthorize("isExercisePlanner(#exerciseId)")
   @Transactional(rollbackOn = Exception.class)
   public Exercise updateExerciseInformation(
-      @PathVariable String exerciseId, @Valid @RequestBody ExerciseInput input) {
+      @PathVariable String exerciseId, @Valid @RequestBody UpdateExerciseInput input) {
     Exercise exercise =
         exerciseRepository.findById(exerciseId).orElseThrow(ElementNotFoundException::new);
+    Set<Tag> currentTagList = exercise.getTags();
     exercise.setTags(iterableToSet(this.tagRepository.findAllById(input.getTagIds())));
     exercise.setUpdateAttributes(input);
-    return exerciseRepository.save(exercise);
+    return exerciseService.updateExercice(exercise, currentTagList, input.isApplyTagRule());
   }
 
   @PutMapping(EXERCISE_URI + "/{exerciseId}/start_date")
@@ -432,8 +433,9 @@
       @PathVariable String exerciseId, @Valid @RequestBody ExerciseUpdateTagsInput input) {
     Exercise exercise =
         exerciseRepository.findById(exerciseId).orElseThrow(ElementNotFoundException::new);
+    Set<Tag> currentTagList = exercise.getTags();
     exercise.setTags(iterableToSet(tagRepository.findAllById(input.getTagIds())));
-    return exerciseRepository.save(exercise);
+    return exerciseService.updateExercice(exercise, currentTagList, input.isApplyTagRule());
   }
 
   @PutMapping(EXERCISE_URI + "/{exerciseId}/logos")

openbas-api/src/main/java/io/openbas/rest/exercise/form/ExerciseUpdateTagsInput.java

@@ -12,4 +12,7 @@
 
   @JsonProperty("exercise_tags")
   private List<String> tagIds = new ArrayList<>();
+
+  @JsonProperty("apply_tag_rule")
+  private boolean applyTagRule = false;
 }

openbas-api/src/main/java/io/openbas/rest/exercise/form/UpdateExerciseInput.java

@@ -0,0 +1,16 @@
+package io.openbas.rest.exercise.form;
+
+import static io.openbas.config.AppConfig.*;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Data
+public class UpdateExerciseInput extends ExerciseInput {
+  @JsonProperty("apply_tag_rule")
+  private boolean applyTagRule = false;
+}

openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java

@@ -24,7 +24,9 @@
 import io.openbas.rest.exercise.form.ExercisesGlobalScoresInput;
 import io.openbas.rest.exercise.response.ExercisesGlobalScoresOutput;
 import io.openbas.rest.inject.service.InjectDuplicateService;
+import io.openbas.rest.inject.service.InjectService;
 import io.openbas.service.GrantService;
+import io.openbas.service.TagRuleService;
 import io.openbas.service.TeamService;
 import io.openbas.service.VariableService;
 import io.openbas.utils.AtomicTestingUtils;
@@ -68,6 +70,8 @@ public class ExerciseService {
   private final InjectDuplicateService injectDuplicateService;
   private final TeamService teamService;
   private final VariableService variableService;
+  private final TagRuleService tagRuleService;
+  private final InjectService injectService;
 
   private final ExerciseMapper exerciseMapper;
   private final InjectMapper injectMapper;
@@ -614,4 +618,43 @@ public Iterable<Team> removeTeams(
     this.lessonsCategoryRepository.removeTeamsForExercise(exerciseId, teamIds);
     return teamRepository.findAllById(teamIds);
   }
+
+  /**
+   * Update the simulation and each of the injects to add/remove default assets
+   *
+   * @param exercise
+   * @param currentTags list of the tags before the update
+   * @return
+   */
+  @Transactional
+  public Exercise updateExercice(
+      @NotNull final Exercise exercise, @NotNull final Set<Tag> currentTags, boolean applyRule) {
+    if (applyRule) {
+      // Get assets from the TagRule of the added tags
+      List<Asset> defaultAssetsToAdd =
+          tagRuleService.getAssetsFromTagIds(
+              exercise.getTags().stream()
+                  .filter(tag -> !currentTags.contains(tag))
+                  .map(Tag::getId)
+                  .toList());
+
+      // Get assets from the TagRule of the removed tags
+      List<Asset> defaultAssetsToRemove =
+          tagRuleService.getAssetsFromTagIds(
+              currentTags.stream()
+                  .filter(tag -> !exercise.getTags().contains(tag))
+                  .map(Tag::getId)
+                  .toList());
+
+      // Add/remove the default assets to/from the injects
+      exercise
+          .getInjects()
+          .forEach(
+              inject ->
+                  injectService.applyDefaultAssetsToInject(
+                      inject.getId(), defaultAssetsToAdd, defaultAssetsToRemove));
+    }
+    exercise.setUpdatedAt(now());
+    return exerciseRepository.save(exercise);
+  }
 }

openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java

@@ -33,16 +33,15 @@
 import io.openbas.rest.inject.service.InjectService;
 import io.openbas.service.InjectSearchService;
 import io.openbas.service.ScenarioService;
+import io.openbas.service.TagRuleService;
 import io.openbas.telemetry.Tracing;
 import io.openbas.utils.pagination.SearchPaginationInput;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import lombok.RequiredArgsConstructor;
@@ -84,6 +83,7 @@ public class InjectApi extends RestBehavior {
   private final ExecutableInjectService executableInjectService;
   private final InjectSearchService injectSearchService;
   private final InjectDuplicateService injectDuplicateService;
+  private final TagRuleService tagRuleService;
 
   // -- INJECTS --
 
@@ -348,7 +348,13 @@ public Inject createInjectForExercise(
                   .toList());
     }
     inject.setTeams(fromIterable(teamRepository.findAllById(input.getTeams())));
-    inject.setAssets(fromIterable(assetService.assets(input.getAssets())));
+
+    // add default assets
+    inject.setAssets(
+        this.tagRuleService.applyTagRuleToInjectCreation(
+            exercise.getTags().stream().map(Tag::getId).toList(),
+            assetService.assets(input.getAssets())));
+
     inject.setAssetGroups(fromIterable(assetGroupService.assetGroups(input.getAssetGroups())));
     inject.setTags(iterableToSet(tagRepository.findAllById(input.getTagIds())));
     List<InjectDocument> injectDocuments =
@@ -582,7 +588,13 @@ public Inject createInjectForScenario(
                   .toList());
     }
     inject.setTeams(fromIterable(teamRepository.findAllById(input.getTeams())));
-    inject.setAssets(fromIterable(assetService.assets(input.getAssets())));
+
+    // add default assets
+    inject.setAssets(
+        this.tagRuleService.applyTagRuleToInjectCreation(
+            scenario.getTags().stream().map(Tag::getId).toList(),
+            assetService.assets(input.getAssets())));
+
     inject.setAssetGroups(fromIterable(assetGroupService.assetGroups(input.getAssetGroups())));
     inject.setTags(iterableToSet(tagRepository.findAllById(input.getTagIds())));
     List<InjectDocument> injectDocuments =

openbas-api/src/main/java/io/openbas/rest/inject/service/InjectService.java

@@ -5,10 +5,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.openbas.database.model.ExecutionStatus;
-import io.openbas.database.model.Inject;
-import io.openbas.database.model.InjectDocument;
-import io.openbas.database.model.InjectStatus;
+import io.openbas.database.model.*;
 import io.openbas.database.repository.InjectDocumentRepository;
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.database.repository.InjectStatusRepository;
@@ -22,7 +19,10 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.Instant;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.java.Log;
@@ -141,6 +141,47 @@ public void delete(String id) {
     injectRepository.deleteById(id);
   }
 
+  /**
+   * Update an inject with default assets
+   *
+   * @param injectId
+   * @param defaultAssetsToAdd
+   * @param defaultAssetsToRemove
+   * @return
+   */
+  @Transactional
+  public Inject applyDefaultAssetsToInject(
+      final String injectId,
+      final List<Asset> defaultAssetsToAdd,
+      final List<Asset> defaultAssetsToRemove) {
+
+    // fetch the inject
+    Inject inject =
+        this.injectRepository.findById(injectId).orElseThrow(ElementNotFoundException::new);
+
+    // remove/add default assets and remove duplicates
+    List<Asset> currentAssets = inject.getAssets();
+    // Get the Id of the assets to remove and filter the assets that are in both lists
+    List<String> assetIdsToRemove =
+        defaultAssetsToRemove.stream()
+            .filter(asset -> !defaultAssetsToAdd.contains(asset))
+            .map(Asset::getId)
+            .toList();
+    Set<String> uniqueAssetsIds = new HashSet<>();
+    List<Asset> newListOfAssets =
+        Stream.concat(currentAssets.stream(), defaultAssetsToAdd.stream())
+            .filter(asset -> !assetIdsToRemove.contains(asset.getId()))
+            .filter(asset -> uniqueAssetsIds.add(asset.getId()))
+            .collect(Collectors.toList());
+
+    if (new HashSet<>(currentAssets).equals(new HashSet<>(newListOfAssets))) {
+      return inject;
+    } else {
+      inject.setAssets(newListOfAssets);
+      return this.injectRepository.save(inject);
+    }
+  }
+
   private Inject findAndDuplicateInject(String id) {
     Inject injectOrigin = injectRepository.findById(id).orElseThrow(ElementNotFoundException::new);
     return InjectUtils.duplicateInject(injectOrigin);

openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioApi.java

@@ -31,6 +31,7 @@
 import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.List;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -100,11 +101,12 @@
   @PreAuthorize("isScenarioPlanner(#scenarioId)")
   public Scenario updateScenario(
       @PathVariable @NotBlank final String scenarioId,
-      @Valid @RequestBody final ScenarioInput input) {
+      @Valid @RequestBody final UpdateScenarioInput input) {
     Scenario scenario = this.scenarioService.scenario(scenarioId);
+    Set<Tag> currentTagList = scenario.getTags();
     scenario.setUpdateAttributes(input);
     scenario.setTags(iterableToSet(this.tagRepository.findAllById(input.getTagIds())));
-    return this.scenarioService.updateScenario(scenario);
+    return this.scenarioService.updateScenario(scenario, currentTagList, input.isApplyTagRule());
   }
 
   @PutMapping(SCENARIO_URI + "/{scenarioId}/information")
@@ -131,8 +133,9 @@
       @PathVariable @NotBlank final String scenarioId,
       @Valid @RequestBody final ScenarioUpdateTagsInput input) {
     Scenario scenario = this.scenarioService.scenario(scenarioId);
+    Set<Tag> currentTagList = scenario.getTags();
     scenario.setTags(iterableToSet(this.tagRepository.findAllById(input.getTagIds())));
-    return scenarioService.updateScenario(scenario);
+    return this.scenarioService.updateScenario(scenario, currentTagList, input.isApplyTagRule());
   }
 
   // -- EXPORT --

openbas-api/src/main/java/io/openbas/rest/scenario/form/ScenarioUpdateTagsInput.java

@@ -12,4 +12,7 @@
 
   @JsonProperty("scenario_tags")
   private List<String> tagIds = new ArrayList<>();
+
+  @JsonProperty("apply_tag_rule")
+  private boolean applyTagRule = false;
 }

openbas-api/src/main/java/io/openbas/rest/scenario/form/UpdateScenarioInput.java

@@ -0,0 +1,12 @@
+package io.openbas.rest.scenario.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+@Getter
+public class UpdateScenarioInput extends ScenarioInput {
+  @JsonProperty("apply_tag_rule")
+  private boolean applyTagRule = false;
+}

openbas-api/src/main/java/io/openbas/service/ScenarioService.java

@@ -33,6 +33,7 @@
 import io.openbas.rest.exercise.exports.VariableWithValueMixin;
 import io.openbas.rest.exercise.form.ExerciseSimple;
 import io.openbas.rest.inject.service.InjectDuplicateService;
+import io.openbas.rest.inject.service.InjectService;
 import io.openbas.rest.scenario.export.ScenarioExportMixins;
 import io.openbas.rest.scenario.export.ScenarioFileExport;
 import io.openbas.rest.scenario.form.ScenarioSimple;
@@ -102,6 +103,9 @@ public class ScenarioService {
   private final TeamService teamService;
   private final FileService fileService;
   private final InjectDuplicateService injectDuplicateService;
+  private final TagRuleService tagRuleService;
+  private final InjectService injectService;
+
   private final InjectRepository injectRepository;
   private final LessonsCategoryRepository lessonsCategoryRepository;
 
@@ -290,6 +294,44 @@ public ExerciseSimple latestExerciseByExternalReference(
   }
 
   public Scenario updateScenario(@NotNull final Scenario scenario) {
+    return this.updateScenario(scenario, null, false);
+  }
+
+  /**
+   * Update the scenario and each of the injects to add/remove default assets
+   *
+   * @param scenario
+   * @param currentTags list of the tags before the update
+   * @return
+   */
+  @Transactional
+  public Scenario updateScenario(
+      @NotNull final Scenario scenario, Set<Tag> currentTags, boolean applyRule) {
+    if (applyRule) {
+      // Get assets from the TagRule of the added tags
+      List<Asset> defaultAssetsToAdd =
+          tagRuleService.getAssetsFromTagIds(
+              scenario.getTags().stream()
+                  .filter(tag -> !currentTags.contains(tag))
+                  .map(Tag::getId)
+                  .toList());
+
+      // Get assets from the TagRule of the removed tags
+      List<Asset> defaultAssetsToRemove =
+          tagRuleService.getAssetsFromTagIds(
+              currentTags.stream()
+                  .filter(tag -> !scenario.getTags().contains(tag))
+                  .map(Tag::getId)
+                  .toList());
+
+      // Add/remove the default assets to/from the injects
+      scenario
+          .getInjects()
+          .forEach(
+              inject ->
+                  injectService.applyDefaultAssetsToInject(
+                      inject.getId(), defaultAssetsToAdd, defaultAssetsToRemove));
+    }
     scenario.setUpdatedAt(now());
     return this.scenarioRepository.save(scenario);
   }