diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 0bc0bbf..2fb25ad 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -61,5 +61,4 @@ def rename_app end redirect_to URI(request.referer).path end - end diff --git a/app/jobs/import_job.rb b/app/jobs/import_job.rb index bd7d2c7..1952905 100644 --- a/app/jobs/import_job.rb +++ b/app/jobs/import_job.rb @@ -11,7 +11,7 @@ def perform(user_id:, import_type: nil) end # Payments must be imported fully before metrics can be calculated - ImportMetricsJob.perform_later(user.id) + ImportMetricsJob.perform_later(user_id: user.id) rescue => e user&.update(import: "Failed", import_status: 100) raise e diff --git a/app/jobs/import_metrics_job.rb b/app/jobs/import_metrics_job.rb index 44e0a75..f3113b5 100644 --- a/app/jobs/import_metrics_job.rb +++ b/app/jobs/import_metrics_job.rb @@ -1,13 +1,13 @@ class ImportMetricsJob < ApplicationJob queue_as :default - def perform(current_user_id) - return unless current_user_id - current_user = User.find(current_user_id) + def perform(user_id:) + user = User.find(user_id) + return unless user - PaymentHistory.calculate_metrics(current_user) + PaymentHistory.calculate_metrics(user) rescue => e - current_user&.update(import: "Failed", import_status: 100) + user&.update(import: "Failed", import_status: 100) raise e end end