From 32062864d359b9e842eb3f5f1bbf9c7014a1d857 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Jul 2018 10:33:12 -0400
Subject: [PATCH] FIX: removes system from user to user report (#6144)

---
 app/models/report.rb       | 14 ++++++++------
 spec/models/report_spec.rb | 28 +++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/app/models/report.rb b/app/models/report.rb
index fc418a923cd..533f1395668 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -461,12 +461,12 @@ class Report
     add_counts report, countable, 'post_actions.created_at'
   end
 
-  # Private messages counts:
-
   def self.private_messages_report(report, topic_subtype)
     report.icon = 'envelope'
-    basic_report_about report, Topic, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Topic.private_messages.with_subtype(topic_subtype), 'topics.created_at'
+    subject = Topic.where('topics.user_id > 0')
+    basic_report_about report, subject, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
+    subject = Topic.private_messages.where('topics.user_id > 0').with_subtype(topic_subtype)
+    add_counts report, subject, 'topics.created_at'
   end
 
   def self.report_user_to_user_private_messages(report)
@@ -477,8 +477,10 @@ class Report
   def self.report_user_to_user_private_messages_with_replies(report)
     report.icon = 'envelope'
     topic_subtype = TopicSubtype.user_to_user
-    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+    subject = Post.where('posts.user_id > 0')
+    basic_report_about report, subject, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
+    subject = Post.private_posts.where('posts.user_id > 0').with_topic_subtype(topic_subtype)
+    add_counts report, subject, 'posts.created_at'
   end
 
   def self.report_system_private_messages(report)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 95ba43485b0..5bbdb2e1a42 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -176,7 +176,7 @@ describe Report do
     end
   end
 
-  describe 'private messages' do
+  describe 'user to user private messages with replies' do
     let(:report) { Report.find('user_to_user_private_messages_with_replies') }
 
     it 'topic report).to not include private messages' do
@@ -234,6 +234,32 @@ describe Report do
         end
       end
     end
+
+    context 'private message from system user' do
+      before do
+        Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
+      end
+
+      it 'does not include system users' do
+        expect(report.data).to be_blank
+        expect(report.total).to eq 0
+      end
+    end
+  end
+
+  describe 'user to user private messages' do
+    let(:report) { Report.find('user_to_user_private_messages') }
+
+    context 'private message from system user' do
+      before do
+        Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
+      end
+
+      it 'does not include system users' do
+        expect(report.data).to be_blank
+        expect(report.total).to eq 0
+      end
+    end
   end
 
   describe 'users by trust level report' do