From c29a35fffb0721fab0ebc7f9ff2163376896f91a Mon Sep 17 00:00:00 2001
From: olegphenomenon <oleg.hasjanov@eestiinternet.ee>
Date: Fri, 5 Nov 2021 12:09:04 +0200
Subject: [PATCH] updated emails

---
 app/jobs/verify_emails_job.rb               |  3 +-
 lib/tasks/verify_email.rake                 |  5 +++
 test/tasks/emails/verify_email_task_test.rb | 39 +++++++++++++++++----
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb
index 709eefa36..af1974b67 100644
--- a/app/jobs/verify_emails_job.rb
+++ b/app/jobs/verify_emails_job.rb
@@ -24,7 +24,8 @@ class VerifyEmailsJob < ApplicationJob
     contact = Contact.find(contact_id)
     contact_ids = Contact.where(email: contact.email).where('created_at > ?', time).pluck(:id)
 
-    r = ValidationEvent.where(validation_eventable_id: contact_ids)
+    r = ValidationEvent.where(validation_eventable_id: contact_ids).order(created_at: :desc)
+    # return false if r[0].success == false
 
     r.present?
   end
diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake
index b2b97b198..a9655c1a8 100644
--- a/lib/tasks/verify_email.rake
+++ b/lib/tasks/verify_email.rake
@@ -57,10 +57,15 @@ def prepare_contacts(options)
     time = Time.zone.now - ValidationEvent::VALIDATION_PERIOD
     validation_events_ids = ValidationEvent.where('created_at > ?', time).pluck(:validation_eventable_id)
 
+    # Contact.where.not(id: validation_events_ids) + Contact.where(id: failed_contacts)
     Contact.where.not(id: validation_events_ids)
   end
 end
 
+def failed_contacts
+  ValidationEvent.failed.pluck(:id)
+end
+
 def contacts_by_domain(domain_name)
   domain = ::Domain.find_by(name: domain_name)
   return unless domain
diff --git a/test/tasks/emails/verify_email_task_test.rb b/test/tasks/emails/verify_email_task_test.rb
index 1737d939c..3113bcb38 100644
--- a/test/tasks/emails/verify_email_task_test.rb
+++ b/test/tasks/emails/verify_email_task_test.rb
@@ -31,20 +31,29 @@ class VerifyEmailTaskTest < ActiveJob::TestCase
     [domain(@invalid_contact.email)].reject(&:blank?)
   end
 
+  def test_should_be_verified_duplicate_emails
+    william = Contact.where(email: "william@inbox.test").count
+
+    assert_equal william, 2
+    assert_equal Contact.all.count, 9
+    run_task
+    assert_equal ValidationEvent.count, Contact.count - 1
+  end
+
   def test_should_not_affect_to_successfully_verified_emails
     assert_equal ValidationEvent.count, 0
     run_task
-    assert_equal ValidationEvent.count, Contact.count
+    assert_equal ValidationEvent.count, Contact.count - 1 # Contact has duplicate email and it is skip
 
     run_task
-    assert_equal ValidationEvent.count, Contact.count
+    assert_equal ValidationEvent.count, Contact.count - 1
   end
 
   def test_should_verify_contact_which_was_not_verified
     bestnames = registrars(:bestnames)
     assert_equal ValidationEvent.count, 0
     run_task
-    assert_equal ValidationEvent.count, Contact.count
+    assert_equal ValidationEvent.count, Contact.count - 1 # Contact has duplicate email and it is skip
 
     assert_equal Contact.count, 9
     c = Contact.create(name: 'Jeembo',
@@ -58,22 +67,40 @@ class VerifyEmailTaskTest < ActiveJob::TestCase
 
     assert_equal Contact.count, 10
     run_task
-    assert_equal ValidationEvent.count, Contact.count
+    assert_equal ValidationEvent.count, Contact.count - 1
   end
 
+  # def test_should_verify_again_contact_which_has_faield_verification
+  #   expired_date = Time.now - ValidationEvent::VALIDATION_PERIOD - 1.day
+  #
+  #   assert_equal ValidationEvent.count, 0
+  #   run_task
+  #   assert_equal Contact.count, 9
+  #   assert_equal ValidationEvent.count, 8 # Contact has duplicate email and it is skip
+  #
+  #   contact = contacts(:john)
+  #   v = ValidationEvent.find_by(validation_eventable_id: contact.id)
+  #   v.update!(success: false)
+  #
+  #   run_task
+  #   binding.pry
+  #   assert_equal ValidationEvent.all.count, 9
+  # end
+
   def test_should_verify_contact_which_has_expired_date_of_verification
     expired_date = Time.now - ValidationEvent::VALIDATION_PERIOD - 1.day
 
     assert_equal ValidationEvent.count, 0
     run_task
-    assert_equal ValidationEvent.count, Contact.count
+    assert_equal Contact.count, 9
+    assert_equal ValidationEvent.count, 8 # Contact has duplicate email and it is skip
 
     contact = contacts(:john)
     v = ValidationEvent.find_by(validation_eventable_id: contact.id)
     v.update!(created_at: expired_date)
 
     run_task
-    assert_equal ValidationEvent.count, Contact.count + 1
+    assert_equal ValidationEvent.all.count, 9
   end
 
   def test_tasks_verifies_emails