From d080407a6612685b95e8a8b042f1d399df18b98b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 11 Feb 2026 21:55:35 +0530 Subject: [PATCH] refactor: update report builders to use ReportingEventsRollup model --- app/builders/v2/reports/base_summary_builder.rb | 2 +- .../v2/reports/timeseries/average_report_builder.rb | 6 +++--- app/builders/v2/reports/timeseries/count_report_builder.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/builders/v2/reports/base_summary_builder.rb b/app/builders/v2/reports/base_summary_builder.rb index e7d8eaf54..7883b26ed 100644 --- a/app/builders/v2/reports/base_summary_builder.rb +++ b/app/builders/v2/reports/base_summary_builder.rb @@ -40,7 +40,7 @@ class V2::Reports::BaseSummaryBuilder dimension_type = dimension_type_to_rollup # Fetch rollup data grouped by dimension_id - rollup_rows = ReportingEventRollup.where( + rollup_rows = ReportingEventsRollup.where( account_id: account.id, dimension_type: dimension_type, date: range.first..range.last diff --git a/app/builders/v2/reports/timeseries/average_report_builder.rb b/app/builders/v2/reports/timeseries/average_report_builder.rb index 97ca007b8..e68e991db 100644 --- a/app/builders/v2/reports/timeseries/average_report_builder.rb +++ b/app/builders/v2/reports/timeseries/average_report_builder.rb @@ -27,7 +27,7 @@ class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::B dimension_id = dimension_id_for_rollup metric = metric_to_rollup_metric(params[:metric]) - rollup_rows = ReportingEventRollup.where( + rollup_rows = ReportingEventsRollup.where( account_id: account.id, metric: metric, dimension_type: dimension_type, @@ -47,14 +47,14 @@ class V2::Reports::Timeseries::AverageReportBuilder < V2::Reports::Timeseries::B dimension_id = dimension_id_for_rollup metric = metric_to_rollup_metric(params[:metric]) - result = ReportingEventRollup.where( + result = ReportingEventsRollup.where( account_id: account.id, metric: metric, dimension_type: dimension_type, dimension_id: dimension_id, date: range.first..range.last ).pluck(Arel.sql('SUM(count), SUM(sum_value)')) - .first + .first return nil if result.blank? || result[0].to_i.zero? diff --git a/app/builders/v2/reports/timeseries/count_report_builder.rb b/app/builders/v2/reports/timeseries/count_report_builder.rb index bdd56eeea..74aaa938e 100644 --- a/app/builders/v2/reports/timeseries/count_report_builder.rb +++ b/app/builders/v2/reports/timeseries/count_report_builder.rb @@ -28,7 +28,7 @@ class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::Bas dimension_type = dimension_type_to_rollup dimension_id = dimension_id_for_rollup - rollup_rows = ReportingEventRollup.where( + rollup_rows = ReportingEventsRollup.where( account_id: account.id, metric: metric, dimension_type: dimension_type, @@ -50,7 +50,7 @@ class V2::Reports::Timeseries::CountReportBuilder < V2::Reports::Timeseries::Bas dimension_type = dimension_type_to_rollup dimension_id = dimension_id_for_rollup - ReportingEventRollup.where( + ReportingEventsRollup.where( account_id: account.id, metric: metric, dimension_type: dimension_type,