diff --git a/app/interactions/actions/email_check.rb b/app/interactions/actions/email_check.rb index 27d2315a6..9c6dbfe88 100644 --- a/app/interactions/actions/email_check.rb +++ b/app/interactions/actions/email_check.rb @@ -62,8 +62,7 @@ module Actions output_a_and_aaaa_validation_results(email: @email, result: result_validation, type: 'AAAA') - - result_validation.present? ? result.success = true : result.success = false + result.success = result_validation.present? end contacts.find_in_batches(batch_size: 500) do |contact_batches| diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb index 9582cce40..7274fcad4 100644 --- a/app/jobs/verify_emails_job.rb +++ b/app/jobs/verify_emails_job.rb @@ -48,12 +48,6 @@ class VerifyEmailsJob < ApplicationJob data = contact.validation_events.order(created_at: :asc).last return true if data.successful? && data.created_at < (Time.zone.now - ValidationEvent::VALIDATION_PERIOD) - if data.failed? - return false if data.event_data['check_level'] == 'regex' - - return true - end - - false + !(data.failed? && data.event_data['check_level'] == 'regex') end end