Merge pull request #2647 from internetee/change-count-of-validation-contacts

changed count of contact validations

app/controllers/api/v1/registrant/contacts_controller.rb

@@ -145,7 +145,7 @@ module Api
           contact.transaction do
             contact.save!
 
-            contact.validate_email_by_regex_and_mx
+            contact.validate_email_by_regex_and_mx(single_email: true)
             contact.remove_force_delete_for_valid_contact
 
             action = current_registrant_user.actions.create!(contact: contact, operation: :update)

app/interactions/actions/contact_create.rb

@@ -1,11 +1,12 @@
 module Actions
   class ContactCreate
-    attr_reader :contact, :legal_document, :ident
+    attr_reader :contact, :legal_document, :ident, :result
 
     def initialize(contact, legal_document, ident)
       @contact = contact
       @legal_document = legal_document
       @ident = ident
+      @result = nil
     end
 
     def call
@@ -14,19 +15,15 @@ module Actions
       validate_ident
       maybe_change_email
       commit
+      validate_contact
     end
 
     def maybe_change_email
       return if Rails.env.test?
 
       %i[regex mx].each do |m|
-        result = Actions::SimpleMailValidator.run(email: contact.email, level: m)
+        @result = Actions::SimpleMailValidator.run(email: contact.email, level: m)
-        if result
+        next if @result
-          @contact.validate_email_by_regex_and_mx
-          @contact.remove_force_delete_for_valid_contact
-
-          next
-        end
 
         err_text = "email '#{contact.email}' didn't pass validation"
         contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}")
@@ -92,5 +89,13 @@ module Actions
       contact.email_history = contact.email
       contact.save
     end
+
+    def validate_contact
+      return if @error || !contact.valid?
+
+      [:regex, :mx].each do |m|
+        contact.verify_email(check_level: m, single_email: true)
+      end
+    end
   end
 end

app/interactions/actions/contact_update.rb

@@ -18,6 +18,7 @@ module Actions
       maybe_change_email if new_attributes[:email].present?
       maybe_filtering_old_failed_records
       commit
+      validate_contact
     end
 
     def maybe_change_email
@@ -25,12 +26,7 @@ module Actions
 
       %i[regex mx].each do |m|
         result = Actions::SimpleMailValidator.run(email: @new_attributes[:email], level: m)
-        if result
+        next if result
-          @contact.validate_email_by_regex_and_mx
-          @contact.remove_force_delete_for_valid_contact
-
-          next
-        end
 
         err_text = "email '#{new_attributes[:email]}' didn't pass validation"
         contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}")
@@ -128,5 +124,15 @@ module Actions
 
       updated
     end
+
+    def validate_contact
+      return if @error || !contact.valid?
+
+      [:regex, :mx].each do |m|
+        @contact.verify_email(check_level: m, single_email: true)
+      end
+
+      @contact.remove_force_delete_for_valid_contact
+    end
   end
 end

app/interactions/actions/email_check.rb

@@ -1,18 +1,19 @@
 module Actions
   class EmailCheck
-    attr_reader :email, :validation_eventable, :check_level
+    attr_reader :email, :validation_eventable, :check_level, :single_email
 
     SAVE_RESULTS_BATCH_SIZE = 500
 
-    def initialize(email:, validation_eventable:, check_level: nil)
+    def initialize(email:, validation_eventable:, single_email: false, check_level: nil)
       @email = email
       @validation_eventable = validation_eventable
       @check_level = check_level || :mx
+      @single_email = single_email
     end
 
     def call
       result = check_email(email)
-      save_result(result)
+      single_email ?  save_single_result(validation_eventable: validation_eventable, result: result) : save_result(result)
       handle_logging(result)
       result.success
     end
@@ -48,6 +49,15 @@ module Actions
       contact.validation_events.destroy_all if success
     end
 
+    def save_single_result(validation_eventable:, result:)
+      handle_mx_validation(result) if !result.success && @check_level == 'mx'
+      result.configuration = nil
+
+      handle_saving_result(validation_eventable, result)
+    rescue ActiveRecord::RecordNotSaved
+      logger.info "Cannot save validation result for #{log_object_id}" and return true
+    end
+
     def save_result(result)
       contacts = Contact.where(email: email)
 

app/jobs/verify_emails_job.rb

@@ -1,7 +1,7 @@
 class VerifyEmailsJob < ApplicationJob
   discard_on StandardError
 
-  def perform(email:, check_level: 'mx')
+  def perform(email:, check_level: 'mx', single_check: false)
     contact = Contact.find_by(email: email)
 
     return logger.info "Contact #{email} not found!" if contact.nil?
