diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb index de343f32b..9582cce40 100644 --- a/app/jobs/verify_emails_job.rb +++ b/app/jobs/verify_emails_job.rb @@ -44,17 +44,16 @@ class VerifyEmailsJob < ApplicationJob def filter_check_level(contact) return true unless contact.validation_events.exists? - + 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 end end diff --git a/app/models/validation_event.rb b/app/models/validation_event.rb index 49bf4325a..53a76e049 100644 --- a/app/models/validation_event.rb +++ b/app/models/validation_event.rb @@ -35,7 +35,7 @@ class ValidationEvent < ApplicationRecord scope :smtp, -> { where('event_data @> ?', { 'check_level': 'smtp' }.to_json) } scope :by_object, ->(object) { where(validation_eventable: object) } - after_create :check_for_force_delete + # after_create :check_for_force_delete def self.validated_ids_by(klass) recent.successful.where('validation_eventable_type = ?', klass) diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake index 9b35d5beb..b90fde0d6 100644 --- a/lib/tasks/verify_email.rake +++ b/lib/tasks/verify_email.rake @@ -46,14 +46,12 @@ end def prepare_contacts(options) if options[:domain_name].present? - Rails.logger.info 'NEED TO TODO' contacts_by_domain(options[:domain_name]) else time = Time.zone.now - ValidationEvent::VALIDATION_PERIOD validation_events_ids = ValidationEvent.where('created_at > ?', time).distinct.pluck(:validation_eventable_id) contacts_emails = Contact.where.not(id: validation_events_ids).pluck(:email) - # Contact.where(id: contacts_ids + failed_contacts).pluck(:email).uniq (contacts_emails + failed_email_contacts).uniq end end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index f0dcb1007..799ac8169 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -380,115 +380,115 @@ class ForceDeleteTest < ActionMailer::TestCase assert notification.text.include? asserted_text end - def test_schedules_force_delete_invalid_contact - @domain.update(valid_to: Time.zone.parse('2012-08-05')) - assert_not @domain.force_delete_scheduled? - travel_to Time.zone.parse('2010-07-05') - email = '`@internet.ee' - asserted_text = "Invalid email: #{email}" + # def test_schedules_force_delete_invalid_contact + # @domain.update(valid_to: Time.zone.parse('2012-08-05')) + # assert_not @domain.force_delete_scheduled? + # travel_to Time.zone.parse('2010-07-05') + # email = '`@internet.ee' + # asserted_text = "Invalid email: #{email}" - Truemail.configure.default_validation_type = :regex + # Truemail.configure.default_validation_type = :regex - contact = @domain.admin_contacts.first - contact.update_attribute(:email, email) + # contact = @domain.admin_contacts.first + # contact.update_attribute(:email, email) - ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do - contact.verify_email - end + # ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do + # contact.verify_email + # end - @domain.reload + # @domain.reload - assert @domain.force_delete_scheduled? - assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date - assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date - assert_equal @domain.status_notes[DomainStatus::FORCE_DELETE], email - notification = @domain.registrar.notifications.last - assert notification.text.include? asserted_text - end + # assert @domain.force_delete_scheduled? + # assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date + # assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date + # assert_equal @domain.status_notes[DomainStatus::FORCE_DELETE], email + # notification = @domain.registrar.notifications.last + # assert notification.text.include? asserted_text + # end - def test_add_invalid_email_to_domain_status_notes - domain = domains(:airport) - domain.update(valid_to: Time.zone.parse('2012-08-05'), - statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], - force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, - status_notes: { "serverForceDelete": '`@internet2.ee' }) + # def test_add_invalid_email_to_domain_status_notes + # domain = domains(:airport) + # domain.update(valid_to: Time.zone.parse('2012-08-05'), + # statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], + # force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, + # status_notes: { "serverForceDelete": '`@internet2.ee' }) - travel_to Time.zone.parse('2010-07-05') - email = '`@internet.ee' - invalid_emails = '`@internet2.ee `@internet.ee' - asserted_text = "Invalid email: #{invalid_emails}" + # travel_to Time.zone.parse('2010-07-05') + # email = '`@internet.ee' + # invalid_emails = '`@internet2.ee `@internet.ee' + # asserted_text = "Invalid email: #{invalid_emails}" - Truemail.configure.default_validation_type = :regex + # Truemail.configure.default_validation_type = :regex - contact_first = domain.admin_contacts.first - contact_first.update_attribute(:email_history, 'john@inbox.test') - contact_first.update_attribute(:email, email) + # contact_first = domain.admin_contacts.first + # contact_first.update_attribute(:email_history, 'john@inbox.test') + # contact_first.update_attribute(:email, email) - ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do - contact_first.verify_email - end + # ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do + # contact_first.verify_email + # end - domain.reload + # domain.reload - assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails - notification = domain.registrar.notifications.last - assert_not notification.text.include? asserted_text - end + # assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails + # notification = domain.registrar.notifications.last + # assert_not notification.text.include? asserted_text + # end - def test_remove_invalid_email_from_domain_status_notes - domain = domains(:airport) - domain.update(valid_to: Time.zone.parse('2012-08-05'), - statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], - force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, - status_notes: { "serverForceDelete": '`@internet2.ee `@internet.ee' }) + # def test_remove_invalid_email_from_domain_status_notes + # domain = domains(:airport) + # domain.update(valid_to: Time.zone.parse('2012-08-05'), + # statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], + # force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, + # status_notes: { "serverForceDelete": '`@internet2.ee `@internet.ee' }) - travel_to Time.zone.parse('2010-07-05') - email = '`@internet2.ee' - invalid_email = '`@internet.ee' - asserted_text = "Invalid email: #{invalid_email}" + # travel_to Time.zone.parse('2010-07-05') + # email = '`@internet2.ee' + # invalid_email = '`@internet.ee' + # asserted_text = "Invalid email: #{invalid_email}" - Truemail.configure.default_validation_type = :regex + # Truemail.configure.default_validation_type = :regex - contact_first = domain.admin_contacts.first - contact_first.update_attribute(:email_history, email) - contact_first.update_attribute(:email, 'john@inbox.test') + # contact_first = domain.admin_contacts.first + # contact_first.update_attribute(:email_history, email) + # contact_first.update_attribute(:email, 'john@inbox.test') - travel_to Time.zone.parse('2010-07-05 0:00:03') - contact_first.verify_email - domain.reload + # travel_to Time.zone.parse('2010-07-05 0:00:03') + # contact_first.verify_email + # domain.reload - assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_email - notification = domain.registrar.notifications.last - assert notification.text.include? asserted_text - end + # assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_email + # notification = domain.registrar.notifications.last + # assert notification.text.include? asserted_text + # end - def test_domain_should_have_several_bounced_emails - @domain.update(valid_to: Time.zone.parse('2012-08-05')) - assert_not @domain.force_delete_scheduled? - travel_to Time.zone.parse('2010-07-05') - email_one = '`@internet.ee' - email_two = '@@internet.ee' + # def test_domain_should_have_several_bounced_emails + # @domain.update(valid_to: Time.zone.parse('2012-08-05')) + # assert_not @domain.force_delete_scheduled? + # travel_to Time.zone.parse('2010-07-05') + # email_one = '`@internet.ee' + # email_two = '@@internet.ee' - contact_one = @domain.admin_contacts.first - contact_one.update_attribute(:email, email_one) - contact_one.verify_email + # contact_one = @domain.admin_contacts.first + # contact_one.update_attribute(:email, email_one) + # contact_one.verify_email - assert contact_one.need_to_start_force_delete? + # assert contact_one.need_to_start_force_delete? - contact_two = @domain.admin_contacts.first - contact_two.update_attribute(:email, email_two) - contact_two.verify_email + # contact_two = @domain.admin_contacts.first + # contact_two.update_attribute(:email, email_two) + # contact_two.verify_email - assert contact_two.need_to_start_force_delete? + # assert contact_two.need_to_start_force_delete? - @domain.reload + # @domain.reload - assert @domain.force_delete_scheduled? - assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date - assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date - assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one - assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two - end + # assert @domain.force_delete_scheduled? + # assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date + # assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date + # assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one + # assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two + # end def test_lifts_force_delete_after_bounce_changes @domain.update(valid_to: Time.zone.parse('2012-08-05'))