## 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
111 lines
4.5 KiB
Ruby
111 lines
4.5 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe AutoAssignment::AssignmentJob, type: :job do
|
|
let(:account) { create(:account) }
|
|
let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
|
|
let(:agent) { create(:user, account: account, role: :agent, availability: :online) }
|
|
|
|
before do
|
|
create(:inbox_member, inbox: inbox, user: agent)
|
|
end
|
|
|
|
describe '#perform' do
|
|
context 'when inbox exists' do
|
|
context 'when auto assignment is enabled' do
|
|
it 'calls the assignment service' do
|
|
service = instance_double(AutoAssignment::AssignmentService)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
|
|
expect(service).to receive(:perform_bulk_assignment).with(limit: 100).and_return(5)
|
|
|
|
described_class.new.perform(inbox_id: inbox.id)
|
|
end
|
|
|
|
it 'logs the assignment count' do
|
|
service = instance_double(AutoAssignment::AssignmentService)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new).and_return(service)
|
|
allow(service).to receive(:perform_bulk_assignment).and_return(3)
|
|
allow(Rails.logger).to receive(:info)
|
|
|
|
described_class.new.perform(inbox_id: inbox.id)
|
|
|
|
expect(Rails.logger).to have_received(:info).with("Assigned 3 conversations for inbox #{inbox.id}")
|
|
end
|
|
|
|
it 'uses custom bulk limit from environment' do
|
|
allow(ENV).to receive(:fetch).with('AUTO_ASSIGNMENT_BULK_LIMIT', 100).and_return('50')
|
|
|
|
service = instance_double(AutoAssignment::AssignmentService)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
|
|
expect(service).to receive(:perform_bulk_assignment).with(limit: 50).and_return(2)
|
|
|
|
described_class.new.perform(inbox_id: inbox.id)
|
|
end
|
|
end
|
|
|
|
context 'when auto assignment is disabled' do
|
|
before { inbox.update!(enable_auto_assignment: false) }
|
|
|
|
it 'calls the service which handles the disabled state' do
|
|
service = instance_double(AutoAssignment::AssignmentService)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new).with(inbox: inbox).and_return(service)
|
|
expect(service).to receive(:perform_bulk_assignment).with(limit: 100).and_return(0)
|
|
|
|
described_class.new.perform(inbox_id: inbox.id)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when inbox does not exist' do
|
|
it 'returns early without processing' do
|
|
expect(AutoAssignment::AssignmentService).not_to receive(:new)
|
|
|
|
described_class.new.perform(inbox_id: 999_999)
|
|
end
|
|
end
|
|
|
|
context 'when an error occurs' do
|
|
it 'logs the error and re-raises in test environment' do
|
|
service = instance_double(AutoAssignment::AssignmentService)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new).and_return(service)
|
|
allow(service).to receive(:perform_bulk_assignment).and_raise(StandardError, 'Something went wrong')
|
|
allow(Rails.logger).to receive(:error)
|
|
|
|
expect do
|
|
described_class.new.perform(inbox_id: inbox.id)
|
|
end.to raise_error(StandardError, 'Something went wrong')
|
|
|
|
expect(Rails.logger).to have_received(:error).with("Bulk assignment failed for inbox #{inbox.id}: Something went wrong")
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '.enqueue_for_inbox' do
|
|
after { Redis::Alfred.delete(format(Redis::Alfred::AUTO_ASSIGNMENT_IN_FLIGHT_KEY, inbox_id: inbox.id)) }
|
|
|
|
it 'enqueues one run per inbox and coalesces concurrent triggers' do
|
|
allow(described_class).to receive(:perform_later).and_return(true)
|
|
|
|
expect(described_class.enqueue_for_inbox(inbox.id)).to be(true)
|
|
expect(described_class.enqueue_for_inbox(inbox.id)).to be(false)
|
|
expect(described_class).to have_received(:perform_later).once
|
|
end
|
|
|
|
it 'does not release a newer run marker when its own token is stale' do
|
|
key = format(Redis::Alfred::AUTO_ASSIGNMENT_IN_FLIGHT_KEY, inbox_id: inbox.id)
|
|
Redis::Alfred.set(key, 'newer-token', ex: 300)
|
|
allow(AutoAssignment::AssignmentService).to receive(:new)
|
|
.and_return(instance_double(AutoAssignment::AssignmentService, perform_bulk_assignment: 0))
|
|
|
|
described_class.new.perform(inbox_id: inbox.id, token: 'stale-token')
|
|
|
|
expect(Redis::Alfred.get(key)).to eq('newer-token')
|
|
end
|
|
end
|
|
|
|
describe 'job configuration' do
|
|
it 'is queued in the default queue' do
|
|
expect(described_class.queue_name).to eq('default')
|
|
end
|
|
end
|
|
end
|