Merge branch 'registry-791' into registry-790

app/models/concerns/domain/force_delete.rb

@@ -1,30 +1,48 @@
 module Concerns::Domain::ForceDelete
   extend ActiveSupport::Concern
 
-  included do
-    alias_attribute :force_delete_time, :force_delete_at
-  end
-
   def force_delete_scheduled?
     statuses.include?(DomainStatus::FORCE_DELETE)
   end
 
   def schedule_force_delete
-    self.statuses_backup = statuses
-    statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
-    statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
+    preserve_current_statuses_for_force_delete
+    add_force_delete_statuses
+    self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
+                             .beginning_of_day
+    stop_all_pending_actions
+    allow_deletion
+    save(validate: false)
+  end
+
+  def cancel_force_delete
+    raise 'Domain must be discarded before cancelling force delete procedure' unless discarded?
+
+    restore_statuses_before_force_delete
+    remove_force_delete_statuses
+    self.force_delete_at = nil
+    save(validate: false)
+  end
+
+  private
+
+  def stop_all_pending_actions
     statuses.delete(DomainStatus::PENDING_UPDATE)
     statuses.delete(DomainStatus::PENDING_TRANSFER)
     statuses.delete(DomainStatus::PENDING_RENEW)
     statuses.delete(DomainStatus::PENDING_CREATE)
+  end
 
-    statuses.delete(DomainStatus::FORCE_DELETE)
-    statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
-    statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
-    statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
-    statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
-    statuses.delete(DomainStatus::PENDING_DELETE)
+  def preserve_current_statuses_for_force_delete
+    self.statuses_before_force_delete = statuses
+  end
 
+  def restore_statuses_before_force_delete
+    self.statuses = statuses_before_force_delete
+    self.statuses_before_force_delete = nil
+  end
+
+  def add_force_delete_statuses
     statuses << DomainStatus::FORCE_DELETE
     statuses << DomainStatus::SERVER_RENEW_PROHIBITED
     statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
@@ -34,21 +52,19 @@ module Concerns::Domain::ForceDelete
     if (statuses & [DomainStatus::SERVER_HOLD, DomainStatus::CLIENT_HOLD]).empty?
       statuses << DomainStatus::SERVER_MANUAL_INZONE
     end
-
-    self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc.beginning_of_day unless force_delete_at
-    save!(validate: false)
   end
 
-  def cancel_force_delete
-    s = []
-    s << DomainStatus::EXPIRED if statuses.include?(DomainStatus::EXPIRED)
-    s << DomainStatus::SERVER_HOLD if statuses.include?(DomainStatus::SERVER_HOLD)
-    s << DomainStatus::DELETE_CANDIDATE if statuses.include?(DomainStatus::DELETE_CANDIDATE)
+  def remove_force_delete_statuses
+    statuses.delete(DomainStatus::FORCE_DELETE)
+    statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
+    statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
+    statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
+    statuses.delete(DomainStatus::PENDING_DELETE)
+    statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
+  end
 
-    self.statuses = (statuses_backup + s).uniq
-
-    self.force_delete_at = nil
-    self.statuses_backup = []
-    save(validate: false)
+  def allow_deletion
+    statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
+    statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
   end
 end

app/models/domain.rb

@@ -577,6 +577,7 @@ class Domain < ActiveRecord::Base
     hash = super
     hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
     hash['valid_from'] = hash['registered_at'] # API v1 requirement
+    hash.delete('statuses_before_force_delete')
     hash
   end