Reuse existing addresses when creating an event

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/mobilizon_web/resolvers/address.ex

@@ -20,6 +20,18 @@ defmodule MobilizonWeb.Resolvers.Address do
 
     addresses = Task.await(local_addresses) ++ Task.await(remote_addresses)
 
+    # If we have results with same origin_id than those locally saved, don't return them
+    addresses =
+      Enum.reduce(addresses, %{}, fn address, addresses ->
+        if Map.has_key?(addresses, address.origin_id) && !is_nil(address.url) do
+          addresses
+        else
+          Map.put(addresses, address.origin_id, address)
+        end
+      end)
+
+    addresses = Map.values(addresses)
+
     {:ok, addresses}
   end
 

lib/mobilizon_web/resolvers/event.ex

@@ -208,20 +208,21 @@ defmodule MobilizonWeb.Resolvers.Event do
   defp save_attached_picture(args), do: {:ok, args}
 
   @spec save_physical_address(map()) :: {:ok, map()}
-  defp save_physical_address(%{physical_address: %{url: physical_address_url}} = args) do
+  defp save_physical_address(%{physical_address: %{url: physical_address_url}} = args)
+       when not is_nil(physical_address_url) do
     with %Address{} = address <- Addresses.get_address_by_url(physical_address_url),
-         args <- Map.put(args, :physical_address, address) do
+         args <- Map.put(args, :physical_address, address.url) do
       {:ok, args}
     end
   end
 
-  #  @spec save_physical_address(map()) :: {:ok, map()}
-  #  defp save_physical_address(%{physical_address: address} = args) do
-  #    with {:ok, %Address{} = address} <- Addresses.create_address(address),
-  #         args <- Map.put(args, :physical_address, address) do
-  #      {:ok, args}
-  #    end
-  #  end
+  @spec save_physical_address(map()) :: {:ok, map()}
+  defp save_physical_address(%{physical_address: address} = args) do
+    with {:ok, %Address{} = address} <- Addresses.create_address(address),
+         args <- Map.put(args, :physical_address, address.url) do
+      {:ok, args}
+    end
+  end
 
   @spec save_physical_address(map()) :: {:ok, map()}
   defp save_physical_address(args), do: {:ok, args}

lib/mobilizon_web/schema/address.ex

@@ -15,6 +15,8 @@ defmodule MobilizonWeb.Schema.AddressType do
     field(:country, :string)
     field(:description, :string)
     field(:url, :string)
+    field(:id, :integer)
+    field(:origin_id, :string)
   end
 
   object :phone_address do
@@ -38,6 +40,8 @@ defmodule MobilizonWeb.Schema.AddressType do
     field(:country, :string)
     field(:description, :string)
     field(:url, :string)
+    field(:id, :integer)
+    field(:origin_id, :string)
   end
 
   object :address_queries do