refactored

Author: JannikStreek

lib/mindwendel/services/chat_completions/chat_completions_service_impl.ex

@@ -82,7 +82,7 @@ defmodule Mindwendel.Services.ChatCompletions.ChatCompletionsServiceImpl do
 
     has_multiple_lanes = length(lanes) > 1
 
-    # System prompt - contains only instructions, no user-generated content
+    # System prompt must contain only instructions, never user-generated content
     system_content =
       if has_multiple_lanes do
         ~s|Generate ONLY valid JSON in the specified language. Format: [{"idea": "string", "lane_id": "uuid-or-null"}]. | <>
@@ -148,6 +148,7 @@ defmodule Mindwendel.Services.ChatCompletions.ChatCompletionsServiceImpl do
       ideas
       |> Enum.map(&normalize_idea_payload/1)
 
+    # System prompt must remain free of user-generated content to avoid prompt injection
     system_content =
       "You cluster brainstorming ideas into the existing labels provided. Respond ONLY with valid JSON. " <>
         ~s|Format: [{"idea_id": "uuid", "label_ids": ["uuid"...], "new_labels": [{"id": "uuid", "name": "string or null", "color": "#rrggbb or null"}]}]. | <>

lib/mindwendel/services/idea_clustering_service.ex

@@ -8,11 +8,8 @@ defmodule Mindwendel.Services.IdeaClusteringService do
 
   require Logger
 
-  import Ecto.Query, only: [from: 2]
-
   alias Mindwendel.Brainstormings.Brainstorming
   alias Mindwendel.Brainstormings.IdeaLabel
-  alias Mindwendel.Brainstormings.Lane
   alias Mindwendel.IdeaLabels
   alias Mindwendel.Ideas
   alias Mindwendel.Repo
@@ -486,16 +483,5 @@ defmodule Mindwendel.Services.IdeaClusteringService do
 
   defp normalize_label_name(_), do: nil
 
-  defp preload_brainstorming(brainstorming) do
-    Repo.preload(brainstorming, [
-      :labels,
-      lanes:
-        from(l in Lane,
-          order_by: [
-            asc: l.position_order,
-            asc: l.inserted_at
-          ]
-        )
-    ])
-  end
+  defp preload_brainstorming(brainstorming), do: Repo.preload(brainstorming, :labels)
 end

lib/mindwendel_web/live/brainstorming_live/show.ex

@@ -286,20 +286,8 @@ defmodule MindwendelWeb.BrainstormingLive.Show do
     )
   end
 
-  defp handle_ai_clustering_result({:ok, assignments} = result, id, socket)
-       when is_list(assignments) do
-    lanes = Lanes.get_lanes_for_brainstorming_with_labels_filtered(id)
-
-    socket =
-      socket
-      |> assign(:lanes, lanes)
-      |> maybe_assign_updated_brainstorming(id)
-      |> put_clustering_flash(result)
-
-    {:noreply, socket}
-  end
-
-  defp handle_ai_clustering_result({:ok, :skipped} = result, id, socket) do
+  defp handle_ai_clustering_result({:ok, outcome} = result, id, socket)
+       when is_list(outcome) or outcome == :skipped do
     lanes = Lanes.get_lanes_for_brainstorming_with_labels_filtered(id)
 
     socket =

test/support/chat_completions_case.ex

@@ -26,22 +26,16 @@ defmodule Mindwendel.ChatCompletionsCase do
 
   # Default stub: AI is disabled
   # Tests can override this with expect() for specific behavior
-  def setup_ai_disabled_stub(_context) do
-    Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock
-    |> stub(:enabled?, fn -> false end)
-    |> stub(:generate_ideas, fn _title, _lanes, _existing_ideas, _locale ->
-      {:error, :ai_not_enabled}
-    end)
-    |> stub(:classify_labels, fn _title, _labels, _ideas, _locale ->
-      {:error, :ai_not_enabled}
-    end)
-
-    :ok
-  end
+  def setup_ai_disabled_stub(_context), do: disable_ai()
 
   # Helper to explicitly stub AI as disabled (for clarity in tests)
   def disable_ai do
     # Already stubbed in setup, but this allows explicit calls
+    stub_ai_disabled()
+    :ok
+  end
+
+  defp stub_ai_disabled do
     Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock
     |> stub(:enabled?, fn -> false end)
     |> stub(:generate_ideas, fn _title, _lanes, _existing_ideas, _locale ->
@@ -50,8 +44,6 @@ defmodule Mindwendel.ChatCompletionsCase do
     |> stub(:classify_labels, fn _title, _labels, _ideas, _locale ->
       {:error, :ai_not_enabled}
     end)
-
-    :ok
   end
 
   # Helper to set up AI enabled with specific expectations