Skip to content

Lg 14149 update mkmr apg report #11146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ThatSpaceGuy wants to merge 2 commits into from
Closed

Lg 14149 update mkmr apg report #11146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73004bc
LG-14149 Update MKMR APG Report with Current Month stats
ThatSpaceGuy Aug 22, 2024
56e70ca
Junk commit
ThatSpaceGuy Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/jobs/reports/monthly_key_metrics_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ def total_user_count_report
end

def active_users_count_report
@active_users_count_report ||= Reporting::ActiveUsersCountReport.new(
report_date,
)
@active_users_count_report ||= Reporting::ActiveUsersCountReport.new(report_date)
end

def agency_and_sp_report
Expand Down
14 changes: 14 additions & 0 deletions app/services/reporting/active_users_count_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def generate_apg_report

[
['Active Users (APG)', 'IAL1', 'IDV', 'Total', 'Range start', 'Range end'],
monthly_active_users_apg.as_csv(title: 'Current month'),
q1.as_csv(title: 'Fiscal year Q1'),
q2.as_csv(title: 'Fiscal year Q2 cumulative'),
q3.as_csv(title: 'Fiscal year Q3 cumulative'),
Expand All @@ -94,6 +95,19 @@ def monthly_active_users
end
end

# @return [ReportRow]
def monthly_active_users_apg
@monthly_active_users_apg ||= Reports::BaseReport.transaction_with_timeout do
ReportRow.from_hash_time_range(
time_range: monthly_range,
hash: Db::Identity::SpActiveUserCounts.overall_apg(
monthly_range.begin,
monthly_range.end,
).first,
)
end
end

# @return [Array<ReportRow>]
def fiscal_year_active_users_per_quarter_cumulative
@fiscal_year_active_users_per_quarter_cumulative ||= begin
Expand Down
3 changes: 2 additions & 1 deletion spec/services/reporting/active_users_count_report_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@

expected_table = [
['Active Users (APG)', 'IAL1', 'IDV', 'Total', 'Range start', 'Range end'],
['Current month', 0, 0, 0, Date.new(2023, 3, 1), Date.new(2023, 3, 31)],
['Fiscal year Q1', 0, 0, 0, Date.new(2022, 10, 1), Date.new(2022, 12, 31)],
['Fiscal year Q2 cumulative', 2, 0, 2, Date.new(2022, 10, 1), Date.new(2023, 3, 31)],
['Fiscal year Q3 cumulative', 2, 0, 2, Date.new(2022, 10, 1), Date.new(2023, 3, 31)],
Expand All @@ -106,7 +107,7 @@

emailable_report = report.active_users_count_apg_emailable_report

expect(Db::Identity::SpActiveUserCounts).to have_received(:overall_apg).exactly(2).times
expect(Db::Identity::SpActiveUserCounts).to have_received(:overall_apg).exactly(3).times

aggregate_failures do
emailable_report.table.zip(expected_table).each do |actual, expected|
Expand Down
Loading