From 95a2b705b4042630420854aed6d51bb538b22e8a Mon Sep 17 00:00:00 2001
From: Alex Sherman <yul.golem@gmail.com>
Date: Tue, 6 Apr 2021 12:36:32 +0500
Subject: [PATCH] Add checking if any of domain emails still got bounce related

---
 .../domains/force_delete_lift/base.rb         | 18 +++++++++++--
 app/models/domain.rb                          |  4 +++
 test/models/domain/force_delete_test.rb       | 26 +++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/interactions/domains/force_delete_lift/base.rb b/app/interactions/domains/force_delete_lift/base.rb
index 2aaa8930c..cb333a9dc 100644
--- a/app/interactions/domains/force_delete_lift/base.rb
+++ b/app/interactions/domains/force_delete_lift/base.rb
@@ -19,8 +19,17 @@ module Domains
 
       def force_delete_condition(domain)
         domain.force_delete_scheduled? &&
-          domain.template_name == 'invalid_email' &&
-          domain.contacts.all? { |contact| contact.email_verification.verified? } &&
+          template_of_invalid_email?(domain) &&
+          contact_emails_valid?(domain) &&
+          bounces_absent?(domain)
+      end
+
+      def template_of_invalid_email?(domain)
+        domain.template_name == 'invalid_email'
+      end
+
+      def contact_emails_valid?(domain)
+        domain.contacts.all? { |contact| contact.email_verification.verified? } &&
           domain.registrant.email_verification.verified?
       end
 
@@ -28,6 +37,11 @@ module Domains
         domain.registrant.email_verification.verify
         domain.contacts.each { |contact| contact.email_verification.verify }
       end
+
+      def bounces_absent?(domain)
+        emails = domain.all_related_emails
+        BouncedMailAddress.where(email: emails).empty?
+      end
     end
   end
 end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 3deaf594b..91b91584f 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -668,6 +668,10 @@ class Domain < ApplicationRecord
     end
   end
 
+  def all_related_emails
+    (admin_contacts.emails +  tech_contacts.emails + [registrant.email]).uniq
+  end
+
   def force_delete_contact_emails
     (primary_contact_emails + tech_contacts.pluck(:email) +
       ["info@#{name}", "#{prepared_domain_name}@#{name}"]).uniq
diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
index ca9f3b24f..de28962ec 100644
--- a/test/models/domain/force_delete_test.rb
+++ b/test/models/domain/force_delete_test.rb
@@ -410,6 +410,32 @@ class ForceDeleteTest < ActionMailer::TestCase
     @domain.reload
     assert_not @domain.force_delete_scheduled?
   end
+  def test_lifts_force_delete_after_bounce_changes
+    @domain.update(valid_to: Time.zone.parse('2012-08-05'))
+    assert_not @domain.force_delete_scheduled?
+    travel_to Time.zone.parse('2010-07-05')
+    email = @domain.registrant.email
+    asserted_text = "Invalid email: #{email}"
+
+    prepare_bounced_email_address(email)
+
+    @domain.reload
+
+    assert @domain.force_delete_scheduled?
+    assert_equal 'invalid_email', @domain.template_name
+    assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date
+    assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
+    notification = @domain.registrar.notifications.last
+    assert notification.text.include? asserted_text
+
+    @domain.registrant.update(email: 'aaa@bbb.com')
+    @domain.registrant.email_verification.verify
+    assert_not @domain.registrant.email_verification_failed?
+    CheckForceDeleteLift.perform_now
+
+    @domain.reload
+    assert_not @domain.force_delete_scheduled?
+  end
 
   def prepare_bounced_email_address(email)
     @bounced_mail = BouncedMailAddress.new