diff --git a/app/controllers/concerns/billable_event_trackable.rb b/app/controllers/concerns/billable_event_trackable.rb index cf2fdb5542d..6421b1ab231 100644 --- a/app/controllers/concerns/billable_event_trackable.rb +++ b/app/controllers/concerns/billable_event_trackable.rb @@ -24,7 +24,6 @@ def create_sp_return_log(billable:) current_user.active_profile&.verified_at : nil, profile_requested_issuer: ial_context.bill_for_ial_1_or_2 > 1 ? current_user.active_profile&.initiating_service_provider_issuer : nil, - requested_at: session[:session_started_at], returned_at: Time.zone.now, ) rescue ActiveRecord::RecordNotUnique diff --git a/app/models/sp_return_log.rb b/app/models/sp_return_log.rb index 30d9df3a23b..2285ce96e1a 100644 --- a/app/models/sp_return_log.rb +++ b/app/models/sp_return_log.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class SpReturnLog < ApplicationRecord + self.ignored_columns = %w[requested_at] + # rubocop:disable Rails/InverseOf belongs_to :user belongs_to :service_provider, diff --git a/spec/controllers/concerns/billable_event_trackable_spec.rb b/spec/controllers/concerns/billable_event_trackable_spec.rb index 40fa2d6d656..6e529df74d6 100644 --- a/spec/controllers/concerns/billable_event_trackable_spec.rb +++ b/spec/controllers/concerns/billable_event_trackable_spec.rb @@ -60,7 +60,6 @@ billable: true, ial: ial_context.ial, issuer: current_sp.issuer, - requested_at: session_started_at, returned_at: Time.zone.now, ) diff --git a/spec/features/account_creation/sp_return_log_spec.rb b/spec/features/account_creation/sp_return_log_spec.rb index 2513b1fda4b..015f48c2796 100644 --- a/spec/features/account_creation/sp_return_log_spec.rb +++ b/spec/features/account_creation/sp_return_log_spec.rb @@ -13,6 +13,5 @@ sp_return_log = SpReturnLog.first expect(SpReturnLog.count).to eq(1) expect(sp_return_log.user_id).to eq(user.id) - expect(sp_return_log.requested_at).to_not be_nil end end diff --git a/spec/jobs/data_warehouse/table_summary_stats_export_job_spec.rb b/spec/jobs/data_warehouse/table_summary_stats_export_job_spec.rb index 2cadc531d0a..55572636e9f 100644 --- a/spec/jobs/data_warehouse/table_summary_stats_export_job_spec.rb +++ b/spec/jobs/data_warehouse/table_summary_stats_export_job_spec.rb @@ -184,7 +184,6 @@ def add_data_to_tables User.create!(id: 2, created_at: (timestamp - 1.day)) SpReturnLog.create!( id: 1, - requested_at: (timestamp - 1.day), returned_at: (timestamp - 1.day), request_id: 1, ial: 1, issuer: 'foo' ) 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 c933253c950..ea231487654 100644 --- a/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb +++ b/spec/jobs/reports/combined_invoice_supplement_report_v2_spec.rb @@ -476,7 +476,6 @@ user_id: user12.id, issuer: iaa3_sp1.issuer, ial: 2, - requested_at: DateTime.new(2020, 10, 2), returned_at: DateTime.new(2020, 10, 20), profile_verified_at: DateTime.new(2020, 10, 20), billable: true, @@ -692,7 +691,6 @@ def create_sp_return_log(user:, issuer:, ial:, returned_at:) user_id: user.id, issuer: issuer, ial: ial, - requested_at: returned_at, returned_at: returned_at, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, diff --git a/spec/jobs/reports/daily_auths_report_spec.rb b/spec/jobs/reports/daily_auths_report_spec.rb index 6a2815a88d6..ce8bbf6710b 100644 --- a/spec/jobs/reports/daily_auths_report_spec.rb +++ b/spec/jobs/reports/daily_auths_report_spec.rb @@ -70,14 +70,12 @@ friendly_name: 'The App', agency: agency, ) - # rubocop:disable Layout/LineLength - create(:sp_return_log, ial: 1, issuer: 'a', requested_at: timestamp, returned_at: timestamp, billable: true) - create(:sp_return_log, ial: 1, issuer: 'a', requested_at: timestamp, returned_at: timestamp, billable: true) - create(:sp_return_log, ial: 2, issuer: 'a', requested_at: timestamp, returned_at: timestamp, billable: true) + create(:sp_return_log, ial: 1, issuer: 'a', returned_at: timestamp, billable: true) + create(:sp_return_log, ial: 1, issuer: 'a', returned_at: timestamp, billable: true) + create(:sp_return_log, ial: 2, issuer: 'a', returned_at: timestamp, billable: true) # extra non-billable row that shouldn't be counter - create(:sp_return_log, ial: 2, issuer: 'a', requested_at: timestamp, returned_at: timestamp, billable: false) - # rubocop:enable Layout/LineLength + create(:sp_return_log, ial: 2, issuer: 'a', returned_at: timestamp, billable: false) end it 'aggregates by issuer' do diff --git a/spec/jobs/reports/total_monthly_auths_report_spec.rb b/spec/jobs/reports/total_monthly_auths_report_spec.rb index b098af15040..5f6b231165c 100644 --- a/spec/jobs/reports/total_monthly_auths_report_spec.rb +++ b/spec/jobs/reports/total_monthly_auths_report_spec.rb @@ -25,7 +25,6 @@ ial: 1, billable: true, returned_at: Date.new(2019, 1, 15).to_date, - requested_at: Date.new(2019, 1, 15).to_date, ) end end diff --git a/spec/services/db/monthly_auth_count/total_monthly_auth_counts_spec.rb b/spec/services/db/monthly_auth_count/total_monthly_auth_counts_spec.rb index 07f3c11d329..c0becaac10a 100644 --- a/spec/services/db/monthly_auth_count/total_monthly_auth_counts_spec.rb +++ b/spec/services/db/monthly_auth_count/total_monthly_auth_counts_spec.rb @@ -18,7 +18,6 @@ issuer: issuer, ial: 1, user_id: 2, - requested_at: Date.new(2019, 1, 15), returned_at: Date.new(2019, 1, 15), billable: true, ) @@ -29,7 +28,6 @@ issuer: issuer, ial: 1, user_id: 3, - requested_at: Date.new(2019, 1, 15), returned_at: Date.new(2019, 1, 15), billable: true, ) @@ -41,7 +39,6 @@ issuer: issuer, ial: 1, user_id: 3, - requested_at: Date.new(2019, 2, 10), returned_at: Date.new(2019, 2, 10), billable: true, ) 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 61f03c07580..2c5a3f2be12 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 @@ -91,7 +91,6 @@ user_id: user1.id, issuer: issuer1, ial: 2, - requested_at: inside_partial_month, returned_at: inside_partial_month, profile_verified_at: user1.profiles.map(&:verified_at).max, billable: false, @@ -104,7 +103,6 @@ user_id: user.id, issuer: issuer, ial: 2, - requested_at: inside_partial_month, returned_at: inside_partial_month, profile_verified_at: user.profiles.map(&:verified_at).min, billable: true, @@ -118,7 +116,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_partial_month, returned_at: inside_partial_month, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -135,7 +132,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: inside_whole_month, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -151,7 +147,6 @@ user_id: user.id, ial: 2, issuer: issuer1, - requested_at: inside_whole_month, returned_at: inside_whole_month, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -167,7 +162,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: inside_whole_month, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -183,7 +177,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: inside_whole_month, profile_verified_at: user1.profiles.map(&:verified_at).min, billable: true, @@ -199,7 +192,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: inside_whole_month, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -215,7 +207,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: DateTime.new(2020, 10, 1).utc, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -225,7 +216,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: DateTime.new(2020, 10, 30).utc, profile_verified_at: user.profiles.map(&:verified_at).max, billable: true, @@ -241,7 +231,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: DateTime.new(2022, 8, 16).utc, returned_at: DateTime.new(2022, 10, 5).utc, profile_verified_at: user.profiles[0].verified_at, billable: true, diff --git a/spec/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window_spec.rb b/spec/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window_spec.rb index 8b88d7deba6..ad1619bd39c 100644 --- a/spec/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window_spec.rb +++ b/spec/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window_spec.rb @@ -47,7 +47,6 @@ user: user, ial: 1, service_provider: service_provider, - requested_at: partial_month_date, returned_at: partial_month_date, billable: true, ) @@ -59,7 +58,6 @@ user: user, ial: 1, service_provider: service_provider, - requested_at: partial_month_date, returned_at: partial_month_date, billable: false, ) @@ -71,7 +69,6 @@ user: user, service_provider: service_provider, ial: 1, - requested_at: full_month_date, returned_at: full_month_date, billable: true, ) diff --git a/spec/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa_spec.rb b/spec/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa_spec.rb index cda5811209c..bf582cb7965 100644 --- a/spec/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa_spec.rb +++ b/spec/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa_spec.rb @@ -75,7 +75,6 @@ user_id: user1.id, issuer: issuer1, ial: 1, - requested_at: inside_partial_month, returned_at: inside_partial_month, billable: true, ) @@ -86,7 +85,6 @@ user_id: user1.id, issuer: issuer1, ial: 1, - requested_at: inside_partial_month, returned_at: inside_partial_month, billable: false, ) @@ -98,7 +96,6 @@ user_id: user.id, issuer: issuer2, ial: 2, - requested_at: inside_partial_month, returned_at: inside_partial_month, billable: true, ) @@ -112,7 +109,6 @@ user_id: user.id, ial: 1, issuer: issuer1, - requested_at: inside_whole_month, returned_at: inside_whole_month, billable: true, ) @@ -127,7 +123,6 @@ user_id: user.id, ial: 2, issuer: issuer2, - requested_at: inside_whole_month, returned_at: inside_whole_month, billable: true, )