Story#113066359 - all whois generation of domain and reserved/blocked domain is async + domain destroy removes whois async

app/models/blocked_domain.rb

@@ -1,8 +1,9 @@
 class BlockedDomain < ActiveRecord::Base
   include Versions
-  before_save :generate_data
-  before_destroy :remove_data
-validates :name, domain_name: true, uniqueness: true
+  before_save   :generate_data
+  after_destroy :remove_data
+
+  validates :name, domain_name: true, uniqueness: true
 
 
   class << self
@@ -22,19 +23,14 @@ validates :name, domain_name: true, uniqueness: true
   def generate_data
     return if Domain.where(name: name).any?
 
-    @json = generate_json
-    @body = generate_body
-    update_whois_server
+    wr = Whois::Record.find_or_initialize_by(name: name)
+    wr.json = @json = generate_json # we need @json to bind to class
+    wr.body = generate_body
+    wr.save
   end
 
   alias_method :update_whois_record, :generate_data
 
-  def update_whois_server
-    wr = Whois::Record.find_or_initialize_by(name: name)
-    wr.body = @body
-    wr.json = @json
-    wr.save
-  end
 
   def generate_body
     template = Rails.root.join("app/views/for_models/whois_other.erb".freeze)
@@ -49,8 +45,6 @@ validates :name, domain_name: true, uniqueness: true
   end
 
   def remove_data
-    return if Domain.where(name: name).any?
-
-    Whois::Record.where(name: name).delete_all
+    UpdateWhoisRecordJob.enqueue name, 'blocked'
   end
 end

app/models/domain.rb

@@ -43,7 +43,7 @@ class Domain < ActiveRecord::Base
   has_many :dnskeys, dependent: :destroy
 
   has_many :keyrelays
-  has_one :whois_record, dependent: :destroy
+  has_one  :whois_record # destroyment will be done in after_commit
 
   accepts_nested_attributes_for :dnskeys, allow_destroy: true
 
@@ -87,7 +87,7 @@ class Domain < ActiveRecord::Base
     true
   end
 
-  after_save :update_whois_record
+  after_commit :update_whois_record
 
   after_create :update_reserved_domains
   def update_reserved_domains
@@ -826,7 +826,8 @@ class Domain < ActiveRecord::Base
   end
 
   def update_whois_record
-    whois_record.blank? ? create_whois_record : whois_record.save
+    p "run by transaction"
+    UpdateWhoisRecordJob.enqueue name, 'domain'
   end
 
   def status_notes_array=(notes)

app/models/reserved_domain.rb

@@ -2,7 +2,8 @@ class ReservedDomain < ActiveRecord::Base
   include Versions # version/reserved_domain_version.rb
   before_save :fill_empty_passwords
   before_save :generate_data
-  before_destroy :remove_data
+  after_destroy :remove_data
+
   validates :name, domain_name: true, uniqueness: true
 
 
@@ -25,12 +26,7 @@ class ReservedDomain < ActiveRecord::Base
 
 
   def fill_empty_passwords
-
-    if self.password.empty?
-
-      self.password =  SecureRandom.hex
-
-    end
+    self.password = SecureRandom.hex if self.password.blank?
   end
 
   def name= val
@@ -40,19 +36,13 @@ class ReservedDomain < ActiveRecord::Base
   def generate_data
     return if Domain.where(name: name).any?
 
-    @json = generate_json
-    @body = generate_body
-    update_whois_server
-  end
-
-  alias_method :update_whois_record, :generate_data
-
-  def update_whois_server
     wr = Whois::Record.find_or_initialize_by(name: name)
-    wr.body = @body
-    wr.json = @json
+    wr.json = @json = generate_json # we need @json to bind to class
+    wr.body = generate_body
     wr.save
   end
+  alias_method :update_whois_record, :generate_data
+
 
   def generate_body
     template = Rails.root.join("app/views/for_models/whois_other.erb".freeze)
@@ -67,9 +57,7 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def remove_data
-    return if Domain.where(name: name).any?
-
-    Whois::Record.where(name: name).delete_all
+    UpdateWhoisRecordJob.enqueue name, 'reserved'
   end
 
 end