From 2c37e30923a6f4c73c9556bad29a99a5bd2dd744 Mon Sep 17 00:00:00 2001
From: Oleg Hasjanov <oleg.phenomenon@gmail.com>
Date: Mon, 17 May 2021 13:35:15 +0300
Subject: [PATCH] changed method for add additional mails in status notes

---
 .../clear_force_delete_data.rb                 |  2 +-
 .../domains/force_delete_email/base.rb         | 18 +++++++++++++++++-
 .../registrar/contacts/form/_address.haml      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

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 1e6bcccd9..8fe6dfbb4 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,7 +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.status_notes[DomainStatus::FORCE_DELETE] = ''
         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 f2ac9b5f2..49976a3f1 100644
--- a/app/interactions/domains/force_delete_email/base.rb
+++ b/app/interactions/domains/force_delete_email/base.rb
@@ -11,7 +11,13 @@ module Domains
         domains = domain_contacts.map(&:domain).flatten +
                   Domain.where(registrant_id: registrant_ids)
 
-        domains.each { |domain| process_force_delete(domain) unless domain.force_delete_scheduled? }
+        domains.each do |domain| 
+          if domain.force_delete_scheduled?
+            added_additional_email_into_notes(domain)
+          else
+            process_force_delete(domain)
+          end
+        end
       end
 
       private
@@ -24,7 +30,17 @@ module Domains
         save_status_note(domain)
       end
 
+      def added_additional_email_into_notes(domain)
+        if !domain.status_notes[DomainStatus::FORCE_DELETE].include? email
+          domain.status_notes[DomainStatus::FORCE_DELETE].concat(" " + email)
+          domain.save(validate: false)
+        end
+      end
+
       def save_status_note(domain)
+        # puts "Is blank? #{domain.status_notes[DomainStatus::FORCE_DELETE].blank?}" -> true
+        # puts "Is nil? #{domain.status_notes[DomainStatus::FORCE_DELETE].nil?}" -> true
+        # puts "Is present? #{domain.status_notes[DomainStatus::FORCE_DELETE].present?}" -> false
         domain.status_notes[DomainStatus::FORCE_DELETE] = email
         domain.save(validate: false)
       end
diff --git a/app/views/registrar/contacts/form/_address.haml b/app/views/registrar/contacts/form/_address.haml
index 7789c2891..e70d00cd8 100644
--- a/app/views/registrar/contacts/form/_address.haml
+++ b/app/views/registrar/contacts/form/_address.haml
@@ -31,6 +31,6 @@
         = f.label :country_code, t(:country) + '*'
       .col-md-7
         - country_selected = f.object.persisted? ? f.object.country_code : 'EE'
-        = f.select(:country_code, SApplicationController.helpers.all_country_options(country_selected),
+        = f.select(:country_code, ApplicationController.helpers.all_country_options(country_selected),
           { include_blank: true }, required: true)