feat: Activity messages for team assignments (#1893)

- assignment messages when the conversation team is changed
- change assignee based on team
- move round-robin and assignee logic to concerns

spec/models/concerns/assignment_handler_spec.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+shared_examples_for 'assignment_handler' do
+  describe '#update_team' do
+    let(:conversation) { create(:conversation, assignee: create(:user)) }
+    let(:agent) do
+      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
+    end
+    let(:team) do
+      create(:team, account: conversation.account, allow_auto_assign: false)
+    end
+
+    context 'when agent is current user' do
+      before do
+        Current.user = agent
+        create(:team_member, team: team, user: agent)
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+        conversation.inbox.reload
+      end
+
+      it 'creates team assigned and unassigned message activity' do
+        expect(conversation.update(team: team)).to eq true
+        expect(conversation.messages.pluck(:content)).to include("Assigned to #{team.name} by #{agent.name}")
+        expect(conversation.update(team: nil)).to eq true
+        expect(conversation.messages.pluck(:content)).to include("Unassigned from #{team.name} by #{agent.name}")
+      end
+
+      it 'changes assignee to nil if they doesnt belong to the team and allow_auto_assign is false' do
+        expect(team.allow_auto_assign).to eq false
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq nil
+      end
+
+      it 'changes assignee to a team member if allow_auto_assign is enabled' do
+        team.update!(allow_auto_assign: true)
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq agent
+        expect(conversation.messages.pluck(:content)).to include("Assigned to #{conversation.assignee.name} via #{team.name} by #{agent.name}")
+      end
+
+      it 'wont change assignee if he is already a team member' do
+        team.update!(allow_auto_assign: true)
+        assignee = create(:user, account: conversation.account, role: :agent)
+        create(:inbox_member, user: assignee, inbox: conversation.inbox)
+        create(:team_member, team: team, user: assignee)
+        conversation.update(assignee: assignee)
+
+        conversation.update(team: team)
+
+        expect(conversation.reload.assignee).to eq assignee
+      end
+    end
+  end
+
+  describe '#update_assignee' do
+    subject(:update_assignee) { conversation.update_assignee(agent) }
+
+    let(:conversation) { create(:conversation, assignee: nil) }
+    let(:agent) do
+      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
+    end
+    let(:assignment_mailer) { instance_double(AgentNotifications::ConversationNotificationsMailer, deliver: true) }
+
+    it 'assigns the agent to conversation' do
+      expect(update_assignee).to eq(true)
+      expect(conversation.reload.assignee).to eq(agent)
+    end
+
+    it 'creates a new notification for the agent' do
+      expect(update_assignee).to eq(true)
+      expect(agent.notifications.count).to eq(1)
+    end
+
+    it 'does not create assignment notification if notification setting is turned off' do
+      notification_setting = agent.notification_settings.first
+      notification_setting.unselect_all_email_flags
+      notification_setting.unselect_all_push_flags
+      notification_setting.save!
+
+      expect(update_assignee).to eq(true)
+      expect(agent.notifications.count).to eq(0)
+    end
+
+    context 'when agent is current user' do
+      before do
+        Current.user = agent
+      end
+
+      it 'creates self-assigned message activity' do
+        expect(update_assignee).to eq(true)
+        expect(conversation.messages.pluck(:content)).to include("#{agent.name} self-assigned this conversation")
+      end
+    end
+  end
+end

spec/models/concerns/round_robin_handler_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+shared_examples_for 'round_robin_handler' do
+  describe '#round robin' do
+    let(:account) { create(:account) }
+    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:conversation) do
+      create(
+        :conversation,
+        account: account,
+        contact: create(:contact, account: account),
+        inbox: inbox,
+        assignee: nil
+      )
+    end
+
+    before do
+      create(:inbox_member, inbox: inbox, user: agent)
+      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
+    end
+
+    it 'runs round robin on after_save callbacks' do
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(agent)
+    end
+
+    it 'will not auto assign agent if enable_auto_assignment is false' do
+      inbox.update(enable_auto_assignment: false)
+
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(nil)
+    end
+
+    it 'will not auto assign agent if its a bot conversation' do
+      conversation = create(
+        :conversation,
+        account: account,
+        contact: create(:contact, account: account),
+        inbox: inbox,
+        status: 'bot',
+        assignee: nil
+      )
+
+      # run_round_robin
+      expect(conversation.reload.assignee).to eq(nil)
+    end
+
+    it 'gets triggered on update only when status changes to open' do
+      conversation.status = 'resolved'
+      conversation.save!
+      expect(conversation.reload.assignee).to eq(agent)
+      inbox.inbox_members.where(user_id: agent.id).first.destroy!
+
+      # round robin changes assignee in this case since agent doesn't have access to inbox
+      agent2 = create(:user, email: 'agent2@example.com', account: account)
+      create(:inbox_member, inbox: inbox, user: agent2)
+      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
+      conversation.status = 'open'
+      conversation.save!
+      expect(conversation.reload.assignee).to eq(agent2)
+    end
+  end
+end

