limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

fix attemps to merge map

Browse source
This commit is contained in:
Alexander Strizhakov 2020-05-31 13:25:04 +03:00
parent 23decaab81
commit e1603ac8fe
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/config/config_db.ex
View file

@ -135,7 +135,8 @@ defmodule Pleroma.ConfigDB do
with %ConfigDB{} = config <- ConfigDB.get_by_params(search_opts), with %ConfigDB{} = config <- ConfigDB.get_by_params(search_opts),
{_, true, config} <- {:partial_update, can_be_partially_updated?(config), config}, {_, 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]) new_value = merge_group(config.group, config.key, config.value, params[:value])
update(config, %{value: new_value}) update(config, %{value: new_value})
else else

8
test/config/config_db_test.exs
View file

@ -43,7 +43,7 @@ defmodule Pleroma.ConfigDBTest do
params = [ params = [
%{group: :pleroma, key: key2, value: "another_value"}, %{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 assert Repo.all(ConfigDB) |> length() == 1
@ -55,7 +55,7 @@ defmodule Pleroma.ConfigDBTest do
config1 = ConfigDB.get_by_params(%{group: config.group, key: config.key}) config1 = ConfigDB.get_by_params(%{group: config.group, key: config.key})
config2 = ConfigDB.get_by_params(%{group: :pleroma, key: key2}) 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" assert config2.value == "another_value"
end end
@ -398,6 +398,10 @@ defmodule Pleroma.ConfigDBTest do
] ]
end 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 test "complex keyword with nested mixed childs" do
assert ConfigDB.to_elixir_types([ assert ConfigDB.to_elixir_types([
%{"tuple" => [":uploader", "Pleroma.Uploaders.Local"]}, %{"tuple" => [":uploader", "Pleroma.Uploaders.Local"]},