From 8fffe6e73661c840817a6493778af4b7afb97a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Tue, 22 Dec 2020 19:05:06 +0200
Subject: [PATCH] Fix tech contact / bulk transfer notifications

---
 .../registrar/domain_transfers_controller.rb    |  6 ++++--
 .../registrar/tech_contacts_controller.rb       |  4 ++--
 app/models/tech_domain_contact.rb               | 17 +++++++++--------
 .../bulk_change/_tech_contact_form.html.erb     |  2 +-
 .../locales/registrar/domain_transfers.en.yml   |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/controllers/registrar/domain_transfers_controller.rb b/app/controllers/registrar/domain_transfers_controller.rb
index ca08c73cf..03874adb5 100644
--- a/app/controllers/registrar/domain_transfers_controller.rb
+++ b/app/controllers/registrar/domain_transfers_controller.rb
@@ -55,10 +55,12 @@ class Registrar
         parsed_response = JSON.parse(response.body, symbolize_names: true)
 
         if response.code == '200'
-          flash[:notice] = t '.transferred', count: parsed_response[:data].size
+          failed = parsed_response[:data][:failed].each(&:domain_name).join(', ')
+          flash[:notice] = t('.transferred', success: parsed_response[:data][:success].size,
+                                             failed: failed)
           redirect_to registrar_domains_url
         else
-          @api_errors = parsed_response[:errors]
+          @api_errors = parsed_response[:message]
           render file: 'registrar/bulk_change/new', locals: { active_tab: :bulk_transfer }
         end
       else
diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb
index ba15c5516..057d01857 100644
--- a/app/controllers/registrar/tech_contacts_controller.rb
+++ b/app/controllers/registrar/tech_contacts_controller.rb
@@ -49,10 +49,10 @@ class Registrar
           notices << "#{t('.skipped_domains')}: #{parsed_response[:data][:skipped_domains].join(', ')}"
         end
 
-        flash[:notice] = notices
+        flash[:notice] = notices.join(', ')
         redirect_to registrar_domains_url
       else
-        @error = parsed_response[:message]
+        @error = response.code == '404' ? 'Contact(s) not found' : parsed_response[:message]
         render file: 'registrar/bulk_change/new', locals: { active_tab: :technical_contact }
       end
     end
diff --git a/app/models/tech_domain_contact.rb b/app/models/tech_domain_contact.rb
index 04f36c4e4..92799061c 100644
--- a/app/models/tech_domain_contact.rb
+++ b/app/models/tech_domain_contact.rb
@@ -5,19 +5,20 @@ class TechDomainContact < DomainContact
     skipped_domains = []
     tech_contacts = where(contact: current_contact)
 
-    transaction do
-      tech_contacts.each do |tech_contact|
-        if tech_contact.domain.discarded?
-          skipped_domains << tech_contact.domain.name
-          next
-        end
-
+    tech_contacts.each do |tech_contact|
+      if tech_contact.domain.discarded?
+        skipped_domains << tech_contact.domain.name
+        next
+      end
+      begin
         tech_contact.contact = new_contact
         tech_contact.save!
         affected_domains << tech_contact.domain.name
+      rescue ActiveRecord::RecordNotUnique
+        skipped_domains << tech_contact.domain.name
       end
     end
 
-    return affected_domains.sort, skipped_domains.sort
+    [affected_domains.sort, skipped_domains.sort]
   end
 end
diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb
index dc0693599..2848e3634 100644
--- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb
+++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb
@@ -1,7 +1,7 @@
 <%= form_tag registrar_tech_contacts_path, method: :patch, class: 'form-horizontal' do %>
     <% if @error %>
         <div class="alert alert-danger">
-            <%= @error[:message] %>
+            <%= @error %>
         </div>
     <% end %>
 
diff --git a/config/locales/registrar/domain_transfers.en.yml b/config/locales/registrar/domain_transfers.en.yml
index c146a5fd1..fd39e54f7 100644
--- a/config/locales/registrar/domain_transfers.en.yml
+++ b/config/locales/registrar/domain_transfers.en.yml
@@ -6,7 +6,7 @@ en:
 
       create:
         header: Domain transfer
-        transferred: "%{count} domains have been successfully transferred"
+        transferred: "%{count} domains have been successfully transferred. Failed domains: %{failed}"
 
       form:
         submit_btn: Transfer