diff --git a/app/interactions/domains/cancel_force_delete/clear_force_delete_data.rb b/app/interactions/domains/cancel_force_delete/clear_force_delete_data.rb index 066df04fd..1e6bcccd9 100644 --- a/app/interactions/domains/cancel_force_delete/clear_force_delete_data.rb +++ b/app/interactions/domains/cancel_force_delete/clear_force_delete_data.rb @@ -5,6 +5,7 @@ module Domains domain.force_delete_data = nil domain.force_delete_date = nil domain.force_delete_start = nil + domain.status_notes[DomainStatus::FORCE_DELETE] = nil domain.save(validate: false) end end diff --git a/app/interactions/domains/force_delete_email/base.rb b/app/interactions/domains/force_delete_email/base.rb index 40339691b..f2ac9b5f2 100644 --- a/app/interactions/domains/force_delete_email/base.rb +++ b/app/interactions/domains/force_delete_email/base.rb @@ -21,6 +21,12 @@ module Domains notify_by_email: true, reason: 'invalid_email', email: email) + save_status_note(domain) + end + + def save_status_note(domain) + domain.status_notes[DomainStatus::FORCE_DELETE] = email + domain.save(validate: false) end end end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 8eb45029b..8799f8449 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -403,6 +403,7 @@ class ForceDeleteTest < ActionMailer::TestCase 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 + assert_equal @domain.status_notes[DomainStatus::FORCE_DELETE], email notification = @domain.registrar.notifications.last assert notification.text.include? asserted_text end @@ -432,7 +433,9 @@ class ForceDeleteTest < ActionMailer::TestCase @domain.reload assert_not @domain.force_delete_scheduled? + assert_nil @domain.status_notes[DomainStatus::FORCE_DELETE] end + def test_lifts_force_delete_after_bounce_changes @domain.update(valid_to: Time.zone.parse('2012-08-05')) assert_not @domain.force_delete_scheduled?