diff --git a/app/jobs/reports/combined_invoice_supplement_report_v2.rb b/app/jobs/reports/combined_invoice_supplement_report_v2.rb index cf2aafe3294..0259180d9f2 100644 --- a/app/jobs/reports/combined_invoice_supplement_report_v2.rb +++ b/app/jobs/reports/combined_invoice_supplement_report_v2.rb @@ -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', @@ -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| @@ -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)), @@ -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 diff --git a/app/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner.rb b/app/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner.rb index ff52df4073e..1419dd15f84 100644 --- a/app/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner.rb +++ b/app/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner.rb @@ -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 diff --git a/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb b/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb index 3d8f8ca4c61..52db27cf4d5 100644 --- a/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb +++ b/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb @@ -99,20 +99,35 @@ expect(row['iaa_ial1_unique_users'].to_i).to eq(1) expect(row['iaa_ial2_unique_users'].to_i).to eq(2) expect(row['iaa_ial1_plus_2_unique_users'].to_i).to eq(3) - expect(row['partner_ial2_unique_users_year1'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year4'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year1'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year4'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_unknown'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year1'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year4'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year1'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year4'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_unknown'].to_i).to eq(0) + + expect(row['issuer_ial2_unique_user_events_year1'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year2'].to_i).to eq(2) + expect(row['issuer_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year1'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year2'].to_i).to eq(2) + expect(row['issuer_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_unknown'].to_i).to eq(0) expect(row['issuer_ial1_total_auth_count'].to_i).to eq(7) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(2) @@ -121,20 +136,6 @@ expect(row['issuer_ial1_unique_users'].to_i).to eq(1) expect(row['issuer_ial2_unique_users'].to_i).to eq(2) expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(3) - expect(row['issuer_ial2_unique_users_year1'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year2'].to_i).to eq(2) - expect(row['issuer_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year1'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year2'].to_i).to eq(2) - expect(row['issuer_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_unknown'].to_i).to eq(0) end end end @@ -278,20 +279,35 @@ expect(row['iaa_ial1_unique_users'].to_i).to eq(0) expect(row['iaa_ial2_unique_users'].to_i).to eq(8) expect(row['iaa_ial1_plus_2_unique_users'].to_i).to eq(8) - expect(row['partner_ial2_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_unique_users_year3'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year5'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_unknown'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_new_unique_users_year3'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year5'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_unknown'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_unique_user_events_year3'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year5'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_unknown'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_new_unique_user_events_year3'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year5'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_unknown'].to_i).to eq(1) + + expect(row['issuer_ial2_unique_user_events_year1'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year2'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year3'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year5'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_unknown'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year2'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year3'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year5'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_unknown'].to_i).to eq(1) expect(row['issuer_ial1_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(4) @@ -300,20 +316,6 @@ expect(row['issuer_ial1_unique_users'].to_i).to eq(0) expect(row['issuer_ial2_unique_users'].to_i).to eq(4) expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(4) - expect(row['issuer_ial2_unique_users_year1'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year2'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year3'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year5'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_unknown'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year2'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year3'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year5'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_unknown'].to_i).to eq(1) end aggregate_failures do @@ -333,20 +335,35 @@ expect(row['iaa_ial1_unique_users'].to_i).to eq(0) expect(row['iaa_ial2_unique_users'].to_i).to eq(8) expect(row['iaa_ial1_plus_2_unique_users'].to_i).to eq(8) - expect(row['partner_ial2_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_unique_users_year3'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year5'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_unknown'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year2'].to_i).to eq(2) - expect(row['partner_ial2_new_unique_users_year3'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year5'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_unknown'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_unique_user_events_year3'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year5'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_unknown'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year2'].to_i).to eq(2) + expect(row['partner_ial2_new_unique_user_events_year3'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year5'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_unknown'].to_i).to eq(1) + + expect(row['issuer_ial2_unique_user_events_year1'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year2'].to_i).to eq(2) + expect(row['issuer_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year4'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year1'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year2'].to_i).to eq(2) + expect(row['issuer_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year4'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_unknown'].to_i).to eq(0) expect(row['issuer_ial1_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(4) @@ -355,20 +372,6 @@ expect(row['issuer_ial1_unique_users'].to_i).to eq(0) expect(row['issuer_ial2_unique_users'].to_i).to eq(4) expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(4) - expect(row['issuer_ial2_unique_users_year1'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year2'].to_i).to eq(2) - expect(row['issuer_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year4'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year1'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year2'].to_i).to eq(2) - expect(row['issuer_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year4'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_unknown'].to_i).to eq(0) end end end @@ -471,20 +474,35 @@ expect(row['iaa_ial1_unique_users'].to_i).to eq(0) expect(row['iaa_ial2_unique_users'].to_i).to eq(1) expect(row['iaa_ial1_plus_2_unique_users'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year2'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year4'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year2'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year4'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_unknown'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year2'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year4'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year2'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year4'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_unknown'].to_i).to eq(0) + + expect(row['issuer_ial2_unique_user_events_year1'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year2'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year2'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year4'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_unknown'].to_i).to eq(0) expect(row['issuer_ial1_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(1) @@ -493,20 +511,6 @@ expect(row['issuer_ial1_unique_users'].to_i).to eq(0) expect(row['issuer_ial2_unique_users'].to_i).to eq(1) expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year1'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year2'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year2'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year4'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_unknown'].to_i).to eq(0) end aggregate_failures do @@ -526,20 +530,35 @@ expect(row['iaa_ial1_unique_users'].to_i).to eq(0) expect(row['iaa_ial2_unique_users'].to_i).to eq(2) expect(row['iaa_ial1_plus_2_unique_users'].to_i).to eq(2) - expect(row['partner_ial2_unique_users_year1'].to_i).to eq(2) - expect(row['partner_ial2_unique_users_year2'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year2'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year4'].to_i).to eq(1) - expect(row['partner_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['partner_ial2_new_unique_users_unknown'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year1'].to_i).to eq(2) + expect(row['partner_ial2_unique_user_events_year2'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year2'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year4'].to_i).to eq(1) + expect(row['partner_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['partner_ial2_new_unique_user_events_unknown'].to_i).to eq(0) + + expect(row['issuer_ial2_unique_user_events_year1'].to_i).to eq(2) + expect(row['issuer_ial2_unique_user_events_year2'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year4'].to_i).to eq(1) + expect(row['issuer_ial2_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_unique_user_events_unknown'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year1'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year2'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year3'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year4'].to_i).to eq(1) + expect(row['issuer_ial2_new_unique_user_events_year5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_year_greater_than_5'].to_i).to eq(0) + expect(row['issuer_ial2_new_unique_user_events_unknown'].to_i).to eq(0) expect(row['issuer_ial1_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(4) @@ -548,20 +567,6 @@ expect(row['issuer_ial1_unique_users'].to_i).to eq(0) expect(row['issuer_ial2_unique_users'].to_i).to eq(2) expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(2) - expect(row['issuer_ial2_unique_users_year1'].to_i).to eq(2) - expect(row['issuer_ial2_unique_users_year2'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year4'].to_i).to eq(1) - expect(row['issuer_ial2_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_unique_users_unknown'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year1'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year2'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year3'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year4'].to_i).to eq(1) - expect(row['issuer_ial2_new_unique_users_year5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_year_greater_than_5'].to_i).to eq(0) - expect(row['issuer_ial2_new_unique_users_unknown'].to_i).to eq(0) end end end diff --git a/spec/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner_spec.rb b/spec/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner_spec.rb index e87a1ebec49..61f03c07580 100644 --- a/spec/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner_spec.rb +++ b/spec/services/db/monthly_sp_auth_count/new_unique_monthly_user_counts_by_partner_spec.rb @@ -259,21 +259,21 @@ iaa_start_date: partner_range.begin.to_s, iaa_end_date: partner_range.end.to_s, unique_user_proofed_events: 8, - partner_ial2_unique_users_year1: 2, - partner_ial2_unique_users_year2: 2, - partner_ial2_unique_users_year3: 1, - partner_ial2_unique_users_year4: 1, - partner_ial2_unique_users_year5: 2, - partner_ial2_unique_users_year_greater_than_5: 0, - partner_ial2_unique_users_unknown: 0, + partner_ial2_unique_user_events_year1: 2, + partner_ial2_unique_user_events_year2: 2, + partner_ial2_unique_user_events_year3: 1, + partner_ial2_unique_user_events_year4: 1, + partner_ial2_unique_user_events_year5: 2, + partner_ial2_unique_user_events_year_greater_than_5: 0, + partner_ial2_unique_user_events_unknown: 0, new_unique_user_proofed_events: 8, - partner_ial2_new_unique_users_year1: 2, - partner_ial2_new_unique_users_year2: 2, - partner_ial2_new_unique_users_year3: 1, - partner_ial2_new_unique_users_year4: 1, - partner_ial2_new_unique_users_year5: 2, - partner_ial2_new_unique_users_year_greater_than_5: 0, - partner_ial2_new_unique_users_unknown: 0, + partner_ial2_new_unique_user_events_year1: 2, + partner_ial2_new_unique_user_events_year2: 2, + partner_ial2_new_unique_user_events_year3: 1, + partner_ial2_new_unique_user_events_year4: 1, + partner_ial2_new_unique_user_events_year5: 2, + partner_ial2_new_unique_user_events_year_greater_than_5: 0, + partner_ial2_new_unique_user_events_unknown: 0, }, { partner: partner_key, @@ -282,21 +282,21 @@ iaa_start_date: partner_range.begin.to_s, iaa_end_date: partner_range.end.to_s, unique_user_proofed_events: 13, - partner_ial2_unique_users_year1: 4, - partner_ial2_unique_users_year2: 4, - partner_ial2_unique_users_year3: 1, - partner_ial2_unique_users_year4: 1, - partner_ial2_unique_users_year5: 0, - partner_ial2_unique_users_year_greater_than_5: 2, - partner_ial2_unique_users_unknown: 1, + partner_ial2_unique_user_events_year1: 4, + partner_ial2_unique_user_events_year2: 4, + partner_ial2_unique_user_events_year3: 1, + partner_ial2_unique_user_events_year4: 1, + partner_ial2_unique_user_events_year5: 0, + partner_ial2_unique_user_events_year_greater_than_5: 2, + partner_ial2_unique_user_events_unknown: 1, new_unique_user_proofed_events: 8, - partner_ial2_new_unique_users_year1: 3, - partner_ial2_new_unique_users_year2: 2, - partner_ial2_new_unique_users_year3: 0, - partner_ial2_new_unique_users_year4: 0, - partner_ial2_new_unique_users_year5: 0, - partner_ial2_new_unique_users_year_greater_than_5: 2, - partner_ial2_new_unique_users_unknown: 1, + partner_ial2_new_unique_user_events_year1: 3, + partner_ial2_new_unique_user_events_year2: 2, + partner_ial2_new_unique_user_events_year3: 0, + partner_ial2_new_unique_user_events_year4: 0, + partner_ial2_new_unique_user_events_year5: 0, + partner_ial2_new_unique_user_events_year_greater_than_5: 2, + partner_ial2_new_unique_user_events_unknown: 1, }, ] expect(results).to match_array(rows)