diff --git a/app/jobs/validation_event_check_force_delete_job.rb b/app/jobs/validation_event_check_force_delete_job.rb new file mode 100644 index 000000000..3a0ee561b --- /dev/null +++ b/app/jobs/validation_event_check_force_delete_job.rb @@ -0,0 +1,13 @@ +class ValidationEventCheckForceDeleteJob < ApplicationJob + def perform(event_id, contact_id) + event = ValidationEvent.find(event_id) + contact = Contact.find(contact_id) + + if contact.need_to_start_force_delete? + event.start_force_delete + elsif contact.need_to_lift_force_delete? + event.refresh_status_notes + event.lift_force_delete + end + end +end diff --git a/app/models/validation_event.rb b/app/models/validation_event.rb index 53a76e049..121c0e805 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) @@ -59,12 +59,7 @@ class ValidationEvent < ApplicationRecord end def check_for_force_delete - if object.need_to_start_force_delete? - start_force_delete - elsif object.need_to_lift_force_delete? - refresh_status_notes - lift_force_delete - end + ValidationEventCheckForceDeleteJob.perform_later(id, object.id) end def start_force_delete @@ -99,14 +94,12 @@ 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 + domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten + registrant_domains = Domain.where(registrant_id: Registrant.where(email: email).pluck(:id)) + domains = domain_contacts.map(&:domain).flatten + registrant_domains + + domains.each do |domain| + Domains::ForceDeleteLift::Base.run(domain: domain) + end end end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 799ac8169..f0dcb1007 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'))