## 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>
169 lines
5.5 KiB
Ruby
169 lines
5.5 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe AutoAssignment::RateLimiter do
|
|
# Stub Math methods for testing when assignment_policy is nil
|
|
# rubocop:disable RSpec/BeforeAfterAll, RSpec/InstanceVariable
|
|
before(:all) do
|
|
@math_had_positive = Math.respond_to?(:positive?)
|
|
Math.define_singleton_method(:positive?) { false } unless @math_had_positive
|
|
end
|
|
|
|
after(:all) do
|
|
Math.singleton_class.send(:remove_method, :positive?) unless @math_had_positive
|
|
end
|
|
# rubocop:enable RSpec/BeforeAfterAll, RSpec/InstanceVariable
|
|
|
|
let(:account) { create(:account) }
|
|
let(:inbox) { create(:inbox, account: account) }
|
|
let(:agent) { create(:user, account: account, role: :agent) }
|
|
let(:conversation) { create(:conversation, inbox: inbox) }
|
|
let(:rate_limiter) { described_class.new(inbox: inbox, agent: agent) }
|
|
|
|
describe '#within_limit?' do
|
|
context 'when rate limiting is not enabled' do
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(nil)
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(rate_limiter.within_limit?).to be true
|
|
end
|
|
end
|
|
|
|
context 'when rate limiting is enabled' do
|
|
let(:assignment_policy) do
|
|
instance_double(AssignmentPolicy,
|
|
fair_distribution_limit: 5,
|
|
fair_distribution_window: 3600)
|
|
end
|
|
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
|
|
end
|
|
|
|
it 'returns true when under the limit' do
|
|
allow(rate_limiter).to receive(:current_count).and_return(3)
|
|
expect(rate_limiter.within_limit?).to be true
|
|
end
|
|
|
|
it 'returns false when at or over the limit' do
|
|
allow(rate_limiter).to receive(:current_count).and_return(5)
|
|
expect(rate_limiter.within_limit?).to be false
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#track_assignment' do
|
|
context 'when rate limiting is not enabled' do
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(nil)
|
|
end
|
|
|
|
it 'still tracks the assignment with default window' do
|
|
expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
|
|
expect(Redis::Alfred).to receive(:set).with(expected_key, conversation.id.to_s, ex: 24.hours.to_i)
|
|
rate_limiter.track_assignment(conversation)
|
|
end
|
|
end
|
|
|
|
context 'when rate limiting is enabled' do
|
|
let(:assignment_policy) do
|
|
instance_double(AssignmentPolicy,
|
|
fair_distribution_limit: 5,
|
|
fair_distribution_window: 3600)
|
|
end
|
|
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
|
|
end
|
|
|
|
it 'creates a Redis key with correct expiry' do
|
|
expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
|
|
expect(Redis::Alfred).to receive(:set).with(
|
|
expected_key,
|
|
conversation.id.to_s,
|
|
ex: 3600
|
|
)
|
|
rate_limiter.track_assignment(conversation)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#current_count' do
|
|
context 'when rate limiting is not enabled' do
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(nil)
|
|
end
|
|
|
|
it 'returns 0' do
|
|
expect(rate_limiter.current_count).to eq(0)
|
|
end
|
|
end
|
|
|
|
context 'when rate limiting is enabled' do
|
|
let(:assignment_policy) do
|
|
instance_double(AssignmentPolicy,
|
|
fair_distribution_limit: 5,
|
|
fair_distribution_window: 3600)
|
|
end
|
|
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
|
|
end
|
|
|
|
it 'counts matching Redis keys' do
|
|
pattern = format(Redis::RedisKeys::ASSIGNMENT_KEY_PATTERN, inbox_id: inbox.id, agent_id: agent.id)
|
|
allow(Redis::Alfred).to receive(:keys_count).with(pattern).and_return(3)
|
|
|
|
expect(rate_limiter.current_count).to eq(3)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'configuration' do
|
|
context 'with custom window' do
|
|
let(:assignment_policy) do
|
|
instance_double(AssignmentPolicy,
|
|
fair_distribution_limit: 10,
|
|
fair_distribution_window: 7200)
|
|
end
|
|
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
|
|
end
|
|
|
|
it 'uses the custom window value' do
|
|
expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
|
|
expect(Redis::Alfred).to receive(:set).with(
|
|
expected_key,
|
|
conversation.id.to_s,
|
|
ex: 7200
|
|
)
|
|
rate_limiter.track_assignment(conversation)
|
|
end
|
|
end
|
|
|
|
context 'without custom window' do
|
|
let(:assignment_policy) do
|
|
instance_double(AssignmentPolicy,
|
|
fair_distribution_limit: 10,
|
|
fair_distribution_window: nil)
|
|
end
|
|
|
|
before do
|
|
allow(inbox).to receive(:assignment_policy).and_return(assignment_policy)
|
|
end
|
|
|
|
it 'uses the default window value of 24 hours' do
|
|
expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
|
|
expect(Redis::Alfred).to receive(:set).with(
|
|
expected_key,
|
|
conversation.id.to_s,
|
|
ex: 86_400
|
|
)
|
|
rate_limiter.track_assignment(conversation)
|
|
end
|
|
end
|
|
end
|
|
end
|