mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 23:58:31 -05:00
Battling code duplication in the Report class
* the reports mainly followed the same structure but with different classes, so I took the code and a class as its parameter * the method on which reports.data is generated may change but mostly is count_per_day so made that optional * grouped the refactored methods to the top, some unrefactored methods remain but those are a bit harder to refactor, and not as reusable so I'd like to get this through first * Overall I believe this patch enhances maintainability :-)
This commit is contained in:
parent
dce2847b4f
commit
3324f0f2d2
1 changed files with 22 additions and 29 deletions
|
@ -32,37 +32,40 @@ class Report
|
|||
end
|
||||
|
||||
def self.report_visits(report)
|
||||
report.data = []
|
||||
UserVisit.by_day(30.days.ago).each do |date, count|
|
||||
report.data << {x: date, y: count}
|
||||
end
|
||||
basic_report_about report, UserVisit, :by_day
|
||||
end
|
||||
|
||||
def self.report_signups(report)
|
||||
report.data = []
|
||||
User.count_by_signup_date(30.days.ago).each do |date, count|
|
||||
report.data << {x: date, y: count}
|
||||
end
|
||||
report.total = User.count
|
||||
report.prev30Days = User.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
report_about report, User, :count_by_signup_date
|
||||
end
|
||||
|
||||
def self.report_topics(report)
|
||||
report.data = []
|
||||
Topic.count_per_day(30.days.ago).each do |date, count|
|
||||
report.data << {x: date, y: count}
|
||||
end
|
||||
report.total = Topic.count
|
||||
report.prev30Days = Topic.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
report_about report, Topic
|
||||
end
|
||||
|
||||
def self.report_posts(report)
|
||||
report_about report, Post
|
||||
end
|
||||
|
||||
def self.report_emails(report)
|
||||
report_about report, EmailLog
|
||||
end
|
||||
|
||||
def self.report_about(report, subject_class, report_method = :count_per_day)
|
||||
basic_report_about report, subject_class, report_method
|
||||
add_counts(report, subject_class)
|
||||
end
|
||||
|
||||
def self.basic_report_about(report, subject_class, report_method)
|
||||
report.data = []
|
||||
Post.count_per_day(30.days.ago).each do |date, count|
|
||||
subject_class.send(report_method, 30.days.ago).each do |date, count|
|
||||
report.data << {x: date, y: count}
|
||||
end
|
||||
report.total = Post.count
|
||||
report.prev30Days = Post.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
end
|
||||
|
||||
def self.add_counts(report, subject_class)
|
||||
report.total = subject_class.count
|
||||
report.prev30Days = subject_class.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
end
|
||||
|
||||
def self.report_flags(report)
|
||||
|
@ -93,14 +96,4 @@ class Report
|
|||
report.total = likesQuery.count
|
||||
report.prev30Days = likesQuery.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
end
|
||||
|
||||
def self.report_emails(report)
|
||||
report.data = []
|
||||
EmailLog.count_per_day(30.days.ago).each do |date, count|
|
||||
report.data << {x: date, y: count}
|
||||
end
|
||||
report.total = EmailLog.count
|
||||
report.prev30Days = EmailLog.where('created_at > ? and created_at < ?', 60.days.ago, 30.days.ago).count
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue