DEV: Update tests

Author: janzenisaac

app/controllers/discourse_ai/ai_bot/conversations_controller.rb

@@ -13,11 +13,10 @@ def index
         # Step 2: Query for PM topics including current_user and any bot ID
         pms =
           Topic
+            .private_messages_for_user(current_user)
             .joins(:topic_users)
-            .private_messages
-            .where("topic_users.user_id IN (?)", bot_user_ids + [current_user.id])
-            .group("topics.id") # Group by topic to ensure distinct results
-            .having("COUNT(topic_users.user_id) > 1") # Ensure multiple participants in the PM
+            .where(topic_users: { user_id: bot_user_ids })
+            .distinct
 
         # Step 3: Serialize (empty array if no results)
         serialized_pms = serialize_data(pms, BasicTopicSerializer)

spec/system/ai_bot/personal_message_spec.rb

@@ -15,27 +15,22 @@
     AiPersona.last.update!(user_id: user.id)
     user
   end
-  fab!(:llm_model) do
-    Fabricate(:llm_model, provider: "anthropic", name: "claude-3-opus", enabled_chat_bot: true)
-  end
+  fab!(:llm_model) { Fabricate(:llm_model, enabled_chat_bot: true) }
 
-  fab!(:pm) do
-    Fabricate(
-      :private_message_topic,
-      title: "AI Conversation Test",
-      user: user,
-      topic_allowed_users: [
-        Fabricate.build(:topic_allowed_user, user: user),
-        Fabricate.build(:topic_allowed_user, user: bot_user),
-      ],
-    )
+  fab!(:pm) { Fabricate(:private_message_topic, title: "AI Conversation Test", user: user) }
+  fab!(:reply) do
+    Fabricate(:post, topic: pm, user: user, post_number: 1, raw: "test test test user reply")
+  end
+  fab!(:bot_reply) do
+    Fabricate(:post, topic: pm, user: bot_user, post_number: 2, raw: "test test test bot reply")
   end
-  fab!(:reply) { Fabricate(:post, topic: pm, user: user, raw: "test test test user reply") }
-  fab!(:bot_reply) { Fabricate(:post, topic: pm, user: bot_user, raw: "test test test bot reply") }
+  fab!(:topic_user) { Fabricate(:topic_user, topic: pm, user: user) }
+  fab!(:topic_bot_user) { Fabricate(:topic_user, topic: pm, user: bot_user) }
 
   before do
     SiteSetting.ai_enable_experimental_bot_ux = true
     SiteSetting.ai_bot_enabled = true
+    toggle_enabled_bots(bots: [llm_model])
     SiteSetting.ai_bot_allowed_groups = group.id.to_s
     sign_in(user)