Refactor for Credo

Author: AntoineAugusti

apps/transport/lib/transport/dataset_index.ex

@@ -180,18 +180,24 @@ defmodule Transport.DatasetIndex do
   end
 
   defp matches_filters?(entry, params) do
+    matches_dataset_filters?(entry, params) and matches_resource_filters?(entry, params)
+  end
+
+  defp matches_dataset_filters?(entry, params) do
     match_type?(entry, params) and
       match_subtype?(entry, params) and
       match_licence?(entry, params) and
       match_has_realtime?(entry, params) and
-      match_format?(entry, params) and
       match_region?(entry, params) and
       match_custom_tag?(entry, params) and
       match_organization_id?(entry, params) and
-      match_modes?(entry, params) and
       match_offer?(entry, params)
   end
 
+  defp matches_resource_filters?(entry, params) do
+    match_format?(entry, params) and match_modes?(entry, params)
+  end
+
   defp match_type?(_entry, %{"type" => type}) when type in [nil, ""], do: true
   defp match_type?(entry, %{"type" => type}), do: entry.type == type
   defp match_type?(_entry, _params), do: true
@@ -280,25 +286,23 @@ defmodule Transport.DatasetIndex do
     pan_publisher = Application.fetch_env!(:transport, :datagouvfr_transport_publisher_id)
 
     dataset_ids
-    |> Enum.sort_by(
-      fn id ->
-        entry = index[id]
-
-        base_nationale_priority =
-          if to_string(entry.organization_id) == pan_publisher and
-               is_binary(entry.custom_title) and
-               String.starts_with?(String.downcase(entry.custom_title), "base nationale") do
-            0
-          else
-            1
-          end
-
-        population = -(entry.population || 0)
-        title = (entry.custom_title || "") |> String.downcase()
-
-        {base_nationale_priority, population, title}
-      end
-    )
+    |> Enum.sort_by(fn id ->
+      entry = index[id]
+
+      base_nationale_priority =
+        if to_string(entry.organization_id) == pan_publisher and
+             is_binary(entry.custom_title) and
+             String.starts_with?(String.downcase(entry.custom_title), "base nationale") do
+          0
+        else
+          1
+        end
+
+      population = -(entry.population || 0)
+      title = (entry.custom_title || "") |> String.downcase()
+
+      {base_nationale_priority, population, title}
+    end)
   end
 
   defp all_regions do

apps/transport/test/transport/dataset_index_test.exs

@@ -302,7 +302,10 @@ defmodule Transport.DatasetIndexTest do
       _d2 = insert(:dataset)
 
       index = Transport.DatasetIndex.build_index()
-      ids = Transport.DatasetIndex.filter_dataset_ids(index, %{"identifiant_offre" => to_string(offer.identifiant_offre)})
+
+      ids =
+        Transport.DatasetIndex.filter_dataset_ids(index, %{"identifiant_offre" => to_string(offer.identifiant_offre)})
+
       assert ids == [d1.id]
     end