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

Merge pull request #2461 from internetee/2460-fix-force-delete-lift-poll-messages

Browse source 
fix check force delete lift poll messages
This commit is contained in:
Timo Võhmar 2022-10-17 15:28:29 +03:00 • committed by GitHub
commit 4510616ab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/jobs/check_force_delete_lift.rb
View file

@ -6,8 +6,8 @@ class CheckForceDeleteLift < ApplicationJob
.select { |d| d.registrant.need_to_lift_force_delete? }
handle_refresh_status(domains) if domains.present?
domains = Domain.where("force_delete_data->'template_name' = ?", 'invalid_email')
.where("force_delete_data->'force_delete_type' = ?", 'soft')
domains = (domains + Domain.where("force_delete_data->'template_name' = ?", 'invalid_email')
.where("force_delete_data->'force_delete_type' = ?", 'soft')).uniq
domains.each do |domain|
Domains::ForceDeleteLift::Base.run(domain: domain)
@ -39,15 +39,5 @@ class CheckForceDeleteLift < ApplicationJob
domain.status_notes[DomainStatus::FORCE_DELETE].slice!(registrant.email_history)
domain.status_notes[DomainStatus::FORCE_DELETE].lstrip!
domain.save(validate: false)
notify_registrar(domain) unless domain.status_notes[DomainStatus::FORCE_DELETE].empty?
end
def notify_registrar(domain)
domain.registrar.notifications.create!(text: I18n.t('force_delete_auto_email',
domain_name: domain.name,
outzone_date: domain.outzone_date,
purge_date: domain.purge_date,
email: domain.status_notes[DomainStatus::FORCE_DELETE]))
end
end

2
test/models/domain/force_delete_test.rb
View file

@ -457,8 +457,6 @@ class ForceDeleteTest < ActionMailer::TestCase
domain.reload
assert_nil domain.status_notes[DomainStatus::FORCE_DELETE]
notification = domain.registrar.notifications.last(2).first
assert notification.text.include? asserted_text
assert_not domain.force_delete_scheduled?
end