add not equals operation option and add string operation mapper for c…

…onditional transform (#1641)

apps/alchemist/mix.exs

@@ -4,7 +4,7 @@ defmodule Alchemist.MixProject do
   def project do
     [
       app: :alchemist,
-      version: "0.2.24",
+      version: "0.2.25",
       elixir: "~> 1.10",
       build_path: "../../_build",
       config_path: "../../config/config.exs",

apps/andi/lib/andi_web/live/ingestion_live_view/transformations/transformation_field_builder.ex

@@ -27,7 +27,7 @@ defmodule AndiWeb.IngestionLiveView.Transformations.TransformationFieldBuilder d
       </div>
       <div>
         <%= label(form, :conditionOperation, "Comparison", class: "label label--required", for: "transformation_condition_#{@id}__comparison") %>
-        <%= select(form, :conditionOperation, ["", "Is Equal To", "Is Greater Than", "Is Less Than"], [value: get_in(form.source.changes, [:parameters, :conditionOperation]), id: "transformation_condition_#{@id}__comparison", class: "select transformation-type", required: true]) %>
+        <%= select(form, :conditionOperation, ["", "Is Equal To", "Is Not Equal To", "Is Greater Than", "Is Less Than"], [value: get_in(form.source.changes, [:parameters, :conditionOperation]), id: "transformation_condition_#{@id}__comparison", class: "select transformation-type", required: true]) %>
         <%= ErrorHelpers.error_tag(form.source, :conditionOperation, bind_to_input: false, id: "#{@id}_transformation_condition_comparison_error") %>
       </div>
       <div>

apps/andi/mix.exs

@@ -4,7 +4,7 @@ defmodule Andi.MixProject do
   def project do
     [
       app: :andi,
-      version: "2.6.5",
+      version: "2.6.51",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/transformers/lib/transformation_conditions.ex

@@ -128,7 +128,7 @@ defmodule Transformers.Conditions do
           do: try_parse(Map.fetch!(payload, target_field), data_type, target_format),
           else: try_parse(target_value, data_type, target_format)
 
-      case operation do
+      case map_operation(operation) do
         "=" -> {:ok, left_value == right_value}
         "!=" -> {:ok, left_value != right_value}
         ">" -> {:ok, left_value > right_value}
@@ -160,4 +160,14 @@ defmodule Transformers.Conditions do
         raise "unsupported parse type"
     end
   end
+
+  def map_operation(value) do
+    case value do
+      "Is Equal To" -> "="
+      "Is Not Equal To" -> "!="
+      "Is Greater Than" -> ">"
+      "Is Less Than" -> "<"
+      _ -> value
+    end
+  end
 end

apps/transformers/mix.exs

@@ -4,7 +4,7 @@ defmodule Transformers.MixProject do
   def project do
     [
       app: :transformers,
-      version: "1.0.19",
+      version: "1.0.20",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/transformers/test/unit/conditions_test.exs

@@ -145,6 +145,29 @@ defmodule Transformers.ConditionsTest do
       result = Conditions.check(payload, parameters)
       assert result == {:ok, false}
     end
+
+    test "maps operation string 'Is Equal To'" do
+      parameters = %{
+        "targetField" => "testField",
+        "newValue" => "new value",
+        "valueType" => "string",
+        "condition" => "true",
+        "conditionCompareTo" => "Target Field",
+        "conditionDataType" => "string",
+        "sourceConditionField" => "testField",
+        "conditionOperation" => "Is Equal To",
+        "targetConditionField" => "compareField",
+        "targetConditionValue" => nil
+      }
+
+      payload = %{
+        "testField" => "value",
+        "compareField" => "value"
+      }
+
+      result = Conditions.check(payload, parameters)
+      assert result == {:ok, true}
+    end
   end
 
   describe "not equals" do
@@ -237,6 +260,28 @@ defmodule Transformers.ConditionsTest do
       result = Conditions.check(payload, parameters)
       assert result == {:ok, false}
     end
+
+    test "maps operation string 'Is Not Equal To'" do
+      parameters = %{
+        "targetField" => "testField",
+        "newValue" => "new value",
+        "valueType" => "string",
+        "condition" => "true",
+        "conditionCompareTo" => "Static Value",
+        "conditionDataType" => "string",
+        "sourceConditionField" => "testField",
+        "conditionOperation" => "Is Not Equal To",
+        "targetConditionField" => nil,
+        "targetConditionValue" => "othervalue"
+      }
+
+      payload = %{
+        "testField" => "value"
+      }
+
+      result = Conditions.check(payload, parameters)
+      assert result == {:ok, true}
+    end
   end
 
   describe "greater than" do
@@ -329,6 +374,28 @@ defmodule Transformers.ConditionsTest do
       result = Conditions.check(payload, parameters)
       assert result == {:ok, false}
     end
+
+    test "maps operation string 'Is Greater Than'" do
+      parameters = %{
+        "targetField" => "testField",
+        "newValue" => "new value",
+        "valueType" => "string",
+        "condition" => "true",
+        "conditionCompareTo" => "Static Value",
+        "conditionDataType" => "number",
+        "sourceConditionField" => "testField",
+        "conditionOperation" => "Is Greater Than",
+        "targetConditionField" => nil,
+        "targetConditionValue" => "1"
+      }
+
+      payload = %{
+        "testField" => 2
+      }
+
+      result = Conditions.check(payload, parameters)
+      assert result == {:ok, true}
+    end
   end
 
   describe "less than" do
@@ -421,6 +488,28 @@ defmodule Transformers.ConditionsTest do
       result = Conditions.check(payload, parameters)
       assert result == {:ok, false}
     end
+
+    test "maps operation string 'Is Less Than'" do
+      parameters = %{
+        "targetField" => "testField",
+        "newValue" => "new value",
+        "valueType" => "string",
+        "condition" => "true",
+        "conditionCompareTo" => "Static Value",
+        "conditionDataType" => "number",
+        "sourceConditionField" => "testField",
+        "conditionOperation" => "Is Less Than",
+        "targetConditionField" => nil,
+        "targetConditionValue" => "3"
+      }
+
+      payload = %{
+        "testField" => 2
+      }
+
+      result = Conditions.check(payload, parameters)
+      assert result == {:ok, true}
+    end
   end
 
   describe "datetime" do