zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add condition on not having clientHold status for force-delete job

Browse source 
See #1480
This commit is contained in:
Alex Sherman 2020-01-20 17:06:37 +05:00
parent b3e5e477ad
commit a7b4b0d19b
4 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,8 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
def should_notify_on_soft_force_delete?
force_delete_scheduled? && contact_notification_sent_date.blank? &&
force_delete_start.to_date <= Time.zone.now.to_date && force_delete_type.to_sym == :soft
force_delete_start.to_date <= Time.zone.now.to_date && force_delete_type.to_sym == :soft &&
!statuses.include?(DomainStatus::CLIENT_HOLD)
end
def client_holdable?

5
app/models/concerns/job/force_delete.rb
View file

@ -11,8 +11,9 @@ module Concerns
::Domain.force_delete_scheduled.each do |domain|
proceed_client_hold(domain: domain)
log_end_end_client_hold(domain)
end
log_end_end_force_delete_job
end
def proceed_client_hold(domain:)
@ -24,6 +25,8 @@ module Concerns
domain.save(validate: false)
notify_client_hold(domain)
log_end_end_client_hold(domain)
end
end
end

6
app/models/concerns/job/force_delete_logging.rb
View file

@ -22,6 +22,12 @@ module Concerns
STDOUT << "#{Time.zone.now.utc} - Successfully set client_hold on (#{domain.name})"
end
def log_end_end_force_delete_job
return if Rails.env.test?
STDOUT << "#{Time.zone.now.utc} - All client_hold setting are done\n"
end
end
end
end