diff --git a/app/jobs/reports/combined_invoice_supplement_report.rb b/app/jobs/reports/combined_invoice_supplement_report.rb index a8ccf2d08ae..4c8a1b4a2d7 100644 --- a/app/jobs/reports/combined_invoice_supplement_report.rb +++ b/app/jobs/reports/combined_invoice_supplement_report.rb @@ -79,6 +79,10 @@ def combine_by_iaa_month(by_iaa_results:, by_issuer_results:) 'issuer_ial1_total_auth_count', 'issuer_ial2_total_auth_count', 'issuer_ial1_plus_2_total_auth_count', + + 'issuer_ial1_unique_users', + 'issuer_ial2_unique_users', + 'issuer_ial1_plus_2_unique_users', 'issuer_ial2_new_unique_users', ] @@ -106,14 +110,18 @@ def combine_by_iaa_month(by_iaa_results:, by_issuer_results:) year_month, year_month_start.strftime('%B %Y'), - (ial1_unique_users = extract(iaa_results, :unique_users, ial: 1)), - (ial2_unique_users = extract(iaa_results, :unique_users, ial: 2)), - ial1_unique_users + ial2_unique_users, + (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, extract(iaa_results, :new_unique_users, ial: 2), (ial1_total_auth_count = extract(issuer_results, :total_auth_count, ial: 1)), (ial2_total_auth_count = extract(issuer_results, :total_auth_count, ial: 2)), ial1_total_auth_count + ial2_total_auth_count, + + (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, extract(issuer_results, :new_unique_users, ial: 2), ] end diff --git a/spec/jobs/reports/combined_invoice_supplement_report_spec.rb b/spec/jobs/reports/combined_invoice_supplement_report_spec.rb index f182257b7b3..f34d6133c10 100644 --- a/spec/jobs/reports/combined_invoice_supplement_report_spec.rb +++ b/spec/jobs/reports/combined_invoice_supplement_report_spec.rb @@ -155,6 +155,10 @@ expect(row['issuer_ial1_total_auth_count'].to_i).to eq(1) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial1_plus_2_total_auth_count'].to_i).to eq(1) + + expect(row['issuer_ial1_unique_users'].to_i).to eq(1) + expect(row['issuer_ial2_unique_users'].to_i).to eq(0) + expect(row['issuer_ial1_plus_2_unique_users'].to_i).to eq(1) expect(row['issuer_ial2_new_unique_users'].to_i).to eq(0) end @@ -180,6 +184,10 @@ expect(row['issuer_ial1_total_auth_count'].to_i).to eq(0) expect(row['issuer_ial2_total_auth_count'].to_i).to eq(1) expect(row['issuer_ial1_plus_2_total_auth_count'].to_i).to eq(1) + + 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_new_unique_users'].to_i).to eq(1) end end