From 24aec79ceb76019b5fe7b7d6ab4c84a2057adf6a Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Wed, 25 May 2016 15:58:39 +0300
Subject: [PATCH] 115693873-log_changes

---
 app/jobs/domain_delete_confirm_job.rb | 2 +-
 app/jobs/domain_update_confirm_job.rb | 2 +-
 app/jobs/update_whois_record_job.rb   | 3 ++-
 app/models/domain.rb                  | 2 --
 app/models/domain_cron.rb             | 6 +++---
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb
index f78c231ae..e3bb47dae 100644
--- a/app/jobs/domain_delete_confirm_job.rb
+++ b/app/jobs/domain_delete_confirm_job.rb
@@ -1,5 +1,6 @@
 class DomainDeleteConfirmJob < Que::Job
   def run(domain_id, action)
+    ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}"
     # it's recommended to keep transaction against job table as short as possible.
     ActiveRecord::Base.transaction do
       domain = Epp::Domain.find(domain_id)
@@ -13,7 +14,6 @@ class DomainDeleteConfirmJob < Que::Job
         domain.poll_message!(:poll_pending_delete_rejected_by_registrant)
         domain.cancel_pending_delete
       end
-      ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}"
       destroy # it's best to destroy the job in the same transaction
     end
   end
diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb
index 6fa6bb414..718ecc7be 100644
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@@ -1,5 +1,6 @@
 class DomainUpdateConfirmJob < Que::Job
   def run(domain_id, action)
+    ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}"
     # it's recommended to keep transaction against job table as short as possible.
     ActiveRecord::Base.transaction do
       domain = Epp::Domain.find(domain_id)
@@ -14,7 +15,6 @@ class DomainUpdateConfirmJob < Que::Job
         domain.poll_message!(:poll_pending_update_rejected_by_registrant)
         domain.clean_pendings_lowlevel
       end
-      ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}"
       destroy # it's best to destroy the job in the same transaction
     end
   end
diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb
index 6851f6121..acfafa3d4 100644
--- a/app/jobs/update_whois_record_job.rb
+++ b/app/jobs/update_whois_record_job.rb
@@ -1,6 +1,8 @@
 class UpdateWhoisRecordJob < Que::Job
 
   def run(names, type)
+    ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}"
+
     klass = case type
       when 'reserved'then ReservedDomain
       when 'blocked' then BlockedDomain
@@ -8,7 +10,6 @@ class UpdateWhoisRecordJob < Que::Job
     end
 
     Array(names).each do |name|
-      ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}"
       record = klass.find_by(name: name)
       if record
         send "update_#{type}", record
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 978839832..8bac1c2dc 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -353,7 +353,6 @@ class Domain < ActiveRecord::Base
 
     status_notes[DomainStatus::PENDING_UPDATE] = ''
     status_notes[DomainStatus::PENDING_DELETE] = ''
-    ::PaperTrail.whodunnit = "Domain - #{__method__}"
 
     update_columns(
         registrant_verification_token:    nil,
@@ -435,7 +434,6 @@ class Domain < ActiveRecord::Base
     # TODO: if this were to ever return true, that would be wrong. EPP would report sucess pending
     return true unless registrant_verification_asked?
     pending_delete_confirmation!
-    ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}"
     save(validate: false) # should check if this did succeed
 
     DomainMailer.pending_deleted(id, registrant_id_was, deliver_emails).deliver
diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb
index 300dec9e2..16736a338 100644
--- a/app/models/domain_cron.rb
+++ b/app/models/domain_cron.rb
@@ -3,6 +3,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__}"
     expire_at = Setting.expire_pending_confirmation.hours.ago
     count = 0
     expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at)
@@ -13,7 +14,6 @@ class DomainCron
         STDOUT << msg unless Rails.env.test?
         next
       end
-      ::PaperTrail.whodunnit = "cron - #{__method__}"
       count += 1
       if domain.pending_update?
         DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver
@@ -34,6 +34,7 @@ class DomainCron
   def self.start_expire_period
     STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test?
 
+    ::PaperTrail.whodunnit = "cron - #{__method__}"
     domains = Domain.where('valid_to <= ?', Time.zone.now)
     marked = 0
     real = 0
@@ -42,7 +43,6 @@ class DomainCron
       real += 1
       domain.set_graceful_expired
       STDOUT << "#{Time.zone.now.utc} DomainCron.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
-      ::PaperTrail.whodunnit = "cron - #{__method__}"
       domain.save(validate: false) and marked += 1
     end
 
@@ -52,6 +52,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__}"
     d = Domain.where('outzone_at <= ?', Time.zone.now)
     marked = 0
     real = 0
@@ -60,7 +61,6 @@ class DomainCron
       real += 1
       domain.statuses << DomainStatus::SERVER_HOLD
       STDOUT << "#{Time.zone.now.utc} DomainCron.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test?
-      ::PaperTrail.whodunnit = "cron - #{__method__}"
       domain.save(validate: false) and marked += 1
     end