zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-12 07:34:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

formatted refactoring

Browse source
This commit is contained in:
Oleg Hasjanov 2021-04-06 12:49:21 +03:00
parent 73a0b4091b
commit da3172169a
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb
View file

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

4
app/interactions/domains/cancel_force_delete/restore_statuses_before_force_delete.rb
View file

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

1
app/interactions/domains/force_delete/prepare_domain.rb
View file

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

8
app/models/concerns/domain/force_delete.rb
View file

@ -3,7 +3,7 @@ module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
FORCE_DELETE_STATUSES = [DomainStatus::FORCE_DELETE, FORCE_DELETE_STATUSES = [DomainStatus::FORCE_DELETE,
DomainStatus::SERVER_RENEW_PROHIBITED, DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED] DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
included do included do
store_accessor :force_delete_data, store_accessor :force_delete_data,
@ -50,17 +50,13 @@ module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end end
def schedule_force_delete(type: :fast_track, notify_by_email: false, reason: nil, email: nil) def schedule_force_delete(type: :fast_track, notify_by_email: false, reason: nil, email: nil)
self.force_delete_domain_statuses_history = statuses.map do |status|
status if FORCE_DELETE_STATUSES.include? status
end
Domains::ForceDelete::SetForceDelete.run(domain: self, type: type, reason: reason, Domains::ForceDelete::SetForceDelete.run(domain: self, type: type, reason: reason,
notify_by_email: notify_by_email, email: email) notify_by_email: notify_by_email, email: email)
end end
def cancel_force_delete def cancel_force_delete
Domains::CancelForceDelete::CancelForceDelete.run(domain: self) Domains::CancelForceDelete::CancelForceDelete.run(domain: self)
self.force_delete_domain_statuses_history = nil # self.statuses = force_delete_domain_statuses_history
end end
def outzone_date def outzone_date

8
app/models/concerns/domain/registry_lockable.rb
View file

@ -9,7 +9,7 @@ module Domain::RegistryLockable
return unless registry_lockable? return unless registry_lockable?
return if locked_by_registrant? return if locked_by_registrant?
put_statuses_to_json_history_before_locked save_statuses_history
transaction do transaction do
self.statuses |= LOCK_STATUSES self.statuses |= LOCK_STATUSES
@ -38,7 +38,7 @@ module Domain::RegistryLockable
transaction do transaction do
LOCK_STATUSES.each do |domain_status| LOCK_STATUSES.each do |domain_status|
delete_domain_statuses_which_not_declared_before domain_status remove_predetermined_statuses domain_status
end end
self.locked_by_registrant_at = nil self.locked_by_registrant_at = nil
clear_locked_domain_statuses_history clear_locked_domain_statuses_history
@ -60,13 +60,13 @@ module Domain::RegistryLockable
private private
def put_statuses_to_json_history_before_locked def save_statuses_history
self.locked_domain_statuses_history = statuses.map do |status| self.locked_domain_statuses_history = statuses.map do |status|
status if LOCK_STATUSES.include? status status if LOCK_STATUSES.include? status
end end
end end
def delete_domain_statuses_which_not_declared_before(domain_status) def remove_predetermined_statuses(domain_status)
statuses.delete(domain_status) unless locked_domain_statuses_history.include? domain_status statuses.delete(domain_status) unless locked_domain_statuses_history.include? domain_status
end end