Merge pull request #2167 from internetee/93-locked-domains-failed-after-fc

93 locked domains failed after fc
This commit is contained in:
Timo Võhmar 2021-10-21 11:02:06 +03:00 committed by GitHub
commit dbb58bc2e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 108 additions and 24 deletions

View file

@ -6,6 +6,11 @@ module Domains
DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED,
DomainStatus::CLIENT_HOLD]
domain.force_delete_domain_statuses_history += [ DomainStatus::SERVER_TRANSFER_PROHIBITED,
DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED
] if domain.locked_by_registrant?
domain.admin_store_statuses_history -= domain_statuses unless domain.admin_store_statuses_history.nil?
rejected_statuses = domain.statuses.reject { |a| domain_statuses.include? a }
domain.statuses = rejected_statuses
domain.save(validate: false)

View file

@ -2,9 +2,13 @@ module Domains
module CancelForceDelete
class RestoreStatusesBeforeForceDelete < Base
def execute
domain.statuses = domain.force_delete_domain_statuses_history || []
domain.statuses += domain.force_delete_domain_statuses_history || []
domain.statuses += domain.admin_store_statuses_history || []
domain.statuses.uniq!
domain.statuses_before_force_delete = nil
domain.force_delete_domain_statuses_history = nil
domain.admin_store_statuses_history = nil
domain.save(validate: false)
end
end