From 4ae9ed8f945e1ab188c0cfb5f3a3f3f15b33e622 Mon Sep 17 00:00:00 2001 From: Muhsin Keloth Date: Tue, 8 Feb 2022 16:39:19 +0530 Subject: [PATCH] chore: Assign the conversation to agent who opens the conversation (#3925) --- .../v1/accounts/conversations_controller.rb | 6 +++++ .../accounts/conversations_controller_spec.rb | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb index 22eee629e..0515eabca 100644 --- a/app/controllers/api/v1/accounts/conversations_controller.rb +++ b/app/controllers/api/v1/accounts/conversations_controller.rb @@ -61,6 +61,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro else @status = @conversation.toggle_status end + assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent? end def toggle_typing_status @@ -93,6 +94,11 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until] end + def assign_conversation + @agent = Current.account.users.find(current_user.id) + @conversation.update_assignee(@agent) + end + def trigger_typing_event(event, is_private) user = current_user.presence || @resource Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private) diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb index 56b82484f..8a874fc56 100644 --- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb @@ -314,6 +314,7 @@ RSpec.describe 'Conversations API', type: :request do context 'when it is an authenticated user' do let(:agent) { create(:user, account: account, role: :agent) } + let(:administrator) { create(:user, account: account, role: :administrator) } before do create(:inbox_member, user: agent, inbox: conversation.inbox) @@ -341,6 +342,27 @@ RSpec.describe 'Conversations API', type: :request do expect(conversation.reload.status).to eq('open') end + it 'self assign if agent changes the conversation status to open' do + conversation.update!(status: 'pending') + post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status", + headers: agent.create_new_auth_token, + as: :json + expect(response).to have_http_status(:success) + expect(conversation.reload.status).to eq('open') + expect(conversation.reload.assignee_id).to eq(agent.id) + end + + it 'disbale self assign if admin changes the conversation status to open' do + conversation.update!(status: 'pending') + conversation.update!(assignee_id: nil) + post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status", + headers: administrator.create_new_auth_token, + as: :json + expect(response).to have_http_status(:success) + expect(conversation.reload.status).to eq('open') + expect(conversation.reload.assignee_id).not_to eq(administrator.id) + end + it 'toggles the conversation status to specific status when parameter is passed' do expect(conversation.status).to eq('open')