Merge pull request #1149 from internetee/improve-registrant-change-ma…

…iler

Improve registrant change mailer

app/jobs/registrant_change_confirm_email_job.rb

@@ -4,10 +4,10 @@ def run(domain_id, new_registrant_id)
     new_registrant = Registrant.find(new_registrant_id)
 
     log(domain)
-    RegistrantChangeMailer.confirm(domain: domain,
-                                   registrar: domain.registrar,
-                                   current_registrant: domain.registrant,
-                                   new_registrant: new_registrant).deliver_now
+    RegistrantChangeMailer.confirmation_request(domain: domain,
+                                                registrar: domain.registrar,
+                                                current_registrant: domain.registrant,
+                                                new_registrant: new_registrant).deliver_now
   end
 
   private

app/jobs/registrant_change_notice_email_job.rb

@@ -3,10 +3,10 @@ def run(domain_id, new_registrant_id)
     domain = Domain.find(domain_id)
     new_registrant = Registrant.find(new_registrant_id)
     log(domain, new_registrant)
-    RegistrantChangeMailer.notice(domain: domain,
-                                  registrar: domain.registrar,
-                                  current_registrant: domain.registrant,
-                                  new_registrant: new_registrant).deliver_now
+    RegistrantChangeMailer.notification(domain: domain,
+                                        registrar: domain.registrar,
+                                        current_registrant: domain.registrant,
+                                        new_registrant: new_registrant).deliver_now
   end
 
   private

app/mailers/registrant_change_mailer.rb

@@ -1,17 +1,17 @@
 class RegistrantChangeMailer < ApplicationMailer
   helper_method :address_processing
 
-  def confirm(domain:, registrar:, current_registrant:, new_registrant:)
+  def confirmation_request(domain:, registrar:, current_registrant:, new_registrant:)
     @domain = DomainPresenter.new(domain: domain, view: view_context)
     @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
     @new_registrant = RegistrantPresenter.new(registrant: new_registrant, view: view_context)
-    @confirm_url = confirm_url(domain)
+    @confirmation_url = confirmation_url(domain)
 
     subject = default_i18n_subject(domain_name: domain.name)
     mail(to: current_registrant.email, subject: subject)
   end
 
-  def notice(domain:, registrar:, current_registrant:, new_registrant:)
+  def notification(domain:, registrar:, current_registrant:, new_registrant:)
     @domain = DomainPresenter.new(domain: domain, view: view_context)
     @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
     @current_registrant = RegistrantPresenter.new(registrant: current_registrant, view: view_context)
@@ -21,7 +21,7 @@ def notice(domain:, registrar:, current_registrant:, new_registrant:)
     mail(to: new_registrant.email, subject: subject)
   end
 
-  def confirmed(domain:, old_registrant:)
+  def accepted(domain:, old_registrant:)
     @domain = domain
     recipients = [domain.registrant.email, old_registrant.email]
     subject = default_i18n_subject(domain_name: domain.name)
@@ -49,7 +49,7 @@ def expired(domain:, registrar:, registrant:)
 
   private
 
-  def confirm_url(domain)
+  def confirmation_url(domain)
     registrant_domain_update_confirm_url(domain, token: domain.registrant_verification_token)
   end
 

app/services/registrant_change.rb

@@ -11,7 +11,7 @@ def confirm
   private
 
   def notify_registrant
-    RegistrantChangeMailer.confirmed(domain: domain, old_registrant: old_registrant).deliver_now
+    RegistrantChangeMailer.accepted(domain: domain, old_registrant: old_registrant).deliver_now
   end
 
   attr_reader :domain

app/views/mailers/registrant_change_mailer/confirmed.html.erb → app/views/mailers/registrant_change_mailer/accepted.html.erb

@@ -8,10 +8,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and
 <br><br>
 Uue registreerija andmed:<br>
 <%= render 'mailers/shared/registrant/registrant.et.html', registrant: new_registrant %>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -20,6 +17,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv
 <br><br>
 New registrant:<br>
 <%= render 'mailers/shared/registrant/registrant.en.html', registrant: new_registrant %>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>

app/views/mailers/registrant_change_mailer/confirmed.text.erb → app/views/mailers/registrant_change_mailer/accepted.text.erb

@@ -9,9 +9,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and
 Uue registreerija andmed:
 <%= render 'mailers/shared/registrant/registrant.et.text', registrant: new_registrant %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
-
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 --------------------------------------
 
 Hi,
@@ -21,5 +19,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv
 New registrant:
 <%= render 'mailers/shared/registrant/registrant.en.text', registrant: new_registrant %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>

