Skip to content

Commit

Permalink
Add notification on autoFD
Browse files Browse the repository at this point in the history
  • Loading branch information
yulgolem committed Mar 22, 2021
1 parent 81c21db commit aa34959
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 6 deletions.
3 changes: 3 additions & 0 deletions app/interactions/domains/force_delete/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ class Base < ActiveInteraction::Base
string :reason,
default: nil,
description: 'Which mail template to use explicitly'
string :email,
default: nil,
description: 'Possible invalid email to notify on'

validates :type, inclusion: { in: %i[fast_track soft] }
end
Expand Down
12 changes: 12 additions & 0 deletions app/interactions/domains/force_delete/notify_registrar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@ module Domains
module ForceDelete
class NotifyRegistrar < Base
def execute
email.present? ? notify_with_email : notify_without_email
end

def notify_without_email
domain.registrar.notifications.create!(text: I18n.t('force_delete_set_on_domain',
domain_name: domain.name,
outzone_date: domain.outzone_date,
purge_date: domain.purge_date))
end

def notify_with_email
domain.registrar.notifications.create!(text: I18n.t('force_delete_auto_email',
domain_name: domain.name,
outzone_date: domain.outzone_date,
purge_date: domain.purge_date,
email: email))
end
end
end
end
4 changes: 3 additions & 1 deletion app/interactions/domains/force_delete_email/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ def execute
next if domain.force_delete_scheduled?

domain.schedule_force_delete(type: :soft,
notify_by_email: true, reason: 'invalid_email')
notify_by_email: true,
reason: 'invalid_email',
email: email)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions app/models/concerns/domain/force_delete.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def force_delete_scheduled?
statuses.include?(DomainStatus::FORCE_DELETE)
end

def schedule_force_delete(type: :fast_track, notify_by_email: false, reason: nil)
def schedule_force_delete(type: :fast_track, notify_by_email: false, reason: nil, email: nil)
Domains::ForceDelete::SetForceDelete.run(domain: self, type: type, reason: reason,
notify_by_email: notify_by_email)
notify_by_email: notify_by_email, email: email)
end

def cancel_force_delete
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ en:
created_at_until: 'Created at until'
is_registrant: 'Is registrant'
force_delete_set_on_domain: 'Force delete set on domain %{domain_name}. Outzone date: %{outzone_date}. Purge date: %{purge_date}'
force_delete_auto_email: 'Force delete set on domain %{domain_name}. Outzone date: %{outzone_date}. Purge date: %{purge_date}. Invalid email: %{email}'
grace_period_started_domain: 'For domain %{domain_name} started 45-days redemption grace period, ForceDelete will be in effect from %{date}'
force_delete_cancelled: 'Force delete is cancelled on domain %{domain_name}'
contact_is_not_valid: 'Contact %{value} is not valid, please fix the invalid contact'
Expand Down
18 changes: 15 additions & 3 deletions test/models/domain/force_delete_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -325,41 +325,51 @@ def test_schedules_force_delete_after_bounce
@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 = @domain.admin_contacts.first.email
asserted_text = "Invalid email: #{email}"

prepare_bounced_email_address(@domain.admin_contacts.first.email)
prepare_bounced_email_address(email)

@domain.reload

assert @domain.force_delete_scheduled?
assert_equal 'invalid_email', @domain.template_name
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
notification = @domain.registrar.notifications.last
assert notification.text.include? asserted_text
end

def test_schedules_force_delete_after_registrant_bounce
@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 = @domain.registrant.email
asserted_text = "Invalid email: #{email}"

prepare_bounced_email_address(@domain.registrant.email)
prepare_bounced_email_address(email)

@domain.reload

assert @domain.force_delete_scheduled?
assert_equal 'invalid_email', @domain.template_name
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
notification = @domain.registrar.notifications.last
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 = 'some@[email protected]'
asserted_text = "Invalid email: #{email}"

Truemail.configure.default_validation_type = :regex

contact = @domain.admin_contacts.first
contact.update_attribute(:email, 'some@[email protected]')
contact.update_attribute(:email, email)
contact.email_verification.verify

assert contact.email_verification_failed?
Expand All @@ -370,6 +380,8 @@ def test_schedules_force_delete_invalid_contact
assert_equal 'invalid_email', @domain.template_name
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
notification = @domain.registrar.notifications.last
assert notification.text.include? asserted_text
end

def prepare_bounced_email_address(email)
Expand Down

0 comments on commit aa34959

Please sign in to comment.