Merge pull request #2344 from internetee/fix-fd-poll-message-after-va…

…lidation fix poll message spam after validation email
internetee · Apr 18, 2022 · 253da80 · 253da80
2 parents fd9b71d + e320a7c
commit 253da80
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/app/interactions/domains/force_delete/notify_registrar.rb b/app/interactions/domains/force_delete/notify_registrar.rb
@@ -6,18 +6,26 @@ def execute
       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))
+        template = I18n.t('force_delete_set_on_domain',
+                          domain_name: domain.name,
+                          outzone_date: domain.outzone_date,
+                          purge_date: domain.purge_date)
+
+        return if domain.registrar.notifications.last.text.include? template
+
+        domain.registrar.notifications.create!(text: template)
       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))
+        template = I18n.t('force_delete_auto_email',
+                          domain_name: domain.name,
+                          outzone_date: domain.outzone_date,
+                          purge_date: domain.purge_date,
+                          email: email)
+
+        return if domain.registrar.notifications.last.text.include? template
+
+        domain.registrar.notifications.create!(text: template)
       end
     end
   end

diff --git a/app/interactions/domains/force_delete_email/base.rb b/app/interactions/domains/force_delete_email/base.rb
@@ -31,18 +31,21 @@ def expired_or_hold_domains_exists?(domains)
       def before_execute_force_delete(domain)
         if domain.force_delete_scheduled? && !domain.status_notes[DomainStatus::FORCE_DELETE].nil?
           added_additional_email_into_notes(domain)
-          notify_registrar(domain)
         else
           process_force_delete(domain)
         end
       end
 
       def notify_registrar(domain)
-        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: domain.status_notes[DomainStatus::FORCE_DELETE]))
+        template = I18n.t('force_delete_auto_email',
+                          domain_name: domain.name,
+                          outzone_date: domain.outzone_date,
+                          purge_date: domain.purge_date,
+                          email: domain.status_notes[DomainStatus::FORCE_DELETE])
+
+        return if domain.registrar.notifications.last.text.include? template
+
+        domain.registrar.notifications.create!(text: template)
       end
 
       def process_force_delete(domain)
@@ -56,6 +59,8 @@ def process_force_delete(domain)
       def added_additional_email_into_notes(domain)
         return if domain.status_notes[DomainStatus::FORCE_DELETE].include? email
 
+        # notify_registrar(domain)
+
         domain.status_notes[DomainStatus::FORCE_DELETE].concat(" #{email}")
         domain.save(validate: false)
       end

diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
@@ -432,7 +432,7 @@ def test_add_invalid_email_to_domain_status_notes
 
     assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails
     notification = domain.registrar.notifications.last
-    assert notification.text.include? asserted_text
+    assert_not notification.text.include? asserted_text
   end
 
   def test_remove_invalid_email_from_domain_status_notes