spec/models/conversation_spec.rb

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require Rails.root.join 'spec/models/concerns/assignment_handler_spec.rb'
+require Rails.root.join 'spec/models/concerns/round_robin_handler_spec.rb'
 
 RSpec.describe Conversation, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
   end
 
+  describe 'concerns' do
+    it_behaves_like 'assignment_handler'
+    it_behaves_like 'round_robin_handler'
+  end
+
   describe '.before_create' do
     let(:conversation) { build(:conversation, display_id: nil) }
 
@@ -133,108 +140,6 @@ RSpec.describe Conversation, type: :model do
     end
   end
 
-  describe '#round robin' do
-    let(:account) { create(:account) }
-    let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
-    let(:inbox) { create(:inbox, account: account) }
-    let(:conversation) do
-      create(
-        :conversation,
-        account: account,
-        contact: create(:contact, account: account),
-        inbox: inbox,
-        assignee: nil
-      )
-    end
-
-    before do
-      create(:inbox_member, inbox: inbox, user: agent)
-      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
-    end
-
-    it 'runs round robin on after_save callbacks' do
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(agent)
-    end
-
-    it 'will not auto assign agent if enable_auto_assignment is false' do
-      inbox.update(enable_auto_assignment: false)
-
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(nil)
-    end
-
-    it 'will not auto assign agent if its a bot conversation' do
-      conversation = create(
-        :conversation,
-        account: account,
-        contact: create(:contact, account: account),
-        inbox: inbox,
-        status: 'bot',
-        assignee: nil
-      )
-
-      # run_round_robin
-      expect(conversation.reload.assignee).to eq(nil)
-    end
-
-    it 'gets triggered on update only when status changes to open' do
-      conversation.status = 'resolved'
-      conversation.save!
-      expect(conversation.reload.assignee).to eq(agent)
-      inbox.inbox_members.where(user_id: agent.id).first.destroy!
-
-      # round robin changes assignee in this case since agent doesn't have access to inbox
-      agent2 = create(:user, email: 'agent2@example.com', account: account)
-      create(:inbox_member, inbox: inbox, user: agent2)
-      allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
-      conversation.status = 'open'
-      conversation.save!
-      expect(conversation.reload.assignee).to eq(agent2)
-    end
-  end
-
-  describe '#update_assignee' do
-    subject(:update_assignee) { conversation.update_assignee(agent) }
-
-    let(:conversation) { create(:conversation, assignee: nil) }
-    let(:agent) do
-      create(:user, email: 'agent@example.com', account: conversation.account, role: :agent)
-    end
-    let(:assignment_mailer) { double(deliver: true) }
-
-    it 'assigns the agent to conversation' do
-      expect(update_assignee).to eq(true)
-      expect(conversation.reload.assignee).to eq(agent)
-    end
-
-    it 'creates a new notification for the agent' do
-      expect(update_assignee).to eq(true)
-      expect(agent.notifications.count).to eq(1)
-    end
-
-    it 'does not create assignment notification if notification setting is turned off' do
-      notification_setting = agent.notification_settings.first
-      notification_setting.unselect_all_email_flags
-      notification_setting.unselect_all_push_flags
-      notification_setting.save!
-
-      expect(update_assignee).to eq(true)
-      expect(agent.notifications.count).to eq(0)
-    end
-
-    context 'when agent is current user' do
-      before do
-        Current.user = agent
-      end
-
-      it 'creates self-assigned message activity' do
-        expect(update_assignee).to eq(true)
-        expect(conversation.messages.pluck(:content)).to include("#{agent.name} self-assigned this conversation")
-      end
-    end
-  end
-
   describe '#update_labels' do
     let(:account) { create(:account) }
     let(:conversation) { create(:conversation, account: account) }