From ea748b50f271d87a681c90da42298b6d7c59e9ad Mon Sep 17 00:00:00 2001
From: Ethan <118581835+realethanhsu@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:48:05 +0800
Subject: [PATCH] fix: an issue of keyword search feature in application log
 list (#7816)

---
 api/controllers/console/app/conversation.py | 27 +++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py
index 753a6be20c..c3aac6690e 100644
--- a/api/controllers/console/app/conversation.py
+++ b/api/controllers/console/app/conversation.py
@@ -173,21 +173,18 @@ class ChatConversationApi(Resource):
 
         if args["keyword"]:
             keyword_filter = "%{}%".format(args["keyword"])
-            query = (
-                query.join(
-                    Message,
-                    Message.conversation_id == Conversation.id,
-                )
-                .join(subquery, subquery.c.conversation_id == Conversation.id)
-                .filter(
-                    or_(
-                        Message.query.ilike(keyword_filter),
-                        Message.answer.ilike(keyword_filter),
-                        Conversation.name.ilike(keyword_filter),
-                        Conversation.introduction.ilike(keyword_filter),
-                        subquery.c.from_end_user_session_id.ilike(keyword_filter),
-                    ),
-                )
+            message_subquery = (
+                db.session.query(Message.conversation_id)
+                .filter(or_(Message.query.ilike(keyword_filter), Message.answer.ilike(keyword_filter)))
+                .subquery()
+            )
+            query = query.join(subquery, subquery.c.conversation_id == Conversation.id).filter(
+                or_(
+                    Conversation.id.in_(message_subquery),
+                    Conversation.name.ilike(keyword_filter),
+                    Conversation.introduction.ilike(keyword_filter),
+                    subquery.c.from_end_user_session_id.ilike(keyword_filter),
+                ),
             )
 
         account = current_user