diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index bd0c779c7..8f2f30d19 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -101,7 +101,7 @@ class DomainCron destroy_with_message x STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by deleteCandidate ##{x.id} (#{x.name})\n" unless Rails.env.test? - Domain.where('delete_at <= ?', Time.zone.now).each do |x| + Domain.where('delete_at <= ?', Time.zone.now.end_of_day.utc).each do |x| next unless x.delete_candidateable? x.statuses << DomainStatus::DELETE_CANDIDATE @@ -115,7 +115,7 @@ class DomainCron end end - Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| + Domain.where('force_delete_at <= ?', Time.zone.now.end_of_day.utc).each do |x| DomainDeleteJob.enqueue(x.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: job added by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? ::PaperTrail.whodunnit = "cron - #{__method__} case force_deleted_at"