From c7d7cb940c5c5a2bcaafa1036e6f9db0974c8046 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 2 Nov 2017 18:24:43 -0400 Subject: [PATCH] FIX: dashboard posts report was including posts in daily data, but not in totals --- app/models/post.rb | 1 + spec/models/report_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/post.rb b/app/models/post.rb index 1ae23deac5e..4dc6999c2cd 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -622,6 +622,7 @@ class Post < ActiveRecord::Base def self.public_posts_count_per_day(start_date, end_date, category_id = nil) result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date) + .where(post_type: Post.types[:regular]) result = result.where('topics.category_id = ?', category_id) if category_id result.group('date(posts.created_at)').order('date(posts.created_at)').count end diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index c88a72b9dce..c70f9a4fff8 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -215,6 +215,7 @@ describe Report do post.topic.add_small_action(Fabricate(:admin), "invited_group", 'coolkids') r = Report.find('posts') expect(r.total).to eq(1) + expect(r.data[0][:y]).to eq(1) end end end