## Description Fixes a bug under Assignment V2 where a single conversation could be reassigned dozens of times in a row by the system, producing long stacks of "Assigned to X by Automation System via <policy>" activity messages alternating between agents. After this change each unassigned conversation is assigned exactly once, even on busy inboxes. ## Fixes # (issue) ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? ## How to reproduce 1. Enable `assignment_v2` on an account with at least 2 online agents in an inbox. 2. Generate sustained resolve/snooze activity in the inbox (each one enqueues `AutoAssignment::AssignmentJob` for the whole inbox). 3. Watch any one unassigned conversation while the jobs drain — pre-fix it picks up multiple back-to-back "Assigned to …" activity rows alternating between agents. ## Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
124 lines
4.6 KiB
Ruby
124 lines
4.6 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
|
|
let(:account) { create(:account) }
|
|
let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
|
|
let(:assignment_policy) { create(:assignment_policy, account: account) }
|
|
let(:inbox_assignment_policy) { create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy) }
|
|
let(:agent) { create(:user, account: account, role: :agent) }
|
|
|
|
before do
|
|
create(:inbox_member, inbox: inbox, user: agent)
|
|
end
|
|
|
|
describe '#perform' do
|
|
context 'when account has assignment_v2 feature enabled' do
|
|
before do
|
|
account.enable_features('assignment_v2')
|
|
account.save!
|
|
allow(Account).to receive(:find_in_batches).and_yield([account])
|
|
end
|
|
|
|
context 'when inbox has assignment policy or auto assignment enabled' do
|
|
before do
|
|
inbox_relation = instance_double(ActiveRecord::Relation)
|
|
allow(account).to receive(:inboxes).and_return(inbox_relation)
|
|
allow(inbox_relation).to receive(:joins).with(:assignment_policy).and_return(inbox_relation)
|
|
allow(inbox_relation).to receive(:find_in_batches).and_yield([inbox])
|
|
end
|
|
|
|
it 'queues assignment job for eligible inboxes' do
|
|
inbox_assignment_policy # ensure it exists
|
|
expect(AutoAssignment::AssignmentJob).to receive(:enqueue_for_inbox).with(inbox.id)
|
|
|
|
described_class.new.perform
|
|
end
|
|
|
|
it 'processes multiple accounts' do
|
|
inbox_assignment_policy # ensure it exists
|
|
account2 = create(:account)
|
|
inbox2 = create(:inbox, account: account2, enable_auto_assignment: true)
|
|
policy2 = create(:assignment_policy, account: account2)
|
|
create(:inbox_assignment_policy, inbox: inbox2, assignment_policy: policy2)
|
|
|
|
account2.enable_features('assignment_v2')
|
|
account2.save!
|
|
|
|
inbox_relation2 = instance_double(ActiveRecord::Relation)
|
|
allow(account2).to receive(:inboxes).and_return(inbox_relation2)
|
|
allow(inbox_relation2).to receive(:joins).with(:assignment_policy).and_return(inbox_relation2)
|
|
allow(inbox_relation2).to receive(:find_in_batches).and_yield([inbox2])
|
|
|
|
allow(Account).to receive(:find_in_batches).and_yield([account]).and_yield([account2])
|
|
|
|
expect(AutoAssignment::AssignmentJob).to receive(:enqueue_for_inbox).with(inbox.id)
|
|
expect(AutoAssignment::AssignmentJob).to receive(:enqueue_for_inbox).with(inbox2.id)
|
|
|
|
described_class.new.perform
|
|
end
|
|
end
|
|
|
|
context 'when inbox does not have assignment policy or auto assignment enabled' do
|
|
before do
|
|
inbox.update!(enable_auto_assignment: false)
|
|
InboxAssignmentPolicy.where(inbox: inbox).destroy_all
|
|
end
|
|
|
|
it 'does not queue assignment job' do
|
|
expect(AutoAssignment::AssignmentJob).not_to receive(:enqueue_for_inbox)
|
|
|
|
described_class.new.perform
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when account does not have assignment_v2 feature enabled' do
|
|
before do
|
|
allow(Account).to receive(:find_in_batches).and_yield([account])
|
|
end
|
|
|
|
it 'does not process the account' do
|
|
expect(AutoAssignment::AssignmentJob).not_to receive(:enqueue_for_inbox)
|
|
|
|
described_class.new.perform
|
|
end
|
|
end
|
|
|
|
context 'with batch processing' do
|
|
it 'processes accounts in batches' do
|
|
accounts = []
|
|
# Create multiple accounts
|
|
5.times do |_i|
|
|
acc = create(:account)
|
|
acc.enable_features('assignment_v2')
|
|
acc.save!
|
|
inb = create(:inbox, account: acc, enable_auto_assignment: true)
|
|
policy = create(:assignment_policy, account: acc)
|
|
create(:inbox_assignment_policy, inbox: inb, assignment_policy: policy)
|
|
|
|
inbox_relation = instance_double(ActiveRecord::Relation)
|
|
allow(acc).to receive(:inboxes).and_return(inbox_relation)
|
|
allow(inbox_relation).to receive(:joins).with(:assignment_policy).and_return(inbox_relation)
|
|
allow(inbox_relation).to receive(:find_in_batches).and_yield([inb])
|
|
|
|
accounts << acc
|
|
end
|
|
|
|
allow(Account).to receive(:find_in_batches) do |&block|
|
|
accounts.each { |acc| block.call([acc]) }
|
|
end
|
|
|
|
expect(Account).to receive(:find_in_batches).and_call_original
|
|
|
|
described_class.new.perform
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'job configuration' do
|
|
it 'is queued in the scheduled_jobs queue' do
|
|
expect(described_class.queue_name).to eq('scheduled_jobs')
|
|
end
|
|
end
|
|
end
|