diff --git a/app/jobs/validation_event_check_force_delete_job.rb b/app/jobs/validation_event_check_force_delete_job.rb index 3a0ee561b..1b914ae9a 100644 --- a/app/jobs/validation_event_check_force_delete_job.rb +++ b/app/jobs/validation_event_check_force_delete_job.rb @@ -7,7 +7,6 @@ class ValidationEventCheckForceDeleteJob < ApplicationJob event.start_force_delete elsif contact.need_to_lift_force_delete? event.refresh_status_notes - event.lift_force_delete end end end diff --git a/app/models/validation_event.rb b/app/models/validation_event.rb index 121c0e805..27e69ad44 100644 --- a/app/models/validation_event.rb +++ b/app/models/validation_event.rb @@ -92,14 +92,4 @@ class ValidationEvent < ApplicationRecord purge_date: domain.purge_date, email: domain.status_notes[DomainStatus::FORCE_DELETE])) end - - def lift_force_delete - domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten - registrant_domains = Domain.where(registrant_id: Registrant.where(email: email).pluck(:id)) - domains = domain_contacts.map(&:domain).flatten + registrant_domains - - domains.each do |domain| - Domains::ForceDeleteLift::Base.run(domain: domain) - end - end end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index f0dcb1007..21c6da229 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -1,6 +1,8 @@ require 'test_helper' class ForceDeleteTest < ActionMailer::TestCase + include ActiveJob::TestHelper + setup do @domain = domains(:shop) Setting.redemption_grace_period = 30 @@ -396,6 +398,7 @@ class ForceDeleteTest < ActionMailer::TestCase contact.verify_email end + perform_enqueued_jobs @domain.reload assert @domain.force_delete_scheduled? @@ -428,6 +431,7 @@ class ForceDeleteTest < ActionMailer::TestCase contact_first.verify_email end + perform_enqueued_jobs domain.reload assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails @@ -455,6 +459,8 @@ class ForceDeleteTest < ActionMailer::TestCase travel_to Time.zone.parse('2010-07-05 0:00:03') contact_first.verify_email + + perform_enqueued_jobs domain.reload assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_email @@ -472,12 +478,14 @@ class ForceDeleteTest < ActionMailer::TestCase contact_one = @domain.admin_contacts.first contact_one.update_attribute(:email, email_one) contact_one.verify_email + perform_enqueued_jobs assert contact_one.need_to_start_force_delete? contact_two = @domain.admin_contacts.first contact_two.update_attribute(:email, email_two) contact_two.verify_email + perform_enqueued_jobs assert contact_two.need_to_start_force_delete?