From 1e1f808c8dc76de85e4573fd9455352367304ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Fri, 29 May 2020 14:59:17 +0300 Subject: [PATCH] Use PaperTrail.request.whodunnit PaperTrail.whodunnit was removed from PaperTrail 10.x --- app/controllers/api/v1/registrant/base_controller.rb | 2 +- app/jobs/domain_delete_confirm_job.rb | 2 +- app/jobs/domain_delete_job.rb | 2 +- app/jobs/domain_update_confirm_job.rb | 2 +- app/models/concerns/job/force_delete.rb | 2 +- app/models/concerns/versions.rb | 4 ++-- app/models/domain_cron.rb | 6 +++--- app/models/legal_document.rb | 2 +- lib/gem_monkey_patches/paper_trail.rb | 4 ++-- test/models/domain/domain_version_test.rb | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/api/v1/registrant/base_controller.rb b/app/controllers/api/v1/registrant/base_controller.rb index 277c7c133..16980be8b 100644 --- a/app/controllers/api/v1/registrant/base_controller.rb +++ b/app/controllers/api/v1/registrant/base_controller.rb @@ -44,7 +44,7 @@ module Api # This controller does not inherit from ApplicationController, # so user_for_paper_trail method is not usable. def set_paper_trail_whodunnit - ::PaperTrail.whodunnit = current_registrant_user.id_role_username + ::PaperTrail.request.whodunnit = current_registrant_user.id_role_username end def show_not_found_error diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index a067ce175..e94f2432c 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,6 +1,6 @@ class DomainDeleteConfirmJob < Que::Job def run(domain_id, action, initiator = nil) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" + ::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) diff --git a/app/jobs/domain_delete_job.rb b/app/jobs/domain_delete_job.rb index b45f96713..43e0bb844 100644 --- a/app/jobs/domain_delete_job.rb +++ b/app/jobs/domain_delete_job.rb @@ -3,7 +3,7 @@ class DomainDeleteJob < Que::Job def run(domain_id) domain = Domain.find(domain_id) - ::PaperTrail.whodunnit = "job - #{self.class.name}" + ::PaperTrail.request.whodunnit = "job - #{self.class.name}" WhoisRecord.where(domain_id: domain.id).destroy_all domain.destroy diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 376858c42..f3665f1e8 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,6 +1,6 @@ class DomainUpdateConfirmJob < Que::Job def run(domain_id, action, initiator = nil) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" + ::PaperTrail.request.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) diff --git a/app/models/concerns/job/force_delete.rb b/app/models/concerns/job/force_delete.rb index 2c3cdfdb5..316612d1e 100644 --- a/app/models/concerns/job/force_delete.rb +++ b/app/models/concerns/job/force_delete.rb @@ -7,7 +7,7 @@ module Concerns def start_client_hold log_prepare_client_hold - ::PaperTrail.whodunnit = "cron - #{__method__}" + ::PaperTrail.request.whodunnit = "cron - #{__method__}" ::Domain.force_delete_scheduled.each do |domain| proceed_client_hold(domain: domain) diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb index 01766b233..0f1eab0af 100644 --- a/app/models/concerns/versions.rb +++ b/app/models/concerns/versions.rb @@ -18,12 +18,12 @@ module Versions before_update :add_updator def add_creator - self.creator_str = ::PaperTrail.whodunnit + self.creator_str = ::PaperTrail.request.whodunnit true end def add_updator - self.updator_str = ::PaperTrail.whodunnit + self.updator_str = ::PaperTrail.request.whodunnit true end diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index bc075c067..ad64456ca 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -6,7 +6,7 @@ class DomainCron def self.clean_expired_pendings STDOUT << "#{Time.zone.now.utc} - Clean expired domain pendings\n" unless Rails.env.test? - ::PaperTrail.whodunnit = "cron - #{__method__}" + ::PaperTrail.request.whodunnit = "cron - #{__method__}" expire_at = Setting.expire_pending_confirmation.hours.ago count = 0 expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at) @@ -38,7 +38,7 @@ class DomainCron end def self.start_expire_period - ::PaperTrail.whodunnit = "cron - #{__method__}" + ::PaperTrail.request.whodunnit = "cron - #{__method__}" domains = Domain.expired marked = 0 real = 0 @@ -64,7 +64,7 @@ class DomainCron def self.start_redemption_grace_period STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test? - ::PaperTrail.whodunnit = "cron - #{__method__}" + ::PaperTrail.request.whodunnit = "cron - #{__method__}" domains = Domain.outzone_candidates marked = 0 diff --git a/app/models/legal_document.rb b/app/models/legal_document.rb index 3dc8f883c..70ab1f37b 100644 --- a/app/models/legal_document.rb +++ b/app/models/legal_document.rb @@ -58,7 +58,7 @@ class LegalDocument < ApplicationRecord end def add_creator - self.creator_str = ::PaperTrail.whodunnit + self.creator_str = ::PaperTrail.request.whodunnit true end diff --git a/lib/gem_monkey_patches/paper_trail.rb b/lib/gem_monkey_patches/paper_trail.rb index 12a8f0c3b..2edefa91b 100644 --- a/lib/gem_monkey_patches/paper_trail.rb +++ b/lib/gem_monkey_patches/paper_trail.rb @@ -1,9 +1,9 @@ # Store console and rake changes in versions if defined?(::Rails::Console) - PaperTrail.whodunnit = "console-#{`whoami`.strip}" + PaperTrail.request.whodunnit = "console-#{`whoami`.strip}" elsif File.basename($PROGRAM_NAME) == 'rake' # rake username does not work when spring enabled - PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}" + PaperTrail.request.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}" end class PaperSession diff --git a/test/models/domain/domain_version_test.rb b/test/models/domain/domain_version_test.rb index 74844f3af..2139c21c1 100644 --- a/test/models/domain/domain_version_test.rb +++ b/test/models/domain/domain_version_test.rb @@ -16,7 +16,7 @@ class DomainVersionTest < ActiveSupport::TestCase def test_assigns_creator_to_paper_trail_whodunnit duplicate_domain = prepare_duplicate_domain - PaperTrail.whodunnit = @user.id_role_username + PaperTrail.request.whodunnit = @user.id_role_username assert_difference 'duplicate_domain.versions.count', 1 do duplicate_domain.save! end @@ -28,7 +28,7 @@ class DomainVersionTest < ActiveSupport::TestCase end def test_assigns_updator_to_paper_trail_whodunnit - PaperTrail.whodunnit = @user.id_role_username + PaperTrail.request.whodunnit = @user.id_role_username assert_difference '@domain.versions.count', 1 do @domain.apply_registry_lock