@@ -11,7 +11,7 @@ class VerifyEmailsJob < ApplicationJob
     validate_check_level(check_level)
 
     logger.info "Trying to verify contact email #{email} with check_level #{check_level}"
-    contact.verify_email(check_level: check_level)
+    contact.verify_email(check_level: check_level, single_email: single_check)
   rescue StandardError => e
     handle_error(e)
   end

app/models/concerns/email_verifable.rb

@@ -5,17 +5,15 @@ module EmailVerifable
     scope :recently_not_validated, -> { where.not(id: ValidationEvent.validated_ids_by(name)) }
   end
 
-  def validate_email_by_regex_and_mx
+  def validate_email_by_regex_and_mx(single_email: false)
-    # return if Rails.env.test?
+    verify_email(check_level: 'regex', single_email: single_email)
-
+    verify_email(check_level: 'mx', single_email: single_email)
-    verify_email(check_level: 'regex')
-    verify_email(check_level: 'mx')
   end
 
   def remove_force_delete_for_valid_contact
-    # return if Rails.env.test?
+    domain_with_fd = domains.select(&:force_delete_scheduled?)
 
-    domains.each do |domain|
+    domain_with_fd.each do |domain|
       contact_emails_valid?(domain) ? domain.cancel_force_delete : nil
     end
   end
@@ -68,14 +66,15 @@ module EmailVerifable
     process_error(:billing_email) unless result
   end
 
-  def verify_email(check_level: 'regex')
+  def verify_email(check_level: 'regex', single_email: false)
-    verify(email: email, check_level: check_level)
+    verify(email: email, check_level: check_level, single_email: single_email)
   end
 
-  def verify(email:, check_level: 'regex')
+  def verify(email:, check_level: 'regex', single_email: false)
     action = Actions::EmailCheck.new(email: email,
                                      validation_eventable: self,
-                                     check_level: check_level)
+                                     check_level: check_level,
+                                     single_email: single_email)
     action.call
   end
 

lib/tasks/verify_domain.rake

@@ -0,0 +1,29 @@
+require 'optparse'
+require 'rake_option_parser_boilerplate'
+require 'syslog/logger'
+require 'active_record'
+
+SPAM_PROTECT_TIMEOUT = 30.seconds
+
+task verify_domain: :environment do
+  options = {
+    domain_name: nil,
+    check_level: 'mx',
+    spam_protect: false,
+  }
+  banner = 'Usage: rake verify_domain -- [options]'
+  options = RakeOptionParserBoilerplate.process_args(options: options,
+                                                     banner: banner,
+                                                     hash: opts_hash)
+
+  
+  domain = Domain.find_by(name: options[:domain_name])
+  check_level = options[:check_level]
+
+  domain.domain_contacts.each do |dc|
+    dc.contact.verify_email(check_level: check_level, single_email: true)
+
+    Rails.logger.info "Validated contact with code #{dc.contact.code} and email #{dc.contact.email} of #{domain.name} domain"
+    Rails.logger.info "Result - #{dc.contact.validation_events.last.success}"
+  end
+end

test/models/contact_test.rb

@@ -375,6 +375,59 @@ class ContactTest < ActiveJob::TestCase
   #   assert_not @contact.domains.first.force_delete_scheduled?
   # end
 
+  def test_should_be_validated_only_one_contact_with_same_email
+    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])
+
+    contact_1 = contacts(:john)
+    contact_2 = contacts(:william)
+
+    assert_equal contact_1.validation_events.count, 0
+    assert_equal contact_2.validation_events.count, 0
+
+    contact_1.email = 'test@example.com' && contact_1.save! && contact_1.reload
+    contact_2.email = 'test@example.com' && contact_2.save! && contact_2.reload
+
+    contact_1.validate_email_by_regex_and_mx(single_email: true)
+
+    contact_1.reload && contact_2.reload
+
+    assert_equal contact_1.validation_events.count, 1
+    assert_equal contact_2.validation_events.count, 0
+  end
+
+  def test_should_be_validated_serial_contacts_with_same_email
+    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])
+
+    contact_1 = contacts(:john)
+    contact_2 = contacts(:william)
+
+    assert_equal contact_1.validation_events.count, 0
+    assert_equal contact_2.validation_events.count, 0
+
+    contact_1.update_attribute(:email, 'tester@example.com')
+    contact_2.update_attribute(:email, 'tester@example.com')
+    contact_1.reload && contact_2.reload
+
+    contact_1.validate_email_by_regex_and_mx(single_email: false)
+
+    contact_1.reload && contact_2.reload
+
+    assert_equal contact_1.validation_events.count, 1
+    assert_equal contact_2.validation_events.count, 1
+  end
+
   private
 
   def make_contact_free_of_domains_where_it_acts_as_a_registrant(contact)