Fix check force delete lift bug

app/jobs/check_force_delete_job.rb

@@ -3,41 +3,9 @@ def perform(contact_ids)
     contacts = Contact.find(contact_ids)
 
     contacts.each do |contact|
-      email = contact.email
+      next unless contact.need_to_start_force_delete?
 
-      if contact.need_to_start_force_delete?
-        Domains::ForceDeleteEmail::Base.run(email: email)
-      elsif contact.need_to_lift_force_delete?
-        domain_list(email).each { |domain| refresh_status_notes(contact, domain) }
-      end
+      Domains::ForceDeleteEmail::Base.run(email: contact.email)
     end
   end
-
-  private
-
-  def refresh_status_notes(contact, domain)
-    force_delete_emails = domain.status_notes[DomainStatus::FORCE_DELETE]
-    return unless force_delete_emails
-
-    force_delete_emails.slice!(contact.email_history)
-    force_delete_emails.lstrip!
-    domain.save(validate: false)
-
-    notify_registrar(domain) unless force_delete_emails.empty?
-  end
-
-  def domain_list(email)
-    domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten
-    registrant_ids = Registrant.where(email: email).pluck(:id)
-
-    (domain_contacts.map(&:domain).flatten + Domain.where(registrant_id: registrant_ids)).uniq
-  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

app/models/validation_event.rb

@@ -35,6 +35,8 @@ class ValidationEvent < ApplicationRecord
   scope :smtp, -> { where('event_data @> ?', { 'check_level': 'smtp' }.to_json) }
   scope :by_object, ->(object) { where(validation_eventable: object) }
 
+  after_create :check_force_delete_lift
+
   def self.validated_ids_by(klass)
     old_records
       .successful
@@ -57,4 +59,37 @@ def event_type
   def object
     validation_eventable
   end
+
+  private
+
+  def check_force_delete_lift
+    return unless object.need_to_lift_force_delete?
+
+    domain_list.each { |domain| refresh_status_notes(domain) }
+  end
+
+  def refresh_status_notes(domain)
+    return unless domain.status_notes[DomainStatus::FORCE_DELETE]
+
+    domain.status_notes[DomainStatus::FORCE_DELETE].slice!(object.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 domain_list
+    domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten
+    registrant_ids = Registrant.where(email: email).pluck(:id)
+
+    (domain_contacts.map(&:domain).flatten + Domain.where(registrant_id: registrant_ids)).uniq
+  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

lib/tasks/check_force_delete.rake

@@ -3,8 +3,7 @@ task check_force_delete: :environment do
   validations = ValidationEvent.failed.where(validation_eventable_type: 'Contact').uniq(&:validation_eventable_id)
 
   invalid_contact_ids = validations.select do |validation|
-    contact = validation.validation_eventable
-    contact.need_to_start_force_delete? || contact.need_to_lift_force_delete?
+    validation.validation_eventable.need_to_start_force_delete?
   end.pluck(:validation_eventable_id)
 
   CheckForceDeleteJob.perform_later(invalid_contact_ids) if invalid_contact_ids.present?

test/models/domain/force_delete_test.rb

@@ -517,6 +517,29 @@ def test_lifts_force_delete_after_bounce_changes
     assert_not @domain.force_delete_scheduled?
   end
 
+  def test_lifts_force_delete_after_changing_to_valid_email
+    @domain.update(valid_to: Time.zone.parse('2012-08-05'))
+    assert_not @domain.force_delete_scheduled?
+    travel_to Time.zone.parse('2010-07-05')
+    @domain.registrant.update_attribute(:email, '`@internet.ee')
+    3.times { @domain.registrant.verify_email }
+    perform_check_force_delete_job(@domain.registrant.id)
+    @domain.reload
+
+    assert @domain.force_delete_scheduled?
+
+    @domain.registrant.update(email: '[email protected]')
+    @domain.registrant.verify_email
+    @domain.reload
+
+    assert @domain.registrant.need_to_lift_force_delete?
+
+    perform_enqueued_jobs { CheckForceDeleteLift.perform_now }
+    @domain.reload
+
+    assert_not @domain.force_delete_scheduled?
+  end
+
   def prepare_bounced_email_address(email)
     @bounced_mail = BouncedMailAddress.new
     @bounced_mail.email = email