1674 - Update Condition definition, remove one hierarchy level

Author: ivicac

server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java

@@ -34,6 +34,7 @@ public class ConditionTaskDispatcherConstants {
     public static final String NUMBER = "number";
     public static final String CASE_TRUE = "caseTrue";
     public static final String CASE_FALSE = "caseFalse";
+    public static final String TYPE = "type";
 
     public enum Operation {
         EQUALS,

server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/constant/ConditionTaskDispatcherConstants.java

@@ -46,13 +46,13 @@ public static boolean resolveCase(TaskExecution conditionTaskExecution) {
                 .parseExpression(MapUtils.getString(conditionTaskExecution.getParameters(), EXPRESSION))
                 .getValue(Boolean.class);
         } else {
-            List<List<Map<String, Map<String, ?>>>> conditions = MapUtils.getList(
+            List<List<Map<String, ?>>> conditions = MapUtils.getList(
                 conditionTaskExecution.getParameters(), ConditionTaskDispatcherConstants.CONDITIONS,
                 new TypeReference<>() {}, Collections.emptyList());
 
             List<String> conditionExpressions = new ArrayList<>();
 
-            for (List<Map<String, Map<String, ?>>> andConditions : conditions) {
+            for (List<Map<String, ?>> andConditions : conditions) {
                 conditionExpressions.add(String.join(" && ", getConditionExpressions(andConditions)));
             }
 
@@ -64,26 +64,24 @@ public static boolean resolveCase(TaskExecution conditionTaskExecution) {
         return result != null && result;
     }
 
-    private static List<String> getConditionExpressions(List<Map<String, Map<String, ?>>> conditions) {
+    private static List<String> getConditionExpressions(List<Map<String, ?>> conditions) {
         List<String> conditionExpressions = new ArrayList<>();
 
-        for (Map<String, Map<String, ?>> condition : conditions) {
-            for (String operandType : condition.keySet()) {
-                Map<String, ?> conditionParts = MapUtils.getMap(condition, operandType);
-
-                String conditionTemplate = conditionTemplates
-                    .get(operandType)
-                    .get(MapUtils.getRequiredString(conditionParts, ConditionTaskDispatcherConstants.OPERATION));
-
-                conditionExpressions.add(
-                    conditionTemplate
-                        .replace(
-                            "${value1}",
-                            MapUtils.getRequiredString(conditionParts, ConditionTaskDispatcherConstants.VALUE_1))
-                        .replace(
-                            "${value2}",
-                            MapUtils.getRequiredString(conditionParts, ConditionTaskDispatcherConstants.VALUE_2)));
-            }
+        for (Map<String, ?> condition : conditions) {
+            String operandType = MapUtils.getRequiredString(condition, "type");
+
+            String conditionTemplate = conditionTemplates
+                .get(operandType)
+                .get(MapUtils.getRequiredString(condition, ConditionTaskDispatcherConstants.OPERATION));
+
+            conditionExpressions.add(
+                conditionTemplate
+                    .replace(
+                        "${value1}",
+                        MapUtils.getRequiredString(condition, ConditionTaskDispatcherConstants.VALUE_1))
+                    .replace(
+                        "${value2}",
+                        MapUtils.getRequiredString(condition, ConditionTaskDispatcherConstants.VALUE_2)));
         }
 
         return conditionExpressions;