Bug: Force scoping message metrics to account_id (#748)

chatwoot · Apr 22, 2020 · dba6866 · dba6866
1 parent b98a64d
commit dba6866
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
@@ -50,14 +50,15 @@ def conversations_count
          .count
   end
 
+  # unscoped removes all scopes added to a model previously
   def incoming_messages_count
-    scope.messages.unscoped.incoming
+    scope.messages.unscoped.where(account_id: account.id).incoming
          .group_by_day(:created_at, range: range, default_value: 0)
          .count
   end
 
   def outgoing_messages_count
-    scope.messages.unscoped.outgoing
+    scope.messages.unscoped.where(account_id: account.id).outgoing
          .group_by_day(:created_at, range: range, default_value: 0)
          .count
   end