Skip to content

Reporting: Billing Report v2 - Reorder and rename columns #10817

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

Merged
colter-nattrass merged 1 commit into from
Jun 13, 2024
Merged

Reporting: Billing Report v2 - Reorder and rename columns #10817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
114 changes: 58 additions & 56 deletions app/jobs/reports/combined_invoice_supplement_report_v2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,35 @@ def combine_by_iaa_month(
'iaa_ial1_unique_users',
'iaa_ial2_unique_users',
'iaa_ial1_plus_2_unique_users',
'partner_ial2_unique_users_year1',
'partner_ial2_unique_users_year2',
'partner_ial2_unique_users_year3',
'partner_ial2_unique_users_year4',
'partner_ial2_unique_users_year5',
'partner_ial2_unique_users_year_greater_than_5',
'partner_ial2_unique_users_unknown',
'partner_ial2_new_unique_users_year1',
'partner_ial2_new_unique_users_year2',
'partner_ial2_new_unique_users_year3',
'partner_ial2_new_unique_users_year4',
'partner_ial2_new_unique_users_year5',
'partner_ial2_new_unique_users_year_greater_than_5',
'partner_ial2_new_unique_users_unknown',
'partner_ial2_unique_user_events_year1',
'partner_ial2_unique_user_events_year2',
'partner_ial2_unique_user_events_year3',
'partner_ial2_unique_user_events_year4',
'partner_ial2_unique_user_events_year5',
'partner_ial2_unique_user_events_year_greater_than_5',
'partner_ial2_unique_user_events_unknown',
'partner_ial2_new_unique_user_events_year1',
'partner_ial2_new_unique_user_events_year2',
'partner_ial2_new_unique_user_events_year3',
'partner_ial2_new_unique_user_events_year4',
'partner_ial2_new_unique_user_events_year5',
'partner_ial2_new_unique_user_events_year_greater_than_5',
'partner_ial2_new_unique_user_events_unknown',

'issuer_ial2_unique_user_events_year1',
'issuer_ial2_unique_user_events_year2',
'issuer_ial2_unique_user_events_year3',
'issuer_ial2_unique_user_events_year4',
'issuer_ial2_unique_user_events_year5',
'issuer_ial2_unique_user_events_year_greater_than_5',
'issuer_ial2_unique_user_events_unknown',
'issuer_ial2_new_unique_user_events_year1',
'issuer_ial2_new_unique_user_events_year2',
'issuer_ial2_new_unique_user_events_year3',
'issuer_ial2_new_unique_user_events_year4',
'issuer_ial2_new_unique_user_events_year5',
'issuer_ial2_new_unique_user_events_year_greater_than_5',
'issuer_ial2_new_unique_user_events_unknown',

'issuer_ial1_total_auth_count',
'issuer_ial2_total_auth_count',
Expand All @@ -119,20 +134,6 @@ def combine_by_iaa_month(
'issuer_ial1_unique_users',
'issuer_ial2_unique_users',
'issuer_ial1_plus_2_unique_users',
'issuer_ial2_unique_users_year1',
'issuer_ial2_unique_users_year2',
'issuer_ial2_unique_users_year3',
'issuer_ial2_unique_users_year4',
'issuer_ial2_unique_users_year5',
'issuer_ial2_unique_users_year_greater_than_5',
'issuer_ial2_unique_users_unknown',
'issuer_ial2_new_unique_users_year1',
'issuer_ial2_new_unique_users_year2',
'issuer_ial2_new_unique_users_year3',
'issuer_ial2_new_unique_users_year4',
'issuer_ial2_new_unique_users_year5',
'issuer_ial2_new_unique_users_year_greater_than_5',
'issuer_ial2_new_unique_users_unknown',
]
by_issuer_iaa_issuer_year_months.each do |iaa_key, issuer_year_months|
issuer_year_months.each do |issuer, year_months_data|
Expand Down Expand Up @@ -169,20 +170,35 @@ def combine_by_iaa_month(
(iaa_ial1_unique_users = extract(iaa_results, :unique_users, ial: 1)),
(iaa_ial2_unique_users = extract(iaa_results, :unique_users, ial: 2)),
iaa_ial1_unique_users + iaa_ial2_unique_users,
partner_results[:partner_ial2_unique_users_year1] || 0,
partner_results[:partner_ial2_unique_users_year2] || 0,
partner_results[:partner_ial2_unique_users_year3] || 0,
partner_results[:partner_ial2_unique_users_year4] || 0,
partner_results[:partner_ial2_unique_users_year5] || 0,
partner_results[:partner_ial2_unique_users_year_greater_than_5] || 0,
partner_results[:partner_ial2_unique_users_unknown] || 0,
partner_results[:partner_ial2_new_unique_users_year1] || 0,
partner_results[:partner_ial2_new_unique_users_year2] || 0,
partner_results[:partner_ial2_new_unique_users_year3] || 0,
partner_results[:partner_ial2_new_unique_users_year4] || 0,
partner_results[:partner_ial2_new_unique_users_year5] || 0,
partner_results[:partner_ial2_new_unique_users_year_greater_than_5] || 0,
partner_results[:partner_ial2_new_unique_users_unknown] || 0,
partner_results[:partner_ial2_unique_user_events_year1] || 0,
partner_results[:partner_ial2_unique_user_events_year2] || 0,
partner_results[:partner_ial2_unique_user_events_year3] || 0,
partner_results[:partner_ial2_unique_user_events_year4] || 0,
partner_results[:partner_ial2_unique_user_events_year5] || 0,
partner_results[:partner_ial2_unique_user_events_year_greater_than_5] || 0,
partner_results[:partner_ial2_unique_user_events_unknown] || 0,
partner_results[:partner_ial2_new_unique_user_events_year1] || 0,
partner_results[:partner_ial2_new_unique_user_events_year2] || 0,
partner_results[:partner_ial2_new_unique_user_events_year3] || 0,
partner_results[:partner_ial2_new_unique_user_events_year4] || 0,
partner_results[:partner_ial2_new_unique_user_events_year5] || 0,
partner_results[:partner_ial2_new_unique_user_events_year_greater_than_5] || 0,
partner_results[:partner_ial2_new_unique_user_events_unknown] || 0,

issuer_profile_age_results[:partner_ial2_unique_user_events_year1] || 0,
issuer_profile_age_results[:partner_ial2_unique_user_events_year2] || 0,
issuer_profile_age_results[:partner_ial2_unique_user_events_year3] || 0,
issuer_profile_age_results[:partner_ial2_unique_user_events_year4] || 0,
issuer_profile_age_results[:partner_ial2_unique_user_events_year5] || 0,
issuer_profile_age_results[:partner_ial2_unique_user_events_year_greater_than_5] || 0, # rubocop:disable Layout/LineLength
issuer_profile_age_results[:partner_ial2_unique_user_events_unknown] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year1] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year2] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year3] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year4] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year5] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_user_events_year_greater_than_5] || 0, # rubocop:disable Layout/LineLength
issuer_profile_age_results[:partner_ial2_new_unique_user_events_unknown] || 0,

