Merge pull request #1730 from internetee/442-forcedelete-notification-template-selection

Auto-select email template

app/controllers/admin/domains/force_delete_controller.rb

@@ -22,7 +22,7 @@ module Admin
           send_email
           domain.update(contact_notification_sent_date: Time.zone.today)
         else
-          domain.update(template_name: params[:template_name])
+          domain.update(template_name: domain.notification_template)
         end
       end
 
@@ -46,7 +46,7 @@ module Admin
         DomainDeleteMailer.forced(domain: domain,
                                   registrar: domain.registrar,
                                   registrant: domain.registrant,
-                                  template_name: params[:template_name]).deliver_now
+                                  template_name: domain.notification_template).deliver_now
       end
 
       def force_delete_type

app/models/concerns/domain/force_delete.rb

@@ -19,6 +19,10 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
     end
   end
 
+  def notification_template
+    registrant.org? ? 'legal_person' : 'private_person'
+  end
+
   def force_delete_scheduled?
     statuses.include?(DomainStatus::FORCE_DELETE)
   end

app/views/admin/domains/_force_delete_dialog.html.erb

@@ -33,12 +33,6 @@
                     </div>
                 </div>
 
-                <div class="form-group email-template-row">
-                    <label class="col-md-3 control-label"><%= t '.email_template' %></label>
-                    <div class="col-md-9">
-                        <%= select_tag 'template_name', options_for_select(templates), class: 'form-control' %>
-                    </div>
-                </div>
             <% end %>
 
             <div class="modal-footer">

app/views/admin/domains/edit.html.erb

@@ -32,4 +32,4 @@
 </div>
 
 <%= render 'form' %>
-<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
+<%= render 'force_delete_dialog', domain: @domain %>

test/system/admin_area/domains/force_delete_test.rb

@@ -42,6 +42,22 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
       find(:css, '#soft_delete').set(true)
       click_link_or_button 'Force delete domain'
     end
+
+    @domain.reload
+    assert_equal template_name, @domain.template_name
+  end
+
+  def test_uses_legal_template_if_registrant_org
+    @domain.registrant.update(ident_type: 'org')
+
+    assert_emails 0 do
+      visit edit_admin_domain_url(@domain)
+      find(:css, '#soft_delete').set(true)
+      click_link_or_button 'Force delete domain'
+    end
+
+    @domain.reload
+    assert_equal template_name, @domain.template_name
   end
 
   def test_allows_to_skip_notifying_registrant_and_admin_contacts_by_email
@@ -71,4 +87,10 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     assert_no_button 'Schedule force delete'
     assert_no_link 'Schedule force delete'
   end
+
+  private
+
+  def template_name
+    @domain.registrant.org? ? 'legal_person' : 'private_person'
+  end
 end