feat: add inbox matching logic to webhook event delivery

Author: CayoPOliveira

app/listeners/webhook_listener.rb

@@ -3,6 +3,7 @@ def conversation_status_changed(event)
     conversation = extract_conversation_and_account(event)[0]
     changed_attributes = extract_changed_attributes(event)
     inbox = conversation.inbox
+
     payload = conversation.webhook_data.merge(event: __method__.to_s, changed_attributes: changed_attributes)
     deliver_webhook_payloads(payload, inbox)
   end
@@ -88,6 +89,7 @@ def inbox_updated(event)
   def deliver_account_webhooks(payload, account)
     account.webhooks.account_type.each do |webhook|
       next unless webhook.subscriptions.include?(payload[:event])
+      next if payload[:inbox].present? && (webhook.inbox_id.present? && webhook.inbox_id != payload[:inbox][:id])
 
       WebhookJob.perform_later(webhook.url, payload)
     end

spec/listeners/webhook_listener_spec.rb

@@ -75,6 +75,26 @@
         listener.message_created(api_event)
       end
     end
+
+    context 'when webhook has an inbox and it matches the event inbox' do
+      it 'receives the event' do
+        webhook = create(:webhook, account: account, inbox: inbox)
+        expect(WebhookJob).to receive(:perform_later)
+          .with(webhook.url, message.webhook_data.merge(event: 'message_created')).once
+
+        listener.message_created(message_created_event)
+      end
+    end
+
+    context 'when webhook has an inbox and it does not match the event inbox' do
+      it 'does not receive the event' do
+        another_inbox = create(:inbox, account: account)
+        create(:webhook, account: account, inbox: another_inbox)
+
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.message_created(message_created_event)
+      end
+    end
   end
 
   describe '#conversation_created' do