PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-23 20:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix source differ and caller to accept nested fields_for input

Browse source
This commit is contained in:
byte[] 2021-10-10 08:22:30 -04:00 committed by Luna D
parent adc77429f6
commit cb1d2b97ff
No known key found for this signature in database
GPG key ID: 4B1C63448394F688
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/philomena/images.ex
View file

@ -335,21 +335,19 @@ defmodule Philomena.Images do
new_sources = attrs["sources"] new_sources = attrs["sources"]
Multi.new() Multi.new()
|> Multi.run( |> Multi.run(:image, fn repo, _chg ->
:image, image = repo.preload(image, [:sources])
fn repo, _chg ->
image = repo.preload(image, [:sources])
image image
|> Image.source_changeset(%{}, old_sources, new_sources) |> Image.source_changeset(%{}, old_sources, new_sources)
|> repo.update() |> repo.update()
|> case do |> case do
{:ok, image} -> {:ok, image} ->
{:ok, {image, image.added_sources, image.removed_sources}} {:ok, {image, image.added_sources, image.removed_sources}}
error -> error ->
error error
end end
end) end)
|> Multi.run(:added_source_changes, fn repo, %{image: {image, added_sources, _removed}} -> |> Multi.run(:added_source_changes, fn repo, %{image: {image, added_sources, _removed}} ->
source_changes = source_changes =
@ -383,7 +381,7 @@ defmodule Philomena.Images do
%{ %{
image_id: image.id, image_id: image.id,
source: source, source_url: source,
user_id: user_id, user_id: user_id,
created_at: now, created_at: now,
updated_at: now, updated_at: now,

23
lib/philomena/images/source_differ.ex
View file

@ -3,8 +3,8 @@ defmodule Philomena.Images.SourceDiffer do
alias Philomena.Images.Source alias Philomena.Images.Source
def diff_input(changeset, old_sources, new_sources) do def diff_input(changeset, old_sources, new_sources) do
old_set = MapSet.new(old_sources) old_set = MapSet.new(flatten_input(old_sources))
new_set = MapSet.new(new_sources) new_set = MapSet.new(flatten_input(new_sources))
source_set = MapSet.new(get_field(changeset, :sources), & &1.source) source_set = MapSet.new(get_field(changeset, :sources), & &1.source)
added_sources = MapSet.difference(new_set, old_set) added_sources = MapSet.difference(new_set, old_set)
@ -47,4 +47,23 @@ defmodule Philomena.Images.SourceDiffer do
defp source_structs(image_id, sources) do defp source_structs(image_id, sources) do
Enum.map(sources, &%Source{image_id: image_id, source: &1}) Enum.map(sources, &%Source{image_id: image_id, source: &1})
end end
defp flatten_input(input) when is_map(input) do
Enum.flat_map(Map.values(input), fn
%{"source" => source} ->
source = String.trim(source)
if source != "" do
[source]
else
[]
end
_ -> []
end)
end
defp flatten_input(_input) do
[]
end
end end

6
priv/repo/structure.sql
View file

@ -841,9 +841,9 @@ ALTER SEQUENCE public.image_intensities_id_seq OWNED BY public.image_intensities
-- Name: image_sources; Type: TABLE; Schema: public; Owner: - -- Name: image_sources; Type: TABLE; Schema: public; Owner: -
-- --
CREATE TABLE public.image_sources( CREATE TABLE public.image_sources (
image_id bigint NOT NULL, image_id bigint NOT NULL,
source character varying(255) NOT NULL, source character varying(255) NOT NULL,
CONSTRAINT image_sources_source_check CHECK (((source)::text ~* '^https?://'::text)) CONSTRAINT image_sources_source_check CHECK (((source)::text ~* '^https?://'::text))
); );