Merge branch 'develop' into inline-edit

app/listeners/agent_bot_listener.rb

@@ -17,9 +17,10 @@ class AgentBotListener < BaseListener
 
   def conversation_updated(event)
     conversation = extract_conversation_and_account(event)[0]
+    changed_attributes = extract_changed_attributes(event)
     inbox = conversation.inbox
     event_name = __method__.to_s
-    payload = conversation.webhook_data.merge(event: event_name)
+    payload = conversation.webhook_data.merge(event: event_name, changed_attributes: changed_attributes)
     agent_bots_for(inbox, conversation).each { |agent_bot| process_webhook_bot_event(agent_bot, payload) }
   end
 

spec/listeners/agent_bot_listener_spec.rb

@@ -59,9 +59,10 @@ describe AgentBotListener do
 
   describe '#conversation_updated' do
     let(:event_name) { 'conversation.updated' }
-    let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
 
     context 'when agent bot is not configured' do
+      let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
+
       it 'does not send webhook' do
         expect(AgentBots::WebhookJob).not_to receive(:perform_later)
         listener.conversation_updated(event)
@@ -69,22 +70,34 @@ describe AgentBotListener do
     end
 
     context 'when agent bot is configured on inbox' do
-      it 'sends webhook to the inbox agent bot' do
+      let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
+
+      it 'sends webhook to the inbox agent bot with changed_attributes' do
         create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot)
         expect(AgentBots::WebhookJob).to receive(:perform_later).with(agent_bot.outgoing_url,
-                                                                      conversation.webhook_data.merge(event: 'conversation_updated')).once
+                                                                      conversation.webhook_data.merge(event: 'conversation_updated',
+                                                                                                      changed_attributes: nil)).once
         listener.conversation_updated(event)
       end
     end
 
     context 'when conversation is assigned to an agent bot' do
+      let!(:event) do
+        Events::Base.new(event_name, Time.zone.now, conversation: conversation,
+                                                    changed_attributes: { 'assignee_agent_bot_id' => [nil, agent_bot.id] })
+      end
+
       before do
         conversation.update!(assignee_agent_bot: agent_bot, assignee: nil)
       end
 
-      it 'sends webhook to the assigned agent bot' do
+      it 'sends webhook with changed_attributes to the assigned agent bot' do
+        expected_changed_attributes = [{ 'assignee_agent_bot_id' => { previous_value: nil, current_value: agent_bot.id } }]
         expect(AgentBots::WebhookJob).to receive(:perform_later).with(agent_bot.outgoing_url,
-                                                                      conversation.webhook_data.merge(event: 'conversation_updated')).once
+                                                                      conversation.webhook_data.merge(
+                                                                        event: 'conversation_updated',
+                                                                        changed_attributes: expected_changed_attributes
+                                                                      )).once
         listener.conversation_updated(event)
       end
     end