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

implement domain statuses restore after domain locked, added test
This commit is contained in:
Timo Võhmar 2021-04-08 16:35:37 +03:00 committed by GitHub
commit f6fcf15fff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 171 additions and 10 deletions

View file

@ -1,6 +1,10 @@
module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
extend ActiveSupport::Concern
FORCE_DELETE_STATUSES = [DomainStatus::FORCE_DELETE,
DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
included do
store_accessor :force_delete_data,
:force_delete_type,
@ -52,6 +56,7 @@ module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
def cancel_force_delete
Domains::CancelForceDelete::CancelForceDelete.run(domain: self)
# self.statuses = force_delete_domain_statuses_history
end
def outzone_date

View file

@ -36,9 +36,10 @@ module Domain::RegistryLockable
transaction do
LOCK_STATUSES.each do |domain_status|
statuses.delete(domain_status)
statuses.delete([domain_status])
end
self.locked_by_registrant_at = nil
self.statuses = admin_store_statuses_history || []
alert_registrar_lock_changes!(lock: false)
save!