Skip to content

A platform for community discussion. Free, open, simple.

PERF: Compute dashboard KPIs in a single pass (#40705)

Natalie Tay628520e54198
diff --git a/app/models/concerns/reports/daily_engaged_users.rb b/app/models/concerns/reports/daily_engaged_users.rb
index 4e88d502a4d..8710f1a80a7 100644
--- a/app/models/concerns/reports/daily_engaged_users.rb
+++ b/app/models/concerns/reports/daily_engaged_users.rb
@@ -9,7 +9,8 @@ module Reports::DailyEngagedUsers
report.data = []
- data = UserAction.count_daily_engaged_users(report.start_date, report.end_date)
+ data_start = report.facets.include?(:prev_period) ? report.prev_start_date : report.start_date
+ data = UserAction.count_daily_engaged_users(data_start, report.end_date)
if report.facets.include?(:prev30Days)
prev30DaysData =
@@ -20,10 +21,8 @@ module Reports::DailyEngagedUsers
report.total = UserAction.count_daily_engaged_users if report.facets.include?(:total)
if report.facets.include?(:prev_period)
- prev_data =
- UserAction.count_daily_engaged_users(report.prev_start_date, report.prev_end_date)
-
- prev = prev_data.values.sum
+ data, prev_data = split_date_counts(data, report.start_date)
+ prev = prev_data.sum { |_date, count| count }
report.prev_period = prev.zero? ? prev : (prev.to_f / prev_data.size).round(1)
end
diff --git a/app/models/concerns/reports/dau_by_mau.rb b/app/models/concerns/reports/dau_by_mau.rb
index 4d97531fed6..faf0bcc2bfd 100644
--- a/app/models/concerns/reports/dau_by_mau.rb
+++ b/app/models/concerns/reports/dau_by_mau.rb
@@ -13,7 +13,8 @@ module Reports::DauByMau
report.average = true
report.percent = true
- data_points = UserVisit.count_by_active_users(report.start_date, report.end_date)
+ data_start = report.facets.include?(:prev_period) ? report.prev_start_date : report.start_date
+ data_points = UserVisit.count_by_active_users(data_start, report.end_date)
report.data = []
@@ -27,24 +28,28 @@ module Reports::DauByMau
end
dau_avg =
- Proc.new do |start_date, end_date|
- data_points = UserVisit.count_by_active_users(start_date, end_date)
- if !data_points.empty?
- sum = data_points.sum { |data_point| compute_dau_by_mau.call(data_point) }
- (sum.to_f / data_points.count.to_f).ceil(2)
+ Proc.new do |points|
+ if !points.empty?
+ sum = points.sum { |data_point| compute_dau_by_mau.call(data_point) }
+ (sum.to_f / points.count.to_f).ceil(2)
end
end
- data_points.each do |data_point|
- report.data << { x: data_point["date"], y: compute_dau_by_mau.call(data_point) }
+ if report.facets.include?(:prev_period)
+ current_start = report.start_date.to_date
+ data_points, prev_data_points =
+ data_points.partition { |data_point| data_point["date"].to_date >= current_start }
+ report.prev_period = dau_avg.call(prev_data_points)
end
- if report.facets.include?(:prev_period)
- report.prev_period = dau_avg.call(report.prev_start_date, report.prev_end_date)
+ data_points.each do |data_point|
+ report.data << { x: data_point["date"], y: compute_dau_by_mau.call(data_point) }
end
if report.facets.include?(:prev30Days)
- report.prev30Days = dau_avg.call(report.start_date - 30.days, report.start_date)
+ prev30_days_data =
+ UserVisit.count_by_active_users(report.start_date - 30.days, report.start_date)
+ report.prev30Days = dau_avg.call(prev30_days_data)
end
end
end
diff --git a/app/models/concerns/reports/new_contributors.rb b/app/models/concerns/reports/new_contributors.rb
index 89b2fdda173..4ea8e5cf65f 100644
--- a/app/models/concerns/reports/new_contributors.rb
+++ b/app/models/concerns/reports/new_contributors.rb
@@ -7,7 +7,8 @@ module Reports::NewContributors
def report_new_contributors(report)
report.data = []
- data = User.real.count_by_first_post(report.start_date, report.end_date)
+ data_start = report.facets.include?(:prev_period) ? report.prev_start_date : report.start_date
+ data = User.real.count_by_first_post(data_start, report.end_date)
if report.facets.include?(:prev30Days)
prev30DaysData =
@@ -18,10 +19,8 @@ module Reports::NewContributors
report.total = User.real.count_by_first_post if report.facets.include?(:total)
if report.facets.include?(:prev_period)
- prev_period_data =
- User.real.count_by_first_post(report.prev_start_date, report.prev_end_date)
- report.prev_period = prev_period_data.sum { |k, v| v }
- # report.prev_data = prev_period_data.map { |k, v| { x: k, y: v } }
+ data, prev_period_data = split_date_counts(data, report.start_date)
+ report.prev_period = prev_period_data.sum { |_date, count| count }
end
data.each { |key, value| report.data << { x: key, y: value } }
diff --git a/app/models/report.rb b/app/models/report.rb
index 80f074d670f..803c8016faf 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -475,8 +475,19 @@ class Report
end
def self.report_about(report, subject_class, report_method = :count_per_day)
- basic_report_about report, subject_class, report_method, report.start_date, report.end_date
- add_counts report, subject_class
+ data_start = report.facets.include?(:prev_period) ? report.prev_start_date : report.start_date
+ counts = subject_class.public_send(report_method, data_start, report.end_date)
+
+ prev_period_count = nil
+
+ if report.facets.include?(:prev_period)
+ counts, prev_counts = split_date_counts(counts, report.start_date)
+ prev_period_count = prev_counts.sum { |_date, count| count }
+ end
+
+ report.data = counts.map { |date, count| { x: date, y: count } }
+
+ add_counts report, subject_class, prev_period_count: prev_period_count
end
def self.basic_report_about(report, subject_class, report_method, *args)
@@ -487,6 +498,11 @@ class Report
.each { |date, count| report.data << { x: date, y: count } }
end
+ def self.split_date_counts(counts, current_start)
+ current_start_date = current_start.to_date
+ counts.partition { |date, _count| date.to_date >= current_start_date }
+ end
+
def self.add_prev_data(report, subject_class, report_method, *args)
if report.modes.include?(Report::MODES[:chart]) && report.facets.include?(:prev_period)
prev_data = subject_class.public_send(report_method, *args)
@@ -494,16 +510,18 @@ class Report
end
end
- def self.add_counts(report, subject_class, query_column = "created_at")
+ def self.add_counts(report, subject_class, query_column = "created_at", prev_period_count: nil)
if report.facets.include?(:prev_period)
- prev_data =
- subject_class.where(
- "#{query_column} >= ? and #{query_column} < ?",
- report.prev_start_date,
- report.prev_end_date,
- )
-
- report.prev_period = prev_data.count
+ report.prev_period =
+ if prev_period_count
+ prev_period_count
+ else
+ subject_class.where(
+ "#{query_column} >= ? and #{query_column} < ?",
+ report.prev_start_date,
+ report.prev_end_date,
+ ).count
+ end
end
report.total = subject_class.count if report.facets.include?(:total)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 49e782e241c..eb73c88d451 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -833,6 +833,34 @@ RSpec.describe Report do
end
end
+ describe "signups" do
+ it "uses previous daily counts for the previous period" do
+ freeze_time(Time.zone.local(2026, 4, 28, 12, 0, 0))
+ Report.clear_cache
+
+ Fabricate(:user, created_at: Time.zone.local(2026, 4, 17, 12, 0, 0))
+ Fabricate(:user, created_at: Time.zone.local(2026, 4, 23, 12, 0, 0))
+ Fabricate(:user, created_at: Time.zone.local(2026, 4, 23, 13, 0, 0))
+
+ report =
+ Report.find(
+ "signups",
+ start_date: Time.zone.local(2026, 4, 22).beginning_of_day,
+ end_date: Time.zone.local(2026, 4, 28).end_of_day,
+ facets: %i[prev_period total prev30Days],
+ )
+
+ data = report.data.map { |data_point| [data_point[:x].to_date, data_point[:y]] }
+
+ aggregate_failures do
+ expect(data).to contain_exactly([Date.new(2026, 4, 23), 2])
+ expect(report.prev_period).to eq(1)
+ expect(report.total).to eq(3)
+ expect(report.prev30Days).to eq(1)
+ end
+ end
+ end
+
describe "posts counts" do
it "only counts regular posts" do
post = Fabricate(:post)