Add notification on autoFD

app/interactions/domains/force_delete/base.rb

@@ -13,6 +13,9 @@ module Domains
       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

app/interactions/domains/force_delete/notify_registrar.rb

@@ -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

app/interactions/domains/force_delete_email/base.rb

@@ -11,12 +11,16 @@ module Domains
         domains = domain_contacts.map(&:domain).flatten +
                   Domain.where(registrant_id: registrant_ids)
 
-        domains.each do |domain|
+        domains.each { |domain| process_force_delete(domain) unless domain.force_delete_scheduled? }
-          next if domain.force_delete_scheduled?
+      end
 
-          domain.schedule_force_delete(type: :soft,
+      private
-                                       notify_by_email: true, reason: 'invalid_email')
+
-        end
+      def process_force_delete(domain)
+        domain.schedule_force_delete(type: :soft,
+                                     notify_by_email: true,
+                                     reason: 'invalid_email',
+                                     email: email)
       end
     end
   end

app/models/concerns/domain/force_delete.rb

@@ -45,9 +45,9 @@ module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
     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

config/locales/en.yml

@@ -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'

test/models/domain/force_delete_test.rb

@@ -325,8 +325,10 @@ class ForceDeleteTest < ActionMailer::TestCase
     @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
 
@@ -334,14 +336,18 @@ 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
+    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
 
@@ -349,17 +355,21 @@ 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
+    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@strangesentence@internet.ee'
+    asserted_text = "Invalid email: #{email}"
 
     Truemail.configure.default_validation_type = :regex
 
     contact = @domain.admin_contacts.first
-    contact.update_attribute(:email, 'some@strangesentence@internet.ee')
+    contact.update_attribute(:email, email)
     contact.email_verification.verify
 
     assert contact.email_verification_failed?
@@ -370,6 +380,8 @@ 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
+    notification = @domain.registrar.notifications.last
+    assert notification.text.include? asserted_text
   end
 
   def prepare_bounced_email_address(email)