From 49ee147fe3215b165f42d84135f53e8592424e8f Mon Sep 17 00:00:00 2001 From: Pranav Date: Wed, 26 Mar 2025 11:11:01 -0700 Subject: [PATCH] fix: Remove where query if admin (#11183) When finding conversation if it is an admin, we don't need to filter it by inbox ids. --- app/finders/conversation_finder.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb index 44592c201..0ef00cba6 100644 --- a/app/finders/conversation_finder.rb +++ b/app/finders/conversation_finder.rb @@ -32,6 +32,7 @@ class ConversationFinder def initialize(current_user, params) @current_user = current_user @current_account = current_user.account + @is_admin = current_account.account_users.find_by(user_id: current_user.id)&.administrator? @params = params end @@ -86,7 +87,8 @@ class ConversationFinder end def find_all_conversations - @conversations = current_account.conversations.where(inbox_id: @inbox_ids) + @conversations = current_account.conversations + @conversations = @conversations.where(inbox_id: @inbox_ids) unless @is_admin filter_by_conversation_type if params[:conversation_type] @conversations end