diff --git a/app/jobs/reports/base_report.rb b/app/jobs/reports/base_report.rb index e2148679d4d..bb60c335e98 100644 --- a/app/jobs/reports/base_report.rb +++ b/app/jobs/reports/base_report.rb @@ -26,10 +26,6 @@ def public_bucket_name end end - def fiscal_start_date(time = Time.zone.now.beginning_of_day) - time.change(year: time.month >= 10 ? time.year : time.year - 1, month: 10, day: 1) - end - def first_of_this_month Time.zone.now.beginning_of_month end diff --git a/app/jobs/reports/sp_active_users_report.rb b/app/jobs/reports/sp_active_users_report.rb index 4034e6d86b2..a597e9cbf38 100644 --- a/app/jobs/reports/sp_active_users_report.rb +++ b/app/jobs/reports/sp_active_users_report.rb @@ -41,8 +41,12 @@ def finish_time(time) end end + def fiscal_start_date(time = Time.zone.now.beginning_of_day) + CalendarService.fiscal_start_date(time) + end + def fiscal_end_date(time) - time.change(year: time.month >= 10 ? time.year + 1 : time.year, month: 9, day: 30).end_of_day + CalendarService.fiscal_end_date(time).end_of_day end def reporting_range(time)