(ial1_total_auth_count = extract(issuer_results, :total_auth_count, ial: 1)),
(ial2_total_auth_count = extract(issuer_results, :total_auth_count, ial: 2)),
Expand All @@ -191,20 +207,6 @@ def combine_by_iaa_month(
(issuer_ial1_unique_users = extract(issuer_results, :unique_users, ial: 1)),
(issuer_ial2_unique_users = extract(issuer_results, :unique_users, ial: 2)),
issuer_ial1_unique_users + issuer_ial2_unique_users,
issuer_profile_age_results[:partner_ial2_unique_users_year1] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_year2] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_year3] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_year4] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_year5] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_year_greater_than_5] || 0,
issuer_profile_age_results[:partner_ial2_unique_users_unknown] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year1] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year2] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year3] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year4] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year5] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_year_greater_than_5] || 0,
issuer_profile_age_results[:partner_ial2_new_unique_users_unknown] || 0,
]
end
end
Expand Down
28 changes: 14 additions & 14 deletions app/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@ def call(partner:, issuers:, start_date:, end_date:)
iaa_start_date: date_range.begin.to_s,
iaa_end_date: date_range.end.to_s,
unique_user_proofed_events: this_month_user_proofed_events.count,
partner_ial2_unique_users_year1: unique_profiles_by_age[0].count,
partner_ial2_unique_users_year2: unique_profiles_by_age[1].count,
partner_ial2_unique_users_year3: unique_profiles_by_age[2].count,
partner_ial2_unique_users_year4: unique_profiles_by_age[3].count,
partner_ial2_unique_users_year5: unique_profiles_by_age[4].count,
partner_ial2_unique_users_year_greater_than_5: unique_profiles_by_age[:older].count,
partner_ial2_unique_users_unknown: unique_profiles_by_age[:unknown].count,
partner_ial2_unique_user_events_year1: unique_profiles_by_age[0].count,
partner_ial2_unique_user_events_year2: unique_profiles_by_age[1].count,
partner_ial2_unique_user_events_year3: unique_profiles_by_age[2].count,
partner_ial2_unique_user_events_year4: unique_profiles_by_age[3].count,
partner_ial2_unique_user_events_year5: unique_profiles_by_age[4].count,
partner_ial2_unique_user_events_year_greater_than_5: unique_profiles_by_age[:older].count, # rubocop:disable Layout/LineLength
partner_ial2_unique_user_events_unknown: unique_profiles_by_age[:unknown].count,
new_unique_user_proofed_events: new_unique_user_proofed_events.count,
partner_ial2_new_unique_users_year1: new_unique_profiles_by_age[0].count,
partner_ial2_new_unique_users_year2: new_unique_profiles_by_age[1].count,
partner_ial2_new_unique_users_year3: new_unique_profiles_by_age[2].count,
partner_ial2_new_unique_users_year4: new_unique_profiles_by_age[3].count,
partner_ial2_new_unique_users_year5: new_unique_profiles_by_age[4].count,
partner_ial2_new_unique_users_year_greater_than_5: new_unique_profiles_by_age[:older].count, # rubocop:disable Layout/LineLength
partner_ial2_new_unique_users_unknown: new_unique_profiles_by_age[:unknown].count,
partner_ial2_new_unique_user_events_year1: new_unique_profiles_by_age[0].count,
partner_ial2_new_unique_user_events_year2: new_unique_profiles_by_age[1].count,
partner_ial2_new_unique_user_events_year3: new_unique_profiles_by_age[2].count,
partner_ial2_new_unique_user_events_year4: new_unique_profiles_by_age[3].count,
partner_ial2_new_unique_user_events_year5: new_unique_profiles_by_age[4].count,
partner_ial2_new_unique_user_events_year_greater_than_5: new_unique_profiles_by_age[:older].count, # rubocop:disable Layout/LineLength
partner_ial2_new_unique_user_events_unknown: new_unique_profiles_by_age[:unknown].count,
}
end
# rubocop:enable Metrics/BlockLength
Expand Down
Loading