diff --git a/app/interactions/domains/force_delete/post_set_process.rb b/app/interactions/domains/force_delete/post_set_process.rb index 0c7ae061c..61df9ef46 100644 --- a/app/interactions/domains/force_delete/post_set_process.rb +++ b/app/interactions/domains/force_delete/post_set_process.rb @@ -11,6 +11,7 @@ module Domains # Allow deletion statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) + domain.skip_whois_record_update = false domain.save(validate: false) end diff --git a/app/interactions/domains/force_delete/prepare_domain.rb b/app/interactions/domains/force_delete/prepare_domain.rb index 116957a87..be05ce480 100644 --- a/app/interactions/domains/force_delete/prepare_domain.rb +++ b/app/interactions/domains/force_delete/prepare_domain.rb @@ -8,6 +8,7 @@ module Domains def execute domain.force_delete_domain_statuses_history = domain.statuses domain.statuses |= STATUSES_TO_SET + domain.skip_whois_record_update = true domain.save(validate: false) end end diff --git a/app/interactions/domains/force_delete/set_status.rb b/app/interactions/domains/force_delete/set_status.rb index cefaf820b..cedef18d5 100644 --- a/app/interactions/domains/force_delete/set_status.rb +++ b/app/interactions/domains/force_delete/set_status.rb @@ -5,6 +5,7 @@ module Domains domain.force_delete_type = type type == :fast_track ? force_delete_fast_track : force_delete_soft domain.status_notes[DomainStatus::FORCE_DELETE] = "Company no: #{domain.registrant.ident}" if reason == 'invalid_company' + domain.skip_whois_record_update = true domain.save(validate: false) end diff --git a/app/models/domain.rb b/app/models/domain.rb index 1d1a13083..88d3af6a0 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -89,6 +89,8 @@ class Domain < ApplicationRecord has_many :registrant_verifications, dependent: :destroy has_one :csync_record, dependent: :destroy + attribute :skip_whois_record_update, :boolean, default: false + after_initialize do self.pending_json = {} if pending_json.blank? self.statuses = [] if statuses.nil? @@ -719,6 +721,8 @@ class Domain < ApplicationRecord end def update_whois_record + return if skip_whois_record_update + UpdateWhoisRecordJob.set(wait: 1.minute).perform_later name, 'domain' end