Recherche de contacts : ignorer valeurs nulles (#3352)

etalab · Jul 26, 2023 · ab2f338 · ab2f338
1 parent 0920dd2
commit ab2f338
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/apps/transport/lib/transport_web/controllers/backoffice/contact_controller.ex b/apps/transport/lib/transport_web/controllers/backoffice/contact_controller.ex
@@ -77,7 +77,7 @@ defmodule TransportWeb.Backoffice.ContactController do
     |> render("index.html")
   end
 
-  defp search_datalist do
+  def search_datalist do
     :organization
     |> contact_values_for_field()
     |> Enum.concat(contact_values_for_field(:last_name))
@@ -87,6 +87,7 @@ defmodule TransportWeb.Backoffice.ContactController do
   defp contact_values_for_field(field) when is_atom(field) do
     DB.Contact.base_query()
     |> select([contact: c], field(c, ^field))
+    |> where([contact: c], not is_nil(field(c, ^field)))
     |> order_by([contact: c], asc: ^field)
     |> distinct(true)
     |> DB.Repo.all()

diff --git a/apps/transport/lib/transport_web/views/backoffice/page_view.ex b/apps/transport/lib/transport_web/views/backoffice/page_view.ex
@@ -66,13 +66,17 @@ defmodule TransportWeb.Backoffice.PageView do
 
   @doc """
   Replaces accented letters by their regular versions.
-
-  From https://stackoverflow.com/a/68724296
+  Taken from https://stackoverflow.com/a/68724296
 
   iex> unaccent("Et Ça sera sa moitié.")
   "Et Ca sera sa moitie."
+  iex> unaccent(nil)
+  ""
   """
-  def unaccent(value) do
+  @spec unaccent(nil | binary()) :: binary()
+  def unaccent(nil), do: ""
+
+  def unaccent(value) when is_binary(value) do
     ~R<\p{Mn}>u
     |> Regex.replace(value |> :unicode.characters_to_nfd_binary(), "")
     |> :unicode.characters_to_nfc_binary()

diff --git a/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs
@@ -1,6 +1,7 @@
 defmodule TransportWeb.Backoffice.ContactControllerTest do
   use TransportWeb.ConnCase, async: true
   import DB.Factory
+  alias TransportWeb.Backoffice.ContactController
 
   setup do
     Ecto.Adapters.SQL.Sandbox.checkout(DB.Repo)
@@ -199,6 +200,17 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
     assert is_nil(DB.Repo.reload(contact))
   end
 
+  test "search_datalist" do
+    DB.Contact.insert!(sample_contact_args(%{last_name: "Doe", organization: "FooBar"}))
+    DB.Contact.insert!(sample_contact_args(%{last_name: "Oppenheimer", organization: "FooBar"}))
+
+    DB.Contact.insert!(
+      sample_contact_args(%{first_name: nil, last_name: nil, organization: "Disney", mailing_list_title: "Data"})
+    )
+
+    assert ["Disney", "Doe", "FooBar", "Oppenheimer"] == ContactController.search_datalist()
+  end
+
   defp sample_contact_args(%{} = args \\ %{}) do
     Map.merge(
       %{