Add forceDelete on email_verification failed

internetee · Mar 17, 2021 · c2d6158 · c2d6158
1 parent 97c295a
commit c2d6158
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/...tions/domains/force_delete_bounce/base.rb → ...ctions/domains/force_delete_email/base.rb b/...tions/domains/force_delete_bounce/base.rb → ...ctions/domains/force_delete_email/base.rb
@@ -1,15 +1,15 @@
 module Domains
-  module ForceDeleteBounce
+  module ForceDeleteEmail
     class Base < ActiveInteraction::Base
-      object :bounced_mail_address,
-             class: BouncedMailAddress,
+      string :email,
              description: 'Bounced email to set ForceDelete from'
 
       def execute
-        email = bounced_mail_address.email
         domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten
         domains = domain_contacts.map(&:domain).flatten
         domains.each do |domain|
+          next if domain.force_delete_scheduled?
+
           domain.schedule_force_delete(type: :soft,
                                        notify_by_email: true, reason: 'invalid_email')
         end

diff --git a/app/models/bounced_mail_address.rb b/app/models/bounced_mail_address.rb
@@ -45,6 +45,6 @@ def self.ses_configured?
   end
 
   def force_delete_from_bounce
-    Domains::ForceDeleteBounce::Base.run(bounced_mail_address: self)
+    Domains::ForceDeleteEmail::Base.run(email: email)
   end
 end
diff --git a/app/models/email_address_verification.rb b/app/models/email_address_verification.rb
@@ -1,5 +1,6 @@
 class EmailAddressVerification < ApplicationRecord
   RECENTLY_VERIFIED_PERIOD = 1.month
+  after_save :check_force_delete
 
   scope :not_verified_recently, lambda {
     where('verified_at IS NULL or verified_at < ?', verification_period)
@@ -40,6 +41,12 @@ def verified?
     success
   end
 
+  def check_force_delete
+    return unless failed?
+
+    Domains::ForceDeleteEmail::Base.run(email: email)
+  end
+
   def verify
     validation_request = Truemail.validate(email)
 

diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
@@ -344,10 +344,10 @@ def test_schedules_force_delete_invalid_contact
     Truemail.configure.default_validation_type = :regex
 
     contact = @domain.admin_contacts.first
-    contact.update(email: 'some@[email protected]')
+    contact.update_attribute(:email, 'some@[email protected]')
+    contact.email_verification.verify
 
     assert contact.email_verification_failed?
-    assert contact.invalid?
 
     @domain.reload