Revert "Merge pull request #1902 from internetee/1900-removing-registry-lock-should-not-remove-statuses-set-prior-to-setting-it"

This reverts commit f6fcf15fff, reversing
changes made to 26618a3c90.

app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb

@@ -2,12 +2,10 @@ module Domains
   module CancelForceDelete
     class RemoveForceDeleteStatuses < Base
       def execute
-        domain_statuses = [DomainStatus::FORCE_DELETE,
-                           DomainStatus::SERVER_RENEW_PROHIBITED,
-                           DomainStatus::SERVER_TRANSFER_PROHIBITED,
-                           DomainStatus::CLIENT_HOLD]
-        rejected_statuses = domain.statuses.reject { |a| domain_statuses.include? a }
-        domain.statuses = rejected_statuses
+        domain.statuses.delete(DomainStatus::FORCE_DELETE)
+        domain.statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
+        domain.statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
+        domain.statuses.delete(DomainStatus::CLIENT_HOLD)
         domain.save(validate: false)
       end
     end

app/interactions/domains/cancel_force_delete/restore_statuses_before_force_delete.rb

@@ -2,10 +2,8 @@ module Domains
   module CancelForceDelete
     class RestoreStatusesBeforeForceDelete < Base
       def execute
-        # domain.statuses = domain.statuses_before_force_delete
-        domain.statuses = domain.force_delete_domain_statuses_history || []
+        domain.statuses = domain.statuses_before_force_delete
         domain.statuses_before_force_delete = nil
-        domain.force_delete_domain_statuses_history = nil
         domain.save(validate: false)
       end
     end

app/interactions/domains/force_delete/prepare_domain.rb

@@ -6,7 +6,6 @@ module Domains
                          DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
 
       def execute
-        domain.force_delete_domain_statuses_history = domain.statuses
         domain.statuses_before_force_delete = domain.statuses
         domain.statuses |= STATUSES_TO_SET
         domain.save(validate: false)