app/views/mailers/registrant_change_mailer/confirm.html.erb → app/views/mailers/registrant_change_mailer/confirmation_request.html.erb

@@ -12,11 +12,8 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak
 <br><br>
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:<br>
 
-<%= link_to @confirm_url, @confirm_url %>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= link_to @confirmation_url, @confirmation_url %>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -32,7 +29,5 @@ New registrant:<br>
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 <br><br>
 To confirm the update please visit this website, once again review the data and press approve:<br>
-<%= link_to @confirm_url, @confirm_url %>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= link_to @confirmation_url, @confirmation_url %>
+<%= render 'mailers/shared/signatures/signature.en.html' %>

app/views/mailers/registrant_change_mailer/confirm.text.erb → app/views/mailers/registrant_change_mailer/confirmation_request.text.erb

@@ -9,10 +9,9 @@ Uue registreerija andmed:
 
 Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
-<%= @confirm_url %>
+<%= @confirmation_url %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -27,7 +26,6 @@ New registrant:
 
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 To confirm the update please visit this website, once again review the data and press approve:
-<%= @confirm_url %>
+<%= @confirmation_url %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>

app/views/mailers/registrant_change_mailer/expired.html.erb

@@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud
 Küsimuste korral palun võtke ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
-
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -19,7 +15,4 @@ Domain registrant change request has been expired for the domain <%= @domain.nam
 Please contact to your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
-
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>

app/views/mailers/registrant_change_mailer/expired.text.erb

@@ -5,9 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud
 Küsimuste korral palun võtke ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
-
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -19,5 +17,4 @@ Please contact to your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>

app/views/mailers/registrant_change_mailer/notice.html.erb → app/views/mailers/registrant_change_mailer/notification.html.erb

@@ -14,9 +14,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule
 <br><br>
 Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 <br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -34,6 +32,4 @@ New registrant:<br>
 The registrant change procedure will be completed only after the current registrant <%= @current_registrant.name %> has approved it.
 <br><br>
 Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>

app/views/mailers/registrant_change_mailer/notice.text.erb → app/views/mailers/registrant_change_mailer/notification.text.erb

@@ -13,8 +13,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule
 
 Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -33,5 +32,4 @@ The registrant change procedure will be completed only after the current registr
 
 Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>

app/views/mailers/registrant_change_mailer/rejected.html.erb

@@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> on domeeni reg
 Küsimuste korral võtke palun ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
-
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -19,7 +15,4 @@ Registrant change for the domain <%= @domain.name %> was rejected by the registr
 Please contact your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
-
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>

app/views/mailers/registrant_change_mailer/rejected.text.erb

@@ -6,8 +6,7 @@ Küsimuste korral võtke palun ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -19,5 +18,4 @@ Please contact your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>

config/locales/mailers/registrant_change.en.yml

@@ -1,14 +1,22 @@
 en:
   registrant_change_mailer:
-    confirm:
-      subject: Kinnitustaotlus domeeni %{domain_name} registreerija vahetuseks / Application for approval for registrant change of %{domain_name}
-    notice:
-      subject: Domeeni %{domain_name} registreerija vahetus protseduur on algatatud / %{domain_name} registrant change
-    rejected:
-      subject: Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud / %{domain_name} registrant change declined
-    confirmed:
+    confirmation_request:
+      subject: >-
+        Kinnitustaotlus domeeni %{domain_name} registreerija vahetuseks
+        / Application for approval for registrant change of %{domain_name}
+    notification:
+      subject: >-
+        Domeeni %{domain_name} registreerija vahetus protseduur on algatatud
+        / %{domain_name} registrant change
+    accepted:
       subject: >-
         Domeeni %{domain_name} registreerija vahetus teostatud
         / Registrant change of %{domain_name} has been finished
+    rejected:
+      subject: >-
+        Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud
+        / %{domain_name} registrant change declined
     expired:
-      subject: Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud / %{domain_name} registrant change cancelled
+      subject: >-
+        Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud
+        / %{domain_name} registrant change cancelled

spec/services/registrant_change_spec.rb

@@ -7,7 +7,7 @@
     let(:message) { instance_spy(ActionMailer::MessageDelivery) }
 
     before :example do
-      allow(RegistrantChangeMailer).to receive(:confirmed)
+      allow(RegistrantChangeMailer).to receive(:accepted)
                                            .with(domain: domain, old_registrant: old_registrant)
                                            .and_return(message)
       described_class.new(domain: domain, old_registrant: old_registrant).confirm