Merge pull request #1735 from internetee/1178-invalid-email-fd-template

Add invalid email template to ForceDelete notifications

app/controllers/admin/domains_controller.rb

@@ -2,7 +2,6 @@ module Admin
   class DomainsController < BaseController
     before_action :set_domain, only: %i[show edit update keep]
     authorize_resource
-    helper_method :force_delete_templates
 
     def index
       params[:q] ||= {}
@@ -105,9 +104,5 @@ module Admin
 
       params[:q][:valid_to_lteq] = ca_cache
     end
-
-    def force_delete_templates
-      DomainDeleteMailer.force_delete_templates
-    end
   end
 end

app/mailers/domain_delete_mailer.rb

@@ -1,8 +1,4 @@
 class DomainDeleteMailer < ApplicationMailer
-  def self.force_delete_templates
-    %w[private_person legal_person]
-  end
-
   def confirmation_request(domain:, registrar:, registrant:)
     @domain = DomainPresenter.new(domain: domain, view: view_context)
     @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)

app/models/concerns/domain/force_delete.rb

@@ -20,7 +20,13 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
   end
 
   def notification_template
-    registrant.org? ? 'legal_person' : 'private_person'
+    if contact_emails_verification_failed.present?
+      'invalid_email'
+    elsif registrant.org?
+      'legal_person'
+    else
+      'private_person'
+    end
   end
 
   def force_delete_scheduled?

app/models/concerns/email_verifable.rb

@@ -15,6 +15,10 @@ module Concerns
                                                          domain: domain(billing_email))
     end
 
+    def email_verification_failed?
+      email_verification&.failed?
+    end
+
     class_methods do
       def domain(email)
         Mail::Address.new(email).domain&.downcase || 'not_found'

app/models/domain.rb

@@ -642,6 +642,10 @@ class Domain < ApplicationRecord
     DNS::DomainName.new(name)
   end
 
+  def contact_emails_verification_failed
+    contacts.select(&:email_verification_failed?)&.map(&:email)&.uniq
+  end
+
   def self.to_csv
     CSV.generate do |csv|
       csv << column_names

app/presenters/domain_presenter.rb

@@ -52,6 +52,10 @@ class DomainPresenter
     end
   end
 
+  def contact_emails_verification_failed
+    domain.contact_emails_verification_failed.join(', ')
+  end
+
   def remove_registry_lock_btn
     return unless domain.locked_by_registrant?
 

app/views/mailers/domain_delete_mailer/forced/invalid_email.html.erb

@@ -0,0 +1,47 @@
+<p>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</p>
+
+<p>Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et domeeni <%= @domain.name %> kontaktandmed on puudulikud - eposti aadress <%= @domain.contact_emails_verification_failed %>.</p>
+
+<p>Et see olukord on vastuolus .ee <a href='https://www.internet.ee/domains/ee-domain-regulation'>domeenireeglitega</a> algatas EIS <%= @delete_period_length %> päeva pikkuse kustutusmenetluse. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.</p>
+
+<p>Andmete parandamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole või isiklike ja oma ettevõtte andmete puhul <a href="https://registrant.internet.ee/">registreerija portaali</a>.</p>
+
+<p>Kui kontaktandmed ei ole <%= @delete_period_length %> päeva jooksul parandatud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+
+<p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+<hr>
+
+<p>Dear registrant/administrative contact of .ee domain,</p>
+
+<p>Estonian Internet Foundation has learned that contact data of the domain <%= @domain.name %> s invalid - email(s) <%= @domain.contact_emails_verification_failed %>.</p>
+
+<p>Since this is a violation of <a href='https://www.internet.ee/domains/ee-domain-regulation'>Estonian domain regulations</a>, <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.</p>
+
+<p>Please, contact your registrar <%= @registrar.name %> with updated contact data, or in case of your personal or business data use <a href="https://registrant.internet.ee/">.ee portal for registrants</a></p>
+
+<p>If the data is not fixed within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction environment</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">here</a>.</p>
+
+<p>Should you have additional questions, please contact your registrar:</p>
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+<hr>
+
+<p>Уважаемый регистрант/административный контакт домена .ee</p>
+
+<p>Целевому учреждению Eesti Internet (EIS) стало известно, что контактные данные домена <%= @registrant.reg_no %> неверны - электронная почта <%= @domain.contact_emails_verification_failed %>.</p>
+
+<p>Так как это является нарушением <a href='https://www.internet.ee/domains/ee-domain-regulation'>Правил домена .ee</a>, <%= @delete_period_length %>-дневный процесс удаления начат для доменного имени <%= @domain.name %>. В течение первых <%= @expire_warning_period %> дней домен будет доступен в интернете.</p>
+
+<p>Для уточнения контактных данных, пожалуйста, свяжитесь с регистратором <%= @registrar.name %>, либо воспользуйтесь <a href="https://registrant.internet.ee/">порталом для регистрантов</a></p>
+
+<p>Если контактные данные не будут исправлены в течение <%= @delete_period_length %> дней, домен <%= @domain.name %> отправится <%= @domain.force_delete_date %> на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде.ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> е поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">здесь</a>.</p>
+
+<p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
+<%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %></p>
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>

