Verified Commit e1603ac8 authored by Alexander Strizhakov's avatar Alexander Strizhakov
Browse files

fix attemps to merge map

parent 23decaab
......@@ -135,7 +135,8 @@ def update_or_create(params) do
with %ConfigDB{} = config <- ConfigDB.get_by_params(search_opts),
{_, true, config} <- {:partial_update, can_be_partially_updated?(config), config},
{_, true, config} <- {:can_be_merged, is_list(params[:value]), config} do
{_, true, config} <-
{:can_be_merged, is_list(params[:value]) and is_list(config.value), config} do
new_value = merge_group(config.group, config.key, config.value, params[:value])
update(config, %{value: new_value})
else
......
......@@ -43,7 +43,7 @@ test "common" do
params = [
%{group: :pleroma, key: key2, value: "another_value"},
%{group: :pleroma, key: config.key, value: "new_value"}
%{group: :pleroma, key: config.key, value: [a: 1, b: 2, c: "new_value"]}
]
assert Repo.all(ConfigDB) |> length() == 1
......@@ -55,7 +55,7 @@ test "common" do
config1 = ConfigDB.get_by_params(%{group: config.group, key: config.key})
config2 = ConfigDB.get_by_params(%{group: :pleroma, key: key2})
assert config1.value == "new_value"
assert config1.value == [a: 1, b: 2, c: "new_value"]
assert config2.value == "another_value"
end
......@@ -398,6 +398,10 @@ test "keyword" do
]
end
test "trandformed keyword" do
assert ConfigDB.to_elixir_types(a: 1, b: 2, c: "string") == [a: 1, b: 2, c: "string"]
end
test "complex keyword with nested mixed childs" do
assert ConfigDB.to_elixir_types([
%{"tuple" => [":uploader", "Pleroma.Uploaders.Local"]},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment