Merge pull request #2294 from internetee/2236-removing-old-validation…

…-events Removing expired records from the validations table
internetee · May 19, 2022 · c1ecdbc · c1ecdbc
2 parents a7d05e2 + de53f04
commit c1ecdbc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 28 deletions.
diff --git a/app/interactions/actions/email_check.rb b/app/interactions/actions/email_check.rb
@@ -48,14 +48,10 @@ def save_result(result)
 
       if !result.success && @check_level == 'mx'
         result_validation = Actions::AAndAaaaEmailValidation.call(email: @email, value: 'A')
-        output_a_and_aaaa_validation_results(email: @email,
-                                             result: result_validation,
-                                             type: 'A')
+        output_a_and_aaaa_validation_results(email: @email, result: result_validation, type: 'A')
 
         result_validation = Actions::AAndAaaaEmailValidation.call(email: @email, value: 'AAAA') if result_validation.empty?
-        output_a_and_aaaa_validation_results(email: @email,
-                                             result: result_validation,
-                                             type: 'AAAA')
+        output_a_and_aaaa_validation_results(email: @email, result: result_validation, type: 'AAAA')
         result.success = result_validation.present?
       end
 

diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb
@@ -20,10 +20,6 @@ def perform(email:, check_level: 'mx')
 
   private
 
-  def contact_not_found(contact_id)
-    raise StandardError, "Contact with contact_id #{contact_id} not found"
-  end
-
   def validate_check_level(check_level)
     return if valid_check_levels.include? check_level
 
@@ -38,10 +34,6 @@ def valid_check_levels
     ValidationEvent::VALID_CHECK_LEVELS
   end
 
-  def get_validation_results(contact)
-    ValidationEvent.where(created_at: Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)
-  end
-
   def filter_check_level(contact)
     return true unless contact.validation_events.exists?
 

diff --git a/app/models/validation_event.rb b/app/models/validation_event.rb
@@ -27,7 +27,7 @@ class ValidationEvent < ApplicationRecord
 
   belongs_to :validation_eventable, polymorphic: true
 
-  scope :recent, -> { where('created_at < ?', Time.zone.now - VALIDATION_PERIOD) }
+  scope :old_records, -> { where('created_at < ?', Time.zone.now - VALIDATION_PERIOD) }
   scope :successful, -> { where(success: true) }
   scope :failed, -> { where(success: false) }
   scope :regex, -> { where('event_data @> ?', { 'check_level': 'regex' }.to_json) }
@@ -36,8 +36,10 @@ class ValidationEvent < ApplicationRecord
   scope :by_object, ->(object) { where(validation_eventable: object) }
 
   def self.validated_ids_by(klass)
-    recent.successful.where('validation_eventable_type = ?', klass)
-          .pluck(:validation_eventable_id)
+    old_records
+      .successful
+      .where('validation_eventable_type = ?', klass)
+      .pluck(:validation_eventable_id)
   end
 
   def failed?

diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake
@@ -18,12 +18,11 @@ namespace :verify_email do
     options = RakeOptionParserBoilerplate.process_args(options: options,
                                                        banner: banner,
                                                        hash: opts_hash)
+    ValidationEvent.old_records.destroy_all
     email_contacts = prepare_contacts(options)
     email_contacts.each do |email|
-      VerifyEmailsJob.set(wait_until: spam_protect_timeout(options)).perform_later(
-        email: email,
-        check_level: check_level(options)
-      )
+      VerifyEmailsJob.set(wait_until: spam_protect_timeout(options))
+                     .perform_later(email: email, check_level: check_level(options))
     end
   end
 end
@@ -40,10 +39,6 @@ def spam_protect_timeout(options)
   spam_protect(options) ? 0.seconds : SPAM_PROTECT_TIMEOUT
 end
 
-def logger
-  @logger ||= ActiveSupport::TaggedLogging.new(Syslog::Logger.new('registry'))
-end
-
 def prepare_contacts(options)
   if options[:domain_name].present?
     contacts_by_domain(options[:domain_name])

diff --git a/test/tasks/emails/verify_email_task_test.rb b/test/tasks/emails/verify_email_task_test.rb
@@ -116,13 +116,32 @@ def test_fd_should_not_removed_if_change_email_to_another_invalid_one
                                      )
     Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
 
-    1.times do
-      run_task
-    end
+    run_task
 
     assert contact.domains.last.force_delete_scheduled?
   end
 
+  def test_should_remove_old_validation_records
+    trumail_results = OpenStruct.new(success: false,
+                                     email: @contact.email,
+                                     domain: 'box.tests',
+                                     errors: { mx: 'target host(s) not found' })
+
+    Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
+    Spy.on_instance_method(Actions::AAndAaaaEmailValidation, :call).and_return([true])
+
+    Actions::EmailCheck.new(email: @contact.email,
+                            validation_eventable: @contact,
+                            check_level: 'regex').call
+
+    travel_to(Time.zone.now + ::ValidationEvent::VALIDATION_PERIOD + 1.minute)
+    assert_equal ValidationEvent.old_records.count, 1
+
+    run_task
+
+    assert_predicate ValidationEvent.old_records.count, :zero?
+  end
+
   def run_task
     perform_enqueued_jobs do
       Rake::Task['verify_email:check_all'].execute