app/views/mailers/domain_delete_mailer/forced/invalid_email.text.erb

@@ -0,0 +1,47 @@
+<p>Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt</p>
+
+<p>Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et domeeni <%= @domain.name %> kontaktandmed on puudulikud - eposti aadress <%= @domain.contact_emails_verification_failed %></p>
+
+<p>Et see olukord on vastuolus .ee <a href='https://www.internet.ee/domains/ee-domain-regulation'>domeenireeglitega</a> algatas EIS <%= @delete_period_length %> päeva pikkuse kustutusmenetluse. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.</p>
+
+<p>Andmete parandamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole või isiklike ja oma ettevõtte andmete puhul <a href="https://registrant.internet.ee/">registreerija portaali</a>.</p>
+
+<p>Kui kontaktandmed ei ole <%= @delete_period_length %> päeva jooksul parandatud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile <a href="https://auction.internet.ee">.ee oksjonikeskkonda</a>. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe <a href="https://www.internet.ee/domeenid/domeenide-oksjonikeskkonna-kasutajatingimused#3-oksjonikeskkonna-enampakkumisel-osalemise-tingimused">siit</a>.</p>
+
+<p>Lisaküsimuste korral võtke palun ühendust oma registripidajaga:</p>
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+<hr>
+
+<p>Dear registrant/administrative contact of .ee domain,</p>
+
+<p>Estonian Internet Foundation has learned that contact data of the domain <%= @domain.name %> s invalid - email(s) <%= @domain.contact_emails_verification_failed %>.</p>
+
+<p>Since this is a violation of <a href='https://www.internet.ee/domains/ee-domain-regulation'>Estonian domain regulations</a>, <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.</p>
+
+<p>Please, contact your registrar <%= @registrar.name %> with updated contact data, or in case of your personal or business data use <a href="https://registrant.internet.ee/">.ee portal for registrants</a></p>
+
+<p>If the data is not fixed within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the <a href="https://auction.internet.ee">.ee auction environment</a>. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">here</a>.</p>
+
+<p>Should you have additional questions, please contact your registrar:</p>
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+<hr>
+
+<p>Уважаемый регистрант/административный контакт домена .ee</p>
+
+<p>Целевому учреждению Eesti Internet (EIS) стало известно, что контактные данные домена <%= @registrant.reg_no %> неверны - электронная почта <%= @domain.contact_emails_verification_failed %>.</p>
+
+<p>Так как это является нарушением <a href='https://www.internet.ee/domains/ee-domain-regulation'>Правил домена .ee</a>, <%= @delete_period_length %>-дневный процесс удаления начат для доменного имени <%= @domain.name %>. В течение первых <%= @expire_warning_period %> дней домен будет доступен в интернете.</p>
+
+<p>Для уточнения контактных данных, пожалуйста, свяжитесь с регистратором <%= @registrar.name %>, либо воспользуйтесь <a href="https://registrant.internet.ee/">порталом для регистрантов</a></p>
+
+<p>Если контактные данные не будут исправлены в течение <%= @delete_period_length %> дней, домен <%= @domain.name %> отправится <%= @domain.force_delete_date %> на доменный аукцион в <a href="https://auction.internet.ee">аукционной среде.ee</a>. Если в течение 24 часов в отношении домена <%= @domain.name %> е поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте <a href="https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment">здесь</a>.</p>
+
+<p>В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
+    <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %></p>
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>

test/mailers/domain_delete_mailer_test.rb

@@ -5,10 +5,6 @@ class DomainDeleteMailerTest < ActionMailer::TestCase
     @domain = domains(:shop)
   end
 
-  def test_force_delete_templates
-    assert_equal %w[private_person legal_person], DomainDeleteMailer.force_delete_templates
-  end
-
   def test_delivers_confirmation_request_email
     assert_equal 'shop.test', @domain.name
     assert_equal 'john@inbox.test', @domain.registrant.email
@@ -68,8 +64,7 @@ class DomainDeleteMailerTest < ActionMailer::TestCase
     email = DomainDeleteMailer.forced(domain: @domain,
                                       registrar: @domain.registrar,
                                       registrant: @domain.registrant,
-                                      template_name: DomainDeleteMailer.force_delete_templates
+                                      template_name: @domain.notification_template).deliver_now
-                                                       .first).deliver_now
 
     assert_emails 1
     assert_equal ['legal@registry.test'], email.from

test/mailers/previews/domain_delete_mailer_preview.rb

@@ -1,10 +1,11 @@
 class DomainDeleteMailerPreview < ActionMailer::Preview
   def self.define_forced_templates
-    DomainDeleteMailer.force_delete_templates.each do |template_name|
+    %w[private_person legal_person invalid_email].each do |template_name|
       define_method "forced_#{template_name}".to_sym do
-        DomainDeleteMailer.forced(domain: @domain,
+        domain = Domain.first
-                                  registrar: @domain.registrar,
+        DomainDeleteMailer.forced(domain: domain,
-                                  registrant: @domain.registrant,
+                                  registrar: domain.registrar,
+                                  registrant: domain.registrant,
                                   template_name: template_name)
       end
     end
@@ -12,26 +13,25 @@ class DomainDeleteMailerPreview < ActionMailer::Preview
 
   define_forced_templates
 
-  def initialize
-    @domain = Domain.first
-    super
-  end
-
   def confirmation_request
-    DomainDeleteMailer.confirmation_request(domain: @domain,
+    domain = Domain.first
-                                            registrar: @domain.registrar,
+    DomainDeleteMailer.confirmation_request(domain: domain,
-                                            registrant: @domain.registrant)
+                                            registrar: domain.registrar,
+                                            registrant: domain.registrant)
   end
 
   def accepted
-    DomainDeleteMailer.accepted(@domain)
+    domain = Domain.first
+    DomainDeleteMailer.accepted(domain)
   end
 
   def rejected
-    DomainDeleteMailer.rejected(@domain)
+    domain = Domain.first
+    DomainDeleteMailer.rejected(domain)
   end
 
   def expired
-    DomainDeleteMailer.expired(@domain)
+    domain = Domain.first
+    DomainDeleteMailer.expired(domain)
   end
-end
+end

test/system/admin_area/domains/force_delete_test.rb

@@ -44,7 +44,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     end
 
     @domain.reload
-    assert_equal template_name, @domain.template_name
+    assert_equal @domain.notification_template, @domain.template_name
   end
 
   def test_uses_legal_template_if_registrant_org
@@ -57,7 +57,23 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     end
 
     @domain.reload
-    assert_equal template_name, @domain.template_name
+    assert_equal @domain.notification_template, @domain.template_name
+  end
+
+  def test_uses_legal_template_if_invalid_email
+    verification = @domain.contacts.first.email_verification
+    verification.update(verified_at: Time.zone.now - 1.day, success: false)
+
+    assert_equal @domain.notification_template, 'invalid_email'
+
+    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 @domain.notification_template, @domain.template_name
   end
 
   def test_allows_to_skip_notifying_registrant_and_admin_contacts_by_email
@@ -87,10 +103,4 @@ 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