Do not trigger preloads for brainstorming when unneeded

lib/mindwendel/brainstormings.ex

@@ -67,7 +67,8 @@ defmodule Mindwendel.Brainstormings do
   """
   # See https://stackoverflow.com/questions/53802091/elixir-uuid-how-to-handle-500-error-when-uuid-doesnt-match
   def get_brainstorming!(id) do
-    Repo.get!(Brainstorming, id)
+    id
+    |> get_bare_brainstorming!()
     |> Repo.preload([
       :users,
       :moderating_users,
@@ -76,6 +77,10 @@ defmodule Mindwendel.Brainstormings do
     |> update_last_accessed_at
   end
 
+  def get_bare_brainstorming!(id) do
+    Repo.get!(Brainstorming, id)
+  end
+
   @doc """
   Gets a single brainstorming with the admin url id
   """

lib/mindwendel/lanes.ex

@@ -70,14 +70,9 @@ defmodule Mindwendel.Lanes do
 
   """
   def get_lanes_for_brainstorming_with_labels_filtered(id) do
-    # optimization: brainstorming is only needed for filter_label_ideas
-    brainstorming = Brainstormings.get_brainstorming!(id)
+    brainstorming = Brainstormings.get_bare_brainstorming!(id)
 
-    # Enum/any?
-    filter_label =
-      if length(brainstorming.filter_labels_ids) > 0,
-        do: %{filter_labels_ids: brainstorming.filter_labels_ids},
-        else: %{}
+    filter_label = %{filter_labels_ids: brainstorming.filter_labels_ids}
 
     get_lanes_for_brainstorming(id, filter_label)
   end
@@ -91,7 +86,7 @@ defmodule Mindwendel.Lanes do
       [%Lane{}, ...]
 
   """
-  def get_lanes_for_brainstorming(id, filters \\ %{}) do
+  def get_lanes_for_brainstorming(id, filters \\ %{filter_labels_ids: []}) do
     lane_query =
       from lane in Lane,
         where: lane.brainstorming_id == ^id,
@@ -107,6 +102,10 @@ defmodule Mindwendel.Lanes do
     |> Repo.preload(ideas: {ideas_advanced_query, [:link, :likes, :idea_labels, :files]})
   end
 
+  defp build_ideas_query_with_filter(%{filter_labels_ids: []}) do
+    from(idea in Idea)
+  end
+
   defp build_ideas_query_with_filter(%{filter_labels_ids: filter_labels_ids}) do
     distinct_ideas =
       from idea in Idea,
@@ -120,10 +119,6 @@ defmodule Mindwendel.Lanes do
     )
   end
 
-  defp build_ideas_query_with_filter(%{} = _filters) do
-    from(idea in Idea)
-  end
-
   @doc """
   Creates a lane.
 

test/mindwendel/idea_labels_test.exs

@@ -46,8 +46,11 @@ defmodule Mindwendel.IdeaLabelsTest do
     @tag :skip
     test "does not add the same IdeaLabel twice to Idea", %{idea_label: idea_label, idea: idea} do
       # Calling this method twice does not fail and does not create duplicates
-      {:ok, idea_idea_label_after_method_call_1} = IdeaLabels.add_idea_label_to_idea(idea, idea_label)
-      {:ok, idea_idea_label_after_method_call_2} = IdeaLabels.add_idea_label_to_idea(idea, idea_label)
+      {:ok, idea_idea_label_after_method_call_1} =
+        IdeaLabels.add_idea_label_to_idea(idea, idea_label)
+
+      {:ok, idea_idea_label_after_method_call_2} =
+        IdeaLabels.add_idea_label_to_idea(idea, idea_label)
 
       # There should still be only one IdeaIdeaLabel
       assert Repo.count(IdeaIdeaLabel) == 1