From 161cc0cda9d2a6128f5ab128eb0d263de2d8b032 Mon Sep 17 00:00:00 2001 From: takatost Date: Wed, 4 Sep 2024 10:00:55 +0800 Subject: [PATCH] Revert "fix: an issue of keyword search feature in application log list" (#7949) --- api/controllers/console/app/conversation.py | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py index c3aac6690e..753a6be20c 100644 --- a/api/controllers/console/app/conversation.py +++ b/api/controllers/console/app/conversation.py @@ -173,18 +173,21 @@ class ChatConversationApi(Resource): if args["keyword"]: keyword_filter = "%{}%".format(args["keyword"]) - 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), - ), + 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), + ), + ) ) account = current_user