perf: reduce per-request work in conversation filter endpoint (#15321)
## Description Every conversation filter request runs three separate unbounded COUNT queries over the filtered set (mine, unassigned, all) and eager-loads every message of every conversation on the page. On large accounts this adds a fixed 1-2s of latency per request regardless of the filter. This PR trims both: - The three counts are now computed in a single pass using `COUNT(*) FILTER (...)` aggregates. Response shape and count semantics are unchanged. - The `:messages` eager-load is removed from the filter base relation. The list payload fetches messages through scoped queries (last message, last non-activity message, unread messages), which never read the preloaded collection, so it was loaded and discarded on every request. Fixes https://linear.app/chatwoot/issue/CW-7830
This commit is contained in:
@@ -687,6 +687,66 @@ describe Conversations::FilterService do
|
||||
end
|
||||
end
|
||||
|
||||
describe 'result counts' do
|
||||
let!(:params) { { payload: [], page: 1 } }
|
||||
let(:payload) do
|
||||
[
|
||||
{
|
||||
attribute_key: 'status',
|
||||
filter_operator: 'not_equal_to',
|
||||
values: %w[resolved],
|
||||
query_operator: nil,
|
||||
custom_attribute_type: ''
|
||||
}.with_indifferent_access
|
||||
]
|
||||
end
|
||||
|
||||
before do
|
||||
create(:conversation, account: account, inbox: inbox)
|
||||
end
|
||||
|
||||
it 'returns mine, assigned, unassigned and all counts for the filtered set' do
|
||||
params[:payload] = payload
|
||||
result = filter_service.new(params, user_1, account).perform
|
||||
|
||||
expect(result[:count]).to eq(
|
||||
mine_count: 3,
|
||||
assigned_count: 4,
|
||||
unassigned_count: 1,
|
||||
all_count: 5
|
||||
)
|
||||
end
|
||||
|
||||
it 'returns zero counts when the permission scope resolves to no conversations' do
|
||||
params[:payload] = payload
|
||||
permission_filter = instance_double(Conversations::PermissionFilterService, perform: Conversation.none)
|
||||
allow(Conversations::PermissionFilterService).to receive(:new).and_return(permission_filter)
|
||||
|
||||
result = filter_service.new(params, user_1, account).perform
|
||||
|
||||
expect(result[:count]).to eq(
|
||||
mine_count: 0,
|
||||
assigned_count: 0,
|
||||
unassigned_count: 0,
|
||||
all_count: 0
|
||||
)
|
||||
end
|
||||
|
||||
it 'computes all counts in a single query' do
|
||||
params[:payload] = payload
|
||||
|
||||
count_queries = []
|
||||
subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |_name, _started, _finished, _unique_id, event|
|
||||
count_queries << event[:sql] if event[:sql].match?(/COUNT\(/i) && !event[:cached]
|
||||
end
|
||||
|
||||
filter_service.new(params, user_1, account).perform
|
||||
expect(count_queries.size).to eq(1)
|
||||
ensure
|
||||
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
|
||||
end
|
||||
end
|
||||
|
||||
describe '#base_relation' do
|
||||
let!(:account) { create(:account) }
|
||||
let!(:user_1) { create(:user, account: account, role: :agent) }
|
||||
|
||||
Reference in New Issue
Block a user