AgentBot-owned conversations are now treated as assigned across conversation lists, counts, pagination, permissions, unread membership, human auto-assignment, and advanced assignee filters. ## Closes - https://linear.app/chatwoot/issue/CW-7689/align-agent-bot-ownership-with-unassigned-counts-and-pagination ## Follow-ups - https://linear.app/chatwoot/issue/CW-7870/refresh-agentbot-ownership-state-when-deleting-an-agent-bot tracks ownership refresh during AgentBot deletion. - https://linear.app/chatwoot/issue/CW-7899/refresh-saved-filter-totals-after-live-conversation-ownership-changes tracks the existing saved-filter header count refresh gap. ## Why The backend treated every conversation without a human assignee as unassigned, even when an AgentBot owned it. The frontend already hid AgentBot-owned conversations from the Unassigned list, so counts, pagination, filters, unread membership, direct-access permissions, and auto-assignment could disagree with the visible queue. ## What changed - Treat conversations with either a human assignee or AgentBot owner as assigned. - Keep conversation counts, pagination, unread memberships, advanced filters, and automation assignee conditions aligned with the shared ownership semantics. - Keep human assignee equality and not-equality filters human-only, even when a human and AgentBot have the same numeric ID. - Exclude AgentBot-owned conversations from both legacy and V2 human auto-assignment, and from unassigned-only Enterprise access. - Preserve AgentBot ownership when Twilio or WhatsApp call flows reuse or accept an assigned conversation. - Emit ownership-change updates when only the AgentBot owner changes, so connected clients refresh queue state. ## Validation - AgentBot assignment changed ownership to the bot, moved the conversation to pending, and removed it from the open queue. - Assignee "is present" returned human- and AgentBot-owned conversations; "is not present" returned only genuinely unassigned conversations. - Automation assignee presence conditions treated AgentBot ownership as present and did not execute the absent-owner path. - Live human-assignee equality and not-equality filters excluded AgentBot-owned conversations, including numeric ID collisions. - A 32-conversation pending queue loaded across pagination with matching totals and no missing or duplicate rows. - AgentBot ownership changes and human takeover updated filtered rows immediately without a reload. - Human takeover opened the conversation and restored the public reply composer; subsequent unassignment kept the conversation open. - An unassigned-only custom-role agent saw only genuinely unassigned conversations and could not see AgentBot-owned conversations. - AgentBot-owned conversations showed the handled-by-bot banner, Take over action, and disabled public reply composer. - New conversations in the connected inbox were assigned to the AgentBot and excluded from human auto-assignment. - Opening an AgentBot-owned conversation did not let the legacy assignment callback or its locked recheck replace the bot. - Moving an AgentBot-owned conversation to an auto-assigning team preserved the bot and did not create a second human owner. - Twilio conference pickup, Twilio outbound reuse, WhatsApp outbound reuse, and inbound WhatsApp acceptance preserved existing AgentBot owners. - Focused ownership, filters, pagination, permissions, unread-count, auto-assignment, frontend, and lint checks passed locally. - GitHub Actions, Docker builds, CircleCI, security checks, and the final Codex review are green on the final head.
231 lines
7.0 KiB
Ruby
231 lines
7.0 KiB
Ruby
class ConversationFinder
|
|
attr_reader :current_user, :current_account, :params
|
|
|
|
DEFAULT_STATUS = 'open'.freeze
|
|
SORT_OPTIONS = {
|
|
'last_activity_at_asc' => %w[sort_on_last_activity_at asc],
|
|
'last_activity_at_desc' => %w[sort_on_last_activity_at desc],
|
|
'created_at_asc' => %w[sort_on_created_at asc],
|
|
'created_at_desc' => %w[sort_on_created_at desc],
|
|
'priority_asc' => %w[sort_on_priority asc],
|
|
'priority_desc' => %w[sort_on_priority desc],
|
|
'waiting_since_asc' => %w[sort_on_waiting_since asc],
|
|
'waiting_since_desc' => %w[sort_on_waiting_since desc],
|
|
'priority_desc_created_at_asc' => %w[sort_on_priority_created_at desc],
|
|
'unread' => %w[sort_on_unread desc],
|
|
|
|
# To be removed in v3.5.0
|
|
'latest' => %w[sort_on_last_activity_at desc],
|
|
'sort_on_created_at' => %w[sort_on_created_at asc],
|
|
'sort_on_priority' => %w[sort_on_priority desc],
|
|
'sort_on_waiting_since' => %w[sort_on_waiting_since asc]
|
|
}.with_indifferent_access
|
|
# assumptions
|
|
# inbox_id if not given, take from all conversations, else specific to inbox
|
|
# assignee_type if not given, take 'all'
|
|
# conversation_status if not given, take 'open'
|
|
|
|
# response of this class will be of type
|
|
# {conversations: [array of conversations], count: {open: count, resolved: count}}
|
|
|
|
# params
|
|
# assignee_type, inbox_id, :status
|
|
|
|
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
|
|
|
|
def perform
|
|
set_up
|
|
|
|
mine_count, unassigned_count, all_count = set_count_for_all_conversations
|
|
assigned_count = all_count - unassigned_count
|
|
|
|
filter_by_assignee_type
|
|
|
|
{
|
|
conversations: conversations,
|
|
count: {
|
|
mine_count: mine_count,
|
|
assigned_count: assigned_count,
|
|
unassigned_count: unassigned_count,
|
|
all_count: all_count
|
|
}
|
|
}
|
|
end
|
|
|
|
def perform_meta_only
|
|
set_up
|
|
|
|
mine_count, unassigned_count, all_count, = set_count_for_all_conversations
|
|
assigned_count = all_count - unassigned_count
|
|
|
|
{
|
|
count: {
|
|
mine_count: mine_count,
|
|
assigned_count: assigned_count,
|
|
unassigned_count: unassigned_count,
|
|
all_count: all_count
|
|
}
|
|
}
|
|
end
|
|
|
|
private
|
|
|
|
def set_up
|
|
set_inboxes
|
|
set_team
|
|
set_assignee_type
|
|
|
|
find_all_conversations
|
|
filter_by_status unless params[:q]
|
|
filter_by_team
|
|
filter_by_labels
|
|
filter_by_query
|
|
filter_by_source_id
|
|
end
|
|
|
|
def set_inboxes
|
|
@inbox_ids = if params[:inbox_id]
|
|
@current_user.assigned_inboxes.where(id: params[:inbox_id])
|
|
else
|
|
@current_user.assigned_inboxes.pluck(:id)
|
|
end
|
|
end
|
|
|
|
def set_assignee_type
|
|
@assignee_type = params[:assignee_type]
|
|
end
|
|
|
|
def set_team
|
|
@team = current_account.teams.find(params[:team_id]) if params[:team_id]
|
|
end
|
|
|
|
def find_conversation_by_inbox
|
|
@conversations = current_account.conversations
|
|
|
|
return unless params[:inbox_id]
|
|
|
|
@conversations = @conversations.where(inbox_id: @inbox_ids)
|
|
end
|
|
|
|
def find_all_conversations
|
|
find_conversation_by_inbox
|
|
# Apply permission-based filtering
|
|
@conversations = Conversations::PermissionFilterService.new(
|
|
@conversations,
|
|
current_user,
|
|
current_account
|
|
).perform
|
|
filter_by_conversation_type if params[:conversation_type]
|
|
@conversations
|
|
end
|
|
|
|
def filter_by_assignee_type
|
|
case @assignee_type
|
|
when 'me'
|
|
@conversations = @conversations.assigned_to(current_user)
|
|
when 'unassigned'
|
|
@conversations = @conversations.unassigned
|
|
when 'assigned'
|
|
@conversations = @conversations.assigned
|
|
end
|
|
@conversations
|
|
end
|
|
|
|
def filter_by_conversation_type
|
|
case @params[:conversation_type]
|
|
when 'mention'
|
|
conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
|
|
@conversations = @conversations.where(id: conversation_ids)
|
|
when 'participating'
|
|
participant_conversation_ids = ConversationParticipant.where(account_id: current_account.id, user_id: current_user.id).select(:conversation_id)
|
|
@conversations = @conversations.where(id: participant_conversation_ids)
|
|
when 'unattended'
|
|
@conversations = @conversations.unattended
|
|
end
|
|
@conversations
|
|
end
|
|
|
|
def filter_by_query
|
|
return unless params[:q]
|
|
|
|
allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
|
|
@conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
|
|
.where(messages: { message_type: allowed_message_types }).includes(:messages)
|
|
.where('messages.content ILIKE :search', search: "%#{params[:q]}%")
|
|
.where(messages: { message_type: allowed_message_types })
|
|
end
|
|
|
|
def filter_by_status
|
|
return if params[:status] == 'all'
|
|
|
|
@conversations = @conversations.where(status: params[:status] || DEFAULT_STATUS)
|
|
end
|
|
|
|
def filter_by_team
|
|
return unless @team
|
|
|
|
@conversations = @conversations.where(team: @team)
|
|
end
|
|
|
|
def filter_by_labels
|
|
return unless params[:labels]
|
|
|
|
@conversations = @conversations.tagged_with(params[:labels], any: true)
|
|
end
|
|
|
|
def filter_by_source_id
|
|
return unless params[:source_id]
|
|
|
|
@conversations = @conversations.joins(:contact_inbox)
|
|
@conversations = @conversations.where(contact_inboxes: { source_id: params[:source_id] })
|
|
end
|
|
|
|
def set_count_for_all_conversations
|
|
return legacy_count_for_all_conversations if @conversations.limit_value || @conversations.offset_value || @conversations.eager_loading?
|
|
|
|
counts = @conversations.unscope(:order).pick(
|
|
Arel.sql("COUNT(*) FILTER (WHERE assignee_id = #{current_user.id})"),
|
|
Arel.sql('COUNT(*) FILTER (WHERE assignee_id IS NULL AND assignee_agent_bot_id IS NULL)'),
|
|
Arel.sql('COUNT(*)')
|
|
)
|
|
counts || [0, 0, 0]
|
|
end
|
|
|
|
def legacy_count_for_all_conversations
|
|
[
|
|
@conversations.assigned_to(current_user).count,
|
|
@conversations.unassigned.count,
|
|
@conversations.count
|
|
]
|
|
end
|
|
|
|
def current_page
|
|
params[:page] || 1
|
|
end
|
|
|
|
def conversations_base_query
|
|
@conversations.includes(
|
|
:taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
|
|
)
|
|
end
|
|
|
|
def conversations
|
|
@conversations = conversations_base_query
|
|
|
|
sort_by, sort_order = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['last_activity_at_desc']
|
|
@conversations = @conversations.send(sort_by, sort_order)
|
|
|
|
if params[:updated_within].present?
|
|
@conversations.where('conversations.updated_at > ?', Time.zone.now - params[:updated_within].to_i.seconds)
|
|
else
|
|
@conversations.page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
|
|
end
|
|
end
|
|
end
|
|
ConversationFinder.prepend_mod_with('ConversationFinder')
|