From 95f4e7858b0b6bd569ff44a936ca7442710065c1 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Tue, 30 Nov 2021 10:13:52 +0200 Subject: [PATCH] remove default value --- app/interactions/actions/email_check.rb | 2 +- app/jobs/verify_emails_job.rb | 2 +- app/models/validation_event.rb | 9 --------- lib/tasks/verify_email.rake | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/interactions/actions/email_check.rb b/app/interactions/actions/email_check.rb index d336f314a..8f0c940ce 100644 --- a/app/interactions/actions/email_check.rb +++ b/app/interactions/actions/email_check.rb @@ -5,7 +5,7 @@ module Actions def initialize(email:, validation_eventable:, check_level: nil) @email = email @validation_eventable = validation_eventable - @check_level = check_level || :regex + @check_level = check_level || :mx end def call diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb index 810ace370..4b9b98fb7 100644 --- a/app/jobs/verify_emails_job.rb +++ b/app/jobs/verify_emails_job.rb @@ -1,7 +1,7 @@ class VerifyEmailsJob < ApplicationJob discard_on StandardError - def perform(contact:, check_level: 'regex') + def perform(contact:, check_level: 'mx') contact_not_found(contact.id) unless contact validate_check_level(check_level) action = Actions::EmailCheck.new(email: contact.email, diff --git a/app/models/validation_event.rb b/app/models/validation_event.rb index 8f1fbba21..1dce1c1b1 100644 --- a/app/models/validation_event.rb +++ b/app/models/validation_event.rb @@ -71,14 +71,5 @@ class ValidationEvent < ApplicationRecord end def lift_force_delete - domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten - registrant_ids = Registrant.where(email: email).pluck(:id) - - domains = domain_contacts.map(&:domain).flatten + - Domain.where(registrant_id: registrant_ids) - - domains.each do |domain| - Domains::ForceDeleteLift::Base.run(domain: domain) - end end end diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake index 209e19176..9712ec77e 100644 --- a/lib/tasks/verify_email.rake +++ b/lib/tasks/verify_email.rake @@ -11,7 +11,7 @@ namespace :verify_email do SPAM_PROTECT_TIMEOUT = 30.seconds options = { domain_name: nil, - check_level: 'regex', + check_level: 'mx', spam_protect: false, } banner = 'Usage: rake verify_email:check_all -- [options]'