## Linear Ticket: https://linear.app/chatwoot/issue/CW-6081/review-feedback ## Description Assignment V2 Service Enhancements - Enable Assignment V2 on plan upgrade - Fix UI issue with fair distribution policy display - Add advanced assignment feature flag and enhance Assignment V2 capabilities ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? This has been tested using the UI. ## 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 <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Changes auto-assignment execution paths, rate limiting defaults, and feature-flag gating (including premium plan behavior), which could affect which conversations get assigned and when. UI rewires inbox settings and policy flows, so regressions are possible around navigation/linking and feature visibility. > > **Overview** > **Adds a new premium `advanced_assignment` feature flag** and uses it to gate capacity/balanced assignment features in the UI (sidebar entry, settings routes, assignment-policy landing cards) and backend (Enterprise balanced selector + capacity filtering). `advanced_assignment` is marked premium, included in Business plan entitlements, and auto-synced in Enterprise accounts when `assignment_v2` is toggled. > > **Improves Assignment V2 policy UX** by adding an inbox-level “Conversation Assignment” section (behind `assignment_v2`) that can link/unlink an assignment policy, navigate to create/edit policy flows with `inboxId` query context, and show an inbox-link prompt after creating a policy. The policy form now defaults to enabled, disables the `balanced` option with a premium badge/message when unavailable, and inbox lists support click-to-navigate. > > **Tightens/adjusts auto-assignment behavior**: bulk assignment now requires `inbox.enable_auto_assignment?`, conversation ordering uses the attached `assignment_policy` priority, and rate limiting uses `assignment_policy` config with an infinite default limit while still tracking assignments. Tests and i18n strings are updated accordingly. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 23bc03bf75ee4376071e4d7fc7cd564c601d33d7. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Pranav <pranav@chatwoot.com> Co-authored-by: iamsivin <iamsivin@gmail.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com> Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
312 lines
13 KiB
Ruby
312 lines
13 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe AutoAssignment::AssignmentService do
|
|
let(:account) { create(:account) }
|
|
let(:assignment_policy) { create(:assignment_policy, account: account, enabled: true) }
|
|
let(:inbox) { create(:inbox, account: account, enable_auto_assignment: true) }
|
|
let(:service) { described_class.new(inbox: inbox) }
|
|
let(:agent) { create(:user, account: account, role: :agent, availability: :online) }
|
|
let(:agent2) { create(:user, account: account, role: :agent, availability: :online) }
|
|
let(:conversation) { create(:conversation, inbox: inbox, assignee: nil) }
|
|
|
|
before do
|
|
# Enable assignment_v2 feature for the account (basic assignment features)
|
|
account.enable_features('assignment_v2')
|
|
account.save!
|
|
# Link inbox to assignment policy
|
|
create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
|
|
create(:inbox_member, inbox: inbox, user: agent)
|
|
end
|
|
|
|
describe '#perform_bulk_assignment' do
|
|
context 'when auto assignment is enabled' do
|
|
let(:rate_limiter) { instance_double(AutoAssignment::RateLimiter) }
|
|
|
|
before do
|
|
allow(OnlineStatusTracker).to receive(:get_available_users).and_return({ agent.id.to_s => 'online' })
|
|
|
|
# Mock RoundRobinSelector to return the agent
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent)
|
|
|
|
# Mock RateLimiter to allow all assignments by default
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).and_return(rate_limiter)
|
|
allow(rate_limiter).to receive(:within_limit?).and_return(true)
|
|
allow(rate_limiter).to receive(:track_assignment)
|
|
end
|
|
|
|
it 'assigns conversations to available agents' do
|
|
# Create conversation and ensure it's unassigned
|
|
conv = create(:conversation, inbox: inbox, status: 'open')
|
|
conv.update!(assignee_id: nil)
|
|
|
|
assigned_count = service.perform_bulk_assignment(limit: 1)
|
|
|
|
expect(assigned_count).to eq(1)
|
|
expect(conv.reload.assignee).to eq(agent)
|
|
end
|
|
|
|
it 'returns 0 when no agents are online' do
|
|
allow(OnlineStatusTracker).to receive(:get_available_users).and_return({})
|
|
|
|
assigned_count = service.perform_bulk_assignment(limit: 1)
|
|
|
|
expect(assigned_count).to eq(0)
|
|
expect(conversation.reload.assignee).to be_nil
|
|
end
|
|
|
|
it 'respects the limit parameter' do
|
|
3.times do
|
|
conv = create(:conversation, inbox: inbox, status: 'open')
|
|
conv.update!(assignee_id: nil)
|
|
end
|
|
|
|
assigned_count = service.perform_bulk_assignment(limit: 2)
|
|
|
|
expect(assigned_count).to eq(2)
|
|
expect(inbox.conversations.unassigned.count).to eq(1)
|
|
end
|
|
|
|
it 'only assigns open conversations' do
|
|
conversation # ensure it exists
|
|
conversation.update!(assignee_id: nil)
|
|
resolved_conversation = create(:conversation, inbox: inbox, status: 'resolved')
|
|
resolved_conversation.update!(assignee_id: nil)
|
|
|
|
service.perform_bulk_assignment(limit: 10)
|
|
|
|
expect(conversation.reload.assignee).to eq(agent)
|
|
expect(resolved_conversation.reload.assignee).to be_nil
|
|
end
|
|
|
|
it 'does not reassign already assigned conversations' do
|
|
conversation # ensure it exists
|
|
conversation.update!(assignee_id: nil)
|
|
assigned_conversation = create(:conversation, inbox: inbox, assignee: agent)
|
|
unassigned_conversation = create(:conversation, inbox: inbox, status: 'open')
|
|
unassigned_conversation.update!(assignee_id: nil)
|
|
|
|
assigned_count = service.perform_bulk_assignment(limit: 10)
|
|
|
|
expect(assigned_count).to eq(2) # conversation + unassigned_conversation
|
|
expect(assigned_conversation.reload.assignee).to eq(agent)
|
|
expect(unassigned_conversation.reload.assignee).to eq(agent)
|
|
end
|
|
|
|
it 'dispatches assignee changed event' do
|
|
conversation # ensure it exists
|
|
conversation.update!(assignee_id: nil)
|
|
|
|
# The conversation model also dispatches a conversation.updated event
|
|
allow(Rails.configuration.dispatcher).to receive(:dispatch)
|
|
expect(Rails.configuration.dispatcher).to receive(:dispatch).with(
|
|
Events::Types::ASSIGNEE_CHANGED,
|
|
anything,
|
|
hash_including(conversation: conversation, user: agent)
|
|
)
|
|
|
|
service.perform_bulk_assignment(limit: 1)
|
|
end
|
|
end
|
|
|
|
context 'when auto assignment is disabled' do
|
|
before { assignment_policy.update!(enabled: false) }
|
|
|
|
it 'returns 0 without processing' do
|
|
assigned_count = service.perform_bulk_assignment(limit: 10)
|
|
|
|
expect(assigned_count).to eq(0)
|
|
expect(conversation.reload.assignee).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'with conversation priority' do
|
|
let(:rate_limiter) { instance_double(AutoAssignment::RateLimiter) }
|
|
|
|
before do
|
|
allow(OnlineStatusTracker).to receive(:get_available_users).and_return({ agent.id.to_s => 'online' })
|
|
|
|
# Mock RoundRobinSelector to return the agent
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent)
|
|
|
|
# Mock RateLimiter to allow all assignments by default
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).and_return(rate_limiter)
|
|
allow(rate_limiter).to receive(:within_limit?).and_return(true)
|
|
allow(rate_limiter).to receive(:track_assignment)
|
|
end
|
|
|
|
context 'when priority is longest_waiting' do
|
|
before do
|
|
allow(inbox).to receive(:auto_assignment_config).and_return({ 'conversation_priority' => 'longest_waiting' })
|
|
end
|
|
|
|
it 'assigns conversations with oldest last_activity_at first' do
|
|
old_conversation = create(:conversation,
|
|
inbox: inbox,
|
|
status: 'open',
|
|
created_at: 2.hours.ago,
|
|
last_activity_at: 2.hours.ago)
|
|
old_conversation.update!(assignee_id: nil)
|
|
new_conversation = create(:conversation,
|
|
inbox: inbox,
|
|
status: 'open',
|
|
created_at: 1.hour.ago,
|
|
last_activity_at: 1.hour.ago)
|
|
new_conversation.update!(assignee_id: nil)
|
|
|
|
service.perform_bulk_assignment(limit: 1)
|
|
|
|
expect(old_conversation.reload.assignee).to eq(agent)
|
|
expect(new_conversation.reload.assignee).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when priority is default' do
|
|
it 'assigns conversations by created_at' do
|
|
old_conversation = create(:conversation, inbox: inbox, status: 'open', created_at: 2.hours.ago)
|
|
old_conversation.update!(assignee_id: nil)
|
|
new_conversation = create(:conversation, inbox: inbox, status: 'open', created_at: 1.hour.ago)
|
|
new_conversation.update!(assignee_id: nil)
|
|
|
|
service.perform_bulk_assignment(limit: 1)
|
|
|
|
expect(old_conversation.reload.assignee).to eq(agent)
|
|
expect(new_conversation.reload.assignee).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with fair distribution' do
|
|
before do
|
|
create(:inbox_member, inbox: inbox, user: agent2)
|
|
allow(OnlineStatusTracker).to receive(:get_available_users).and_return({
|
|
agent.id.to_s => 'online',
|
|
agent2.id.to_s => 'online'
|
|
})
|
|
end
|
|
|
|
context 'when fair distribution is enabled' do
|
|
before do
|
|
allow(inbox).to receive(:auto_assignment_config).and_return({
|
|
'fair_distribution_limit' => 2,
|
|
'fair_distribution_window' => 3600
|
|
})
|
|
end
|
|
|
|
it 'respects the assignment limit per agent' do
|
|
# Mock RoundRobinSelector to select agent2
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent2)
|
|
|
|
# Mock agent1 at limit, agent2 not at limit
|
|
agent1_limiter = instance_double(AutoAssignment::RateLimiter)
|
|
agent2_limiter = instance_double(AutoAssignment::RateLimiter)
|
|
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).with(inbox: inbox, agent: agent).and_return(agent1_limiter)
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).with(inbox: inbox, agent: agent2).and_return(agent2_limiter)
|
|
|
|
allow(agent1_limiter).to receive(:within_limit?).and_return(false)
|
|
allow(agent2_limiter).to receive(:within_limit?).and_return(true)
|
|
allow(agent2_limiter).to receive(:track_assignment)
|
|
|
|
unassigned_conversation = create(:conversation, inbox: inbox, status: 'open')
|
|
unassigned_conversation.update!(assignee_id: nil)
|
|
|
|
service.perform_bulk_assignment(limit: 1)
|
|
|
|
expect(unassigned_conversation.reload.assignee).to eq(agent2)
|
|
end
|
|
|
|
it 'tracks assignments in Redis' do
|
|
conversation # ensure it exists
|
|
conversation.update!(assignee_id: nil)
|
|
|
|
# Mock RoundRobinSelector
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent)
|
|
|
|
limiter = instance_double(AutoAssignment::RateLimiter)
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
|
|
allow(limiter).to receive(:within_limit?).and_return(true)
|
|
expect(limiter).to receive(:track_assignment)
|
|
|
|
service.perform_bulk_assignment(limit: 1)
|
|
end
|
|
|
|
it 'allows assignments after window expires' do
|
|
# Mock RoundRobinSelector
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent, agent2)
|
|
|
|
# Mock RateLimiter to allow all
|
|
limiter = instance_double(AutoAssignment::RateLimiter)
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
|
|
allow(limiter).to receive(:within_limit?).and_return(true)
|
|
allow(limiter).to receive(:track_assignment)
|
|
|
|
# Simulate time passing for rate limit window
|
|
freeze_time do
|
|
2.times do
|
|
conversation_new = create(:conversation, inbox: inbox, status: 'open')
|
|
conversation_new.update!(assignee_id: nil)
|
|
service.perform_bulk_assignment(limit: 1)
|
|
expect(conversation_new.reload.assignee).not_to be_nil
|
|
end
|
|
end
|
|
|
|
# Move forward past the window
|
|
travel_to(2.hours.from_now) do
|
|
new_conversation = create(:conversation, inbox: inbox, status: 'open')
|
|
new_conversation.update!(assignee_id: nil)
|
|
service.perform_bulk_assignment(limit: 1)
|
|
expect(new_conversation.reload.assignee).not_to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when fair distribution is disabled' do
|
|
it 'assigns without rate limiting' do
|
|
5.times do
|
|
conv = create(:conversation, inbox: inbox, status: 'open')
|
|
conv.update!(assignee_id: nil)
|
|
end
|
|
|
|
# Mock RoundRobinSelector
|
|
round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
|
|
allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
|
|
allow(round_robin_selector).to receive(:select_agent).and_return(agent)
|
|
|
|
# Mock RateLimiter to allow all
|
|
limiter = instance_double(AutoAssignment::RateLimiter)
|
|
allow(AutoAssignment::RateLimiter).to receive(:new).and_return(limiter)
|
|
allow(limiter).to receive(:within_limit?).and_return(true)
|
|
allow(limiter).to receive(:track_assignment)
|
|
|
|
assigned_count = service.perform_bulk_assignment(limit: 5)
|
|
expect(assigned_count).to eq(5)
|
|
end
|
|
end
|
|
|
|
context 'with round robin assignment' do
|
|
it 'distributes conversations evenly among agents' do
|
|
conversations = Array.new(4) { create(:conversation, inbox: inbox, assignee: nil) }
|
|
|
|
service.perform_bulk_assignment(limit: 4)
|
|
|
|
agent1_count = conversations.count { |c| c.reload.assignee == agent }
|
|
agent2_count = conversations.count { |c| c.reload.assignee == agent2 }
|
|
|
|
# Should be distributed evenly (2 each) or close to even (3 and 1)
|
|
expect([agent1_count, agent2_count].sort).to eq([2, 2]).or(eq([1, 3]))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|