Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

661 concatenate fields transformation #1600

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule AndiWeb.IngestionLiveView.Transformations.TransformationFieldBuilder d

alias AndiWeb.ErrorHelpers

def build_input(%{field_type: "string"} = field, assigns, form) do
def build_input(field, assigns, form) do
name = String.to_atom(field.field_name)
value = get_in(form.source.changes, [:parameters, name])

Expand Down
2 changes: 1 addition & 1 deletion apps/andi/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Andi.MixProject do
def project do
[
app: :andi,
version: "2.5.52",
version: "2.5.53",
build_path: "../../_build",
config_path: "../../config/config.exs",
deps_path: "../../deps",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,43 @@ defmodule AndiWeb.IngestionLiveView.Transformations.TransformationFormTest do
assert element(view, "##{target_field_type}") |> has_element?()
end

test "after selecting concatenation transformation, conversion fields appear" do
transformation_changeset = Transformation.changeset_for_draft(%{})
assert {:ok, view, html} = render_transformation_form(transformation_changeset)

select_type("concatenation", view)

source_fields_id = build_field_id("sourceFields")
target_field_id = build_field_id("targetField")
separator_field_id = build_field_id("separator")

assert has_element?(view, ".transformation-field")
assert element(view, "label[for=#{source_fields_id}]", "Source Fields") |> has_element?()
assert element(view, "label[for=#{target_field_id}]", "Target Field") |> has_element?()
assert element(view, "label[for=#{separator_field_id}]", "Separator") |> has_element?()
assert element(view, "##{source_fields_id}") |> has_element?()
assert element(view, "##{target_field_id}") |> has_element?()
assert element(view, "##{separator_field_id}") |> has_element?()
end

test "if concatenation transformation is selected show fields on load" do
transformation_changeset = Transformation.changeset_for_draft(%{type: "concatenation"})

assert {:ok, view, html} = render_transformation_form(transformation_changeset)

source_fields_id = build_field_id("sourceFields")
target_field_id = build_field_id("targetField")
separator_field_id = build_field_id("separator")

assert has_element?(view, ".transformation-field")
assert element(view, "label[for=#{source_fields_id}]", "Source Fields") |> has_element?()
assert element(view, "label[for=#{target_field_id}]", "Target Field") |> has_element?()
assert element(view, "label[for=#{separator_field_id}]", "Separator") |> has_element?()
assert element(view, "##{source_fields_id}") |> has_element?()
assert element(view, "##{target_field_id}") |> has_element?()
assert element(view, "##{separator_field_id}") |> has_element?()
end

test "shows error message if field missing" do
transformation_changeset = Transformation.changeset_for_draft(%{type: "remove"})
assert {:ok, view, html} = render_transformation_form(transformation_changeset)
Expand Down
4 changes: 4 additions & 0 deletions apps/transformers/lib/transformation_fields.ex
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ defmodule Transformers.TransformationFields do
Transformers.TypeConversion.fields()
end

def fields_for("concatenation") do
Transformers.Concatenation.fields()
end

def fields_for(_unsupported) do
[]
end
Expand Down
28 changes: 26 additions & 2 deletions apps/transformers/lib/transformations/concatenation.ex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ defmodule Transformers.Concatenation do
@impl Transformation
def transform(payload, parameters) do
with {:ok, [source_fields, separator, target_field]} <- validate(parameters),
{:ok, values} <- fetch_values(payload, source_fields),
{:ok, values} <-
fetch_values(payload, String.split(source_fields, [" ", ","], trim: true)),
:ok <- can_convert_to_string?(values) do
joined_string = Enum.join(values, separator)
transformed = Map.put(payload, target_field, joined_string)
Expand All @@ -30,7 +31,7 @@ defmodule Transformers.Concatenation do
|> ValidationStatus.ordered_values_or_errors([@source_fields, @separator, @target_field])
end

def fetch_values(payload, field_names) when is_list(field_names) do
def fetch_values(payload, field_names) when is_list(field_names) and length(field_names) > 1 do
find_values_or_errors(payload, field_names)
|> all_values_if_present_else_error()
end
Expand Down Expand Up @@ -83,4 +84,27 @@ defmodule Transformers.Concatenation do
_ -> {:error, "Could not convert all source fields into strings"}
end
end

def fields() do
[
%{
field_name: @source_fields,
field_type: "list",
field_label: "Source Fields",
options: nil
},
%{
field_name: @separator,
field_type: "string",
field_label: "Separator",
options: nil
},
%{
field_name: @target_field,
field_type: "string",
field_label: "Target Field",
options: nil
}
]
end
end
2 changes: 1 addition & 1 deletion apps/transformers/test/unit/operation_builder_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ defmodule Transformers.OperationBuilderTest do

test "concatenation function" do
params = %{
"sourceFields" => ["greeting", "target"],
"sourceFields" => "greeting, target",
"targetField" => "salutation",
"separator" => " "
}
Expand Down
20 changes: 10 additions & 10 deletions apps/transformers/test/unit/transformations/concatenation_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defmodule Transformers.ConcatenationTest do

parameters =
%{
"sourceFields" => ["name", "last_name"],
"sourceFields" => "name, last_name",
"separator" => ".",
"targetField" => "full_name"
}
Expand All @@ -35,7 +35,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["first_name", "middle_initial", "last_name"],
"sourceFields" => "first_name, middle_initial, last_name",
"separator" => ".",
"targetField" => "full_name"
}
Expand Down Expand Up @@ -70,7 +70,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["first_name", "middle_initial", "last_name"],
"sourceFields" => "first_name, middle_initial, last_name",
"separator" => ".",
"targetField" => "full_name"
}
Expand All @@ -91,7 +91,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["name", "middle_initial", "last_name"],
"sourceFields" => "name, middle_initial, last_name",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -110,7 +110,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["name", "other"],
"sourceFields" => "name, other",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -128,7 +128,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["name", "other"],
"sourceFields" => "name, other",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -146,7 +146,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["other", "name"],
"sourceFields" => "other, name",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -163,7 +163,7 @@ defmodule Transformers.ConcatenationTest do
}

parameters = %{
"sourceFields" => ["other", "name"],
"sourceFields" => "other, name",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -177,7 +177,7 @@ defmodule Transformers.ConcatenationTest do
describe "validate/1" do
test "returns :ok if all parameters are present" do
parameters = %{
"sourceFields" => ["other", "name"],
"sourceFields" => "other, name",
"separator" => ".",
"targetField" => "name"
}
Expand All @@ -192,7 +192,7 @@ defmodule Transformers.ConcatenationTest do
data_test "when missing parameter #{parameter} return error #{message}" do
parameters =
%{
"sourceFields" => ["name", "last_name"],
"sourceFields" => "name, last_name",
"separator" => ".",
"targetField" => "full_name"
}
Expand Down