[backend] Improv & fix inject is ready

Author: RomuDeuxfois

openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaContract.java

@@ -1,7 +1,5 @@
 package io.openbas.injectors.caldera;
 
-import static io.openbas.database.model.InjectorContract.CONTACT_ELEMENT_CONTENT_KEY_ASSETS;
-import static io.openbas.database.model.InjectorContract.CONTACT_ELEMENT_CONTENT_KEY_ASSET_GROUPS;
 import static io.openbas.executors.caldera.service.CalderaExecutorService.toPlatform;
 import static io.openbas.helper.SupportedLanguage.en;
 import static io.openbas.helper.SupportedLanguage.fr;
@@ -93,9 +91,9 @@ private ContractExpectations expectations() {
 
   private List<Contract> abilityContracts(@NotNull final ContractConfig contractConfig) {
     // Fields
-    ContractSelect obfuscatorField = obfuscatorField();
     ContractAsset assetField = assetField(Multiple);
     ContractAssetGroup assetGroupField = assetGroupField(Multiple);
+    ContractSelect obfuscatorField = obfuscatorField();
     ContractExpectations expectationsField = expectations();
 
     List<Ability> abilities =

openbas-api/src/main/java/io/openbas/injectors/channel/ChannelContract.java

@@ -93,7 +93,8 @@ public List<Contract> contracts() {
             .optional(expectationsField)
             // Emailing zone
             .optional(emailingField)
-            .mandatory(
+            .mandatoryOnCondition(
+                emailingField,
                 textField(
                     "subject",
                     "Subject",

openbas-api/src/main/java/io/openbas/injectors/email/EmailContract.java

@@ -65,7 +65,6 @@ public List<Contract> contracts() {
             .mandatory(teamField(Multiple))
             .mandatory(textField("subject", "Subject"))
             .mandatory(richTextareaField("body", "Body"))
-            // .optional(textField("inReplyTo", "InReplyTo", "HIDDEN")) - Use for direct injection
             .optional(checkboxField("encrypted", "Encrypted", false))
             .optional(attachmentField(Multiple))
             .optional(expectationsField)
@@ -85,7 +84,6 @@ public List<Contract> contracts() {
             .mandatory(teamField(Multiple))
             .mandatory(textField("subject", "Subject"))
             .mandatory(richTextareaField("body", "Body"))
-            // .mandatory(textField("inReplyTo", "InReplyTo", "HIDDEN"))  - Use for direct injection
             .optional(attachmentField(Multiple))
             .optional(expectationsField)
             .build();

openbas-api/src/main/java/io/openbas/rest/payload/service/PayloadService.java

@@ -1,7 +1,5 @@
 package io.openbas.rest.payload.service;
 
-import static io.openbas.database.model.InjectorContract.CONTACT_ELEMENT_CONTENT_KEY_ASSETS;
-import static io.openbas.database.model.InjectorContract.CONTACT_ELEMENT_CONTENT_KEY_ASSET_GROUPS;
 import static io.openbas.helper.StreamHelper.fromIterable;
 import static io.openbas.helper.SupportedLanguage.en;
 import static io.openbas.helper.SupportedLanguage.fr;

openbas-api/src/test/java/io/openbas/helper/InjectModelHelperTest.java

@@ -214,8 +214,9 @@ void given_an_injector_contract_with_mandatory_groups_and_no_element_should_not_
     class MandatoryOnConditionTests {
 
       @Test
-      void given_an_injector_contract_with_mandatory_on_condition_and_no_element_should_be_ready()
-          throws JsonProcessingException {
+      void
+          given_an_injector_contract_with_mandatory_on_condition_and_no_element_should_not_be_ready()
+              throws JsonProcessingException {
         // -- PREPARE --
         InjectorContract injectorContract = prepareInjectorContract();
         addField(injectorContract, mapper, buildMandatoryOnCondition());
@@ -235,7 +236,7 @@ void given_an_injector_contract_with_mandatory_on_condition_and_no_element_shoul
                 assetGroups);
 
         // -- ASSERT --
-        assertTrue(isReady);
+        assertFalse(isReady);
       }
 
       @Test

openbas-api/src/test/java/io/openbas/utils/fixtures/InjectorContractFixture.java

@@ -1,6 +1,6 @@
 package io.openbas.utils.fixtures;
 
-import static io.openbas.database.model.InjectorContract.*;
+import static io.openbas.database.model.InjectorContract.CONTRACT_CONTENT_FIELDS;
 import static io.openbas.injector_contract.ContractCardinality.Multiple;
 import static io.openbas.injector_contract.ContractDef.contractBuilder;
 import static io.openbas.injector_contract.fields.ContractAsset.assetField;
@@ -116,21 +116,21 @@ public static void addField(
       throws JsonProcessingException {
     ObjectNode content = mapper.readValue(injectorContract.getContent(), ObjectNode.class);
     List<ContractElement> elements =
-        mapper.convertValue(content.get(CONTACT_CONTENT_FIELDS), new TypeReference<>() {});
+        mapper.convertValue(content.get(CONTRACT_CONTENT_FIELDS), new TypeReference<>() {});
     if (CollectionUtils.isEmpty(elements)) {
       elements = new ArrayList<>();
     }
 
     elements.addAll(contractElements);
 
-    content.set(CONTACT_CONTENT_FIELDS, mapper.valueToTree(elements));
+    content.set(CONTRACT_CONTENT_FIELDS, mapper.valueToTree(elements));
     injectorContract.setContent(mapper.writeValueAsString(content));
     injectorContract.setConvertedContent(content);
   }
 
   public static List<ContractElement> buildAssetField(final boolean mandatory) {
     ContractDef builder = contractBuilder();
-    ContractAsset assetField = assetField(CONTACT_ELEMENT_CONTENT_KEY_ASSETS, "Assets", Multiple);
+    ContractAsset assetField = assetField(Multiple);
     if (mandatory) {
       builder.mandatory(assetField);
     } else {
@@ -140,18 +140,16 @@ public static List<ContractElement> buildAssetField(final boolean mandatory) {
   }
 
   public static List<ContractElement> buildMandatoryGroup() {
-    ContractAsset assetField = assetField(CONTACT_ELEMENT_CONTENT_KEY_ASSETS, "Assets", Multiple);
-    ContractAssetGroup assetGroupField =
-        assetGroupField(CONTACT_ELEMENT_CONTENT_KEY_ASSET_GROUPS, "Asset groups", Multiple);
+    ContractAsset assetField = assetField(Multiple);
+    ContractAssetGroup assetGroupField = assetGroupField(Multiple);
     ContractDef builder = contractBuilder();
     builder.mandatoryGroup(assetField, assetGroupField);
     return builder.build();
   }
 
   public static List<ContractElement> buildMandatoryOnCondition() {
-    ContractAsset assetField = assetField(CONTACT_ELEMENT_CONTENT_KEY_ASSETS, "Assets", Multiple);
-    ContractAssetGroup assetGroupField =
-        assetGroupField(CONTACT_ELEMENT_CONTENT_KEY_ASSET_GROUPS, "Asset groups", Multiple);
+    ContractAsset assetField = assetField(Multiple);
+    ContractAssetGroup assetGroupField = assetGroupField(Multiple);
     ContractDef builder = contractBuilder();
     return builder
         .mandatoryOnCondition(assetField, assetGroupField)
@@ -160,9 +158,8 @@ public static List<ContractElement> buildMandatoryOnCondition() {
   }
 
   public static List<ContractElement> buildMandatoryOnConditionValue(@NotBlank final String value) {
-    ContractAsset assetField = assetField(CONTACT_ELEMENT_CONTENT_KEY_ASSETS, "Assets", Multiple);
-    ContractAssetGroup assetGroupField =
-        assetGroupField(CONTACT_ELEMENT_CONTENT_KEY_ASSET_GROUPS, "Asset groups", Multiple);
+    ContractAsset assetField = assetField(Multiple);
+    ContractAssetGroup assetGroupField = assetGroupField(Multiple);
     ContractDef builder = contractBuilder();
     return builder
         .mandatoryOnConditionValue(assetField, assetGroupField, value)

openbas-framework/src/main/java/io/openbas/injector_contract/ContractDef.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class ContractDef {
 
@@ -68,7 +69,8 @@ public ContractDef mandatoryOnCondition(
       throw new IllegalArgumentException("Fields cannot be null");
     }
 
-    element.setMandatoryConditionFields(List.of(conditionalElement));
+    element.setMandatoryConditionFields(List.of(conditionalElement.getKey()));
+    element.setVisibleConditionFields(List.of(conditionalElement.getKey()));
     element.setMandatory(false);
     this.fields.add(element);
     return this;
@@ -87,8 +89,10 @@ public ContractDef mandatoryOnConditionValue(
       throw new IllegalArgumentException("Fields cannot be null");
     }
 
-    element.setMandatoryConditionFields(List.of(conditionalElement));
-    element.setMandatoryConditionValues(List.of(value));
+    element.setMandatoryConditionFields(List.of(conditionalElement.getKey()));
+    element.setMandatoryConditionValues(Map.of(conditionalElement.getKey(), value));
+    element.setVisibleConditionFields(List.of(conditionalElement.getKey()));
+    element.setMandatoryConditionValues(Map.of(conditionalElement.getKey(), value));
     element.setMandatory(false);
     this.fields.add(element);
     return this;

openbas-framework/src/main/java/io/openbas/injector_contract/fields/ContractElement.java

@@ -3,6 +3,7 @@
 import io.openbas.model.LinkedFieldModel;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,9 +21,13 @@ public abstract class ContractElement {
 
   private List<String> mandatoryGroups;
 
-  private List<ContractElement> mandatoryConditionFields;
+  private List<String> mandatoryConditionFields;
 
-  private List<String> mandatoryConditionValues;
+  private Map<String, String> mandatoryConditionValues;
+
+  private List<String> visibleConditionFields;
+
+  private Map<String, String> visibleConditionValues;
 
   private List<LinkedFieldModel> linkedFields = new ArrayList<>();
 

openbas-model/src/main/java/io/openbas/database/model/InjectorContract.java

@@ -171,14 +171,14 @@ public int hashCode() {
 
   // -- INJECTOR CONTRACT CONTENT --
 
-  public static final String CONTACT_CONTENT_FIELDS = "fields";
-  public static final String CONTACT_ELEMENT_CONTENT_KEY = "key";
-  public static final String CONTACT_ELEMENT_CONTENT_TYPE = "type";
-  public static final String CONTACT_ELEMENT_CONTENT_MANDATORY = "mandatory";
-  public static final String CONTACT_ELEMENT_CONTENT_MANDATORY_GROUPS = "mandatoryGroups";
-  public static final String CONTACT_ELEMENT_CONTENT_MANDATORY_CONDITIONAL_FIELDS =
+  public static final String CONTRACT_CONTENT_FIELDS = "fields";
+  public static final String CONTRACT_ELEMENT_CONTENT_KEY = "key";
+  public static final String CONTRACT_ELEMENT_CONTENT_TYPE = "type";
+  public static final String CONTRACT_ELEMENT_CONTENT_MANDATORY = "mandatory";
+  public static final String CONTRACT_ELEMENT_CONTENT_MANDATORY_GROUPS = "mandatoryGroups";
+  public static final String CONTRACT_ELEMENT_CONTENT_MANDATORY_CONDITIONAL_FIELDS =
       "mandatoryConditionFields";
-  public static final String CONTACT_ELEMENT_CONTENT_MANDATORY_CONDITIONAL_VALUES =
+  public static final String CONTRACT_ELEMENT_CONTENT_MANDATORY_CONDITIONAL_VALUES =
       "mandatoryConditionValues";
   public static final String DEFAULT_VALUE_FIELD = "defaultValue";
 
@@ -190,9 +190,9 @@ public int hashCode() {
   public static final String CONTRACT_ELEMENT_CONTENT_KEY_ATTACHMENTS = "attachments";
   public static final String CONTRACT_ELEMENT_CONTENT_KEY_EXPECTATIONS = "expectations";
 
-  public static final String CONTACT_ELEMENT_CONTENT_TYPE_ASSET = "asset";
-  public static final String CONTACT_ELEMENT_CONTENT_TYPE_ASSET_GROUP = "asset-group";
-  public static final String CONTACT_ELEMENT_CONTENT_TYPE_TEAM = "team";
+  public static final String CONTRACT_ELEMENT_CONTENT_TYPE_ASSET = "asset";
+  public static final String CONTRACT_ELEMENT_CONTENT_TYPE_ASSET_GROUP = "asset-group";
+  public static final String CONTRACT_ELEMENT_CONTENT_TYPE_TEAM = "team";
 
   public static final List<String> CONTRACT_ELEMENT_CONTENT_KEY_NOT_DYNAMIC =
       List.of(