Refactor registrant change mailer

#480
2025-08-04 08:52:04 +02:00 · 2017-05-20 17:36:32 +03:00 · 2017-05-20 17:36:32 +03:00 · 876c010435
commit 876c010435
parent bfc0c0b74f
17 changed files with 156 additions and 273 deletions
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@ -7,6 +7,7 @@ class DomainUpdateConfirmJob < Que::Job
      domain.is_admin = true
      case action
      when RegistrantVerification::CONFIRMED
+        old_registrant = domain.registrant
        domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
        raise_errors!(domain)

@ -15,6 +16,7 @@ class DomainUpdateConfirmJob < Que::Job

        domain.clean_pendings!
        raise_errors!(domain)
+        RegistrantChange.new(domain: domain, old_registrant: old_registrant).confirm
      when RegistrantVerification::REJECTED
        RegistrantChangeMailer.rejected(domain: domain,
                                        registrar: domain.registrar,
--- a/app/mailers/domain_mailer.rb
+++ b/app/mailers/domain_mailer.rb
@ -1,37 +1,6 @@
 class DomainMailer < ApplicationMailer
  include Que::Mailer

-  def registrant_updated_notification_for_new_registrant(domain_id, old_registrant_id, new_registrant_id, should_deliver)
-    @domain = Domain.find_by(id: domain_id)
-    return unless @domain
-    return if delivery_off?(@domain, should_deliver)
-
-    @old_registrant = Registrant.find(old_registrant_id)
-    @new_registrant = Registrant.find(new_registrant_id)
-    @address_processing = Contact.address_processing?
-
-    return if whitelist_blocked?(@new_registrant.email)
-    mail(to: format(@new_registrant.email),
-         subject: "#{I18n.t(:registrant_updated_notification_for_new_registrant_subject,
-                            name: @domain.name)} [#{@domain.name}]")
-  end
-
-
-  def registrant_updated_notification_for_old_registrant(domain_id, old_registrant_id, new_registrant_id, should_deliver)
-    @domain = Domain.find_by(id: domain_id)
-    return unless @domain
-    return if delivery_off?(@domain, should_deliver)
-
-    @old_registrant = Registrant.find(old_registrant_id)
-    @new_registrant = Registrant.find(new_registrant_id)
-    @address_processing = Contact.address_processing?
-
-    return if whitelist_blocked?(@old_registrant.email)
-    mail(to: format(@old_registrant.email),
-         subject: "#{I18n.t(:registrant_updated_notification_for_old_registrant_subject,
-                            name: @domain.name)} [#{@domain.name}]")
-  end
-
  def pending_delete_rejected_notification(domain_id, should_deliver)
    @domain = Domain.find_by(id: domain_id)
    return unless @domain
--- a/app/mailers/registrant_change_mailer.rb
+++ b/app/mailers/registrant_change_mailer.rb
@ -21,6 +21,14 @@ class RegistrantChangeMailer < ApplicationMailer
    mail(to: new_registrant.email, subject: subject)
  end

+  def confirmed(domain:, old_registrant:)
+    @domain = domain
+    recipients = [domain.registrant_email, old_registrant.email]
+    subject = default_i18n_subject(domain_name: domain.name)
+
+    mail(to: recipients, subject: subject)
+  end
+
  def rejected(domain:, registrar:, registrant:)
    @domain = DomainPresenter.new(domain: domain, view: view_context)
    @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@ -521,9 +521,7 @@ class Epp::Domain < Domain
    preclean_pendings
    user  = ApiUser.find(pending_json['current_user_id'])
    frame = Nokogiri::XML(pending_json['frame'])
-    old_registrant_id = registrant_id

-    self.deliver_emails = true # turn on email delivery
    self.statuses.delete(DomainStatus::PENDING_UPDATE)
    self.upid = user.registrar.id if user.registrar
    self.up_date = Time.zone.now
@ -531,11 +529,9 @@ class Epp::Domain < Domain
    return unless update(frame, user, false)
    clean_pendings!

-    save! # for notification if everything fails
+    save!

    WhoisRecord.find_by(domain_id: id).save # need to reload model
-    DomainMailer.registrant_updated_notification_for_old_registrant(id, old_registrant_id, registrant_id, true).deliver
-    DomainMailer.registrant_updated_notification_for_new_registrant(id, old_registrant_id, registrant_id, true).deliver

    true
  end
--- a/app/services/registrant_change.rb
+++ b/app/services/registrant_change.rb
@ -0,0 +1,19 @@
+class RegistrantChange
+  def initialize(domain:, old_registrant:)
+    @domain = domain
+    @old_registrant = old_registrant
+  end
+
+  def confirm
+    notify_registrant
+  end
+
+  private
+
+  def notify_registrant
+    RegistrantChangeMailer.confirmed(domain: domain, old_registrant: old_registrant).deliver_now
+  end
+
+  attr_reader :domain
+  attr_reader :old_registrant
+end
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.html.erb
@ -1,43 +0,0 @@
-Tere
-<br><br>
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
-<br><br>
-Uue registreerija andmed:<br>
-Nimi: <%= @new_registrant.name %><br>
-<% if @new_registrant.priv? %>
-    Isikukood: <%= @new_registrant.ident %><br>
-<% else %>
-    Äriregistrikood: <%= @new_registrant.ident %><br>
-<% end %>
-Epost: <%= @new_registrant.email %><br>
-<% if @address_processing -%>
-Tänav: <%= @new_registrant.street %><br>
-Linn: <%= @new_registrant.city %><br>
-Riik: <%= @new_registrant.country.name %>
-<% end -%>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
-<hr>
-<br><br>
-Hi,
-<br><br>
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
-<br><br>
-New registrant:<br>
-Name: <%= @new_registrant.name %><br>
-<% if @new_registrant.priv? %>
-    Personal code: <%= @new_registrant.ident %><br>
-<% else %>
-    Business Registry code: <%= @new_registrant.ident %><br>
-<% end %>
-E-mail: <%= @new_registrant.email %><br>
-<% if @address_processing -%>
-Street: <%= @new_registrant.street %><br>
-City: <%= @new_registrant.city %><br>
-Country: <%= @new_registrant.country.name %>
-<% end -%>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_new_registrant.text.erb
@ -1,45 +0,0 @@
-Tere
-
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
-
-Uue registreerija andmed:
-Nimi: <%= @new_registrant.name %>
-
-<% if @new_registrant.priv? %>
-    Isikukood: <%= @new_registrant.ident %>
-<% else %>
-    Äriregistrikood: <%= @new_registrant.ident %>
-<% end %>
-Epost: <%= @new_registrant.email %>
-<% if @address_processing -%>
-Tänav: <%= @new_registrant.street %>
-Linn: <%= @new_registrant.city %>
-Riik: <%= @new_registrant.country.name %>
-<% end -%>
-
-Lugupidamisega
-Eesti Interneti Sihtasutus
-
--------------------------------------
-
-Hi,
-
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
-
-New registrant:
-Name: <%= @new_registrant.name %>
-
-<% if @new_registrant.priv? %>
-    Personal code: <%= @new_registrant.ident %>
-<% else %>
-    Business Registry code: <%= @new_registrant.ident %>
-<% end %>
-E-mail: <%= @new_registrant.email %>
-<% if @address_processing -%>
-Street: <%= @new_registrant.street %>
-City: <%= @new_registrant.city %>
-Country: <%= @new_registrant.country.name %>
-<% end -%>
-
-Best Regards,
-Estonian Internet Foundation
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.html.erb
@ -1,43 +0,0 @@
-Tere
-<br><br>
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
-<br><br>
-Uue registreerija andmed:<br>
-Nimi: <%= @new_registrant.name %><br>
-<% if @new_registrant.priv? %>
-Isikukood: <%= @new_registrant.ident %><br>
-<% else %>
-Äriregistrikood: <%= @new_registrant.ident %><br>
-<% end %>
-Epost: <%= @new_registrant.email %><br>
-<% if @address_processing -%>
-Tänav: <%= @new_registrant.street %><br>
-Linn: <%= @new_registrant.city %><br>
-Riik: <%= @new_registrant.country.name %>
-<% end -%>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
-<hr>
-<br><br>
-Hi,
-<br><br>
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
-<br><br>
-New registrant:<br>
-Name: <%= @new_registrant.name %><br>
-<% if @new_registrant.priv? %>
-Personal code: <%= @new_registrant.ident %><br>
-<% else %>
-Business Registry code: <%= @new_registrant.ident %><br>
-<% end %>
-E-mail: <%= @new_registrant.email %><br>
-<% if @address_processing -%>
-Street: <%= @new_registrant.street %><br>
-City: <%= @new_registrant.city %><br>
-Country: <%= @new_registrant.country.name %>
-<% end -%>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
--- a/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/registrant_updated_notification_for_old_registrant.text.erb
@ -1,45 +0,0 @@
-Tere
-
-Domeeni <%= @domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
-
-Uue registreerija andmed:
-Nimi: <%= @new_registrant.name %>
-
-<% if @new_registrant.priv? %>
-Isikukood: <%= @new_registrant.ident %>
-<% else %>
-Äriregistrikood: <%= @new_registrant.ident %>
-<% end %>
-Epost: <%= @new_registrant.email %>
-<% if @address_processing -%>
-Tänav: <%= @new_registrant.street %>
-Linn: <%= @new_registrant.city %>
-Riik: <%= @new_registrant.country.name %>
-<% end -%>
-
-Lugupidamisega
-Eesti Interneti Sihtasutus
-
--------------------------------------
-
-Hi,
-
-Process for changing registrant of the domain <%= @domain.name %> has been approved and the data in the registry is updated.
-
-New registrant:
-Name: <%= @new_registrant.name %>
-
-<% if @new_registrant.priv? %>
-Personal code: <%= @new_registrant.ident %>
-<% else %>
-Business Registry code: <%= @new_registrant.ident %>
-<% end %>
-E-mail: <%= @new_registrant.email %>
-<% if @address_processing -%>
-Street: <%= @new_registrant.street %>
-City: <%= @new_registrant.city %>
-Country: <%= @new_registrant.country.name %>
-<% end -%>
-
-Best Regards,
-Estonian Internet Foundation
--- a/app/views/mailers/registrant_change_mailer/confirmed.html.erb
+++ b/app/views/mailers/registrant_change_mailer/confirmed.html.erb
@ -0,0 +1,25 @@
+<%
+    domain = DomainPresenter.new(domain: @domain, view: self)
+    new_registrant = RegistrantPresenter.new(registrant: @domain.registrant, view: self)
+%>
+Tere
+<br><br>
+Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+<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>
+<hr>
+<br><br>
+Hi,
+<br><br>
+Process for changing registrant of the domain <%= domain.name %> has been approved and the data in the registry is updated.
+<br><br>
+New registrant:<br>
+<%= render 'mailers/shared/registrant/registrant.en.html', registrant: new_registrant %>
+<br><br>
+Best Regards,<br>
+Estonian Internet Foundation
--- a/app/views/mailers/registrant_change_mailer/confirmed.text.erb
+++ b/app/views/mailers/registrant_change_mailer/confirmed.text.erb
@ -0,0 +1,25 @@
+<%
+    domain = DomainPresenter.new(domain: @domain, view: self)
+    new_registrant = RegistrantPresenter.new(registrant: @domain.registrant, view: self)
+%>
+Tere
+
+Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning andmed registris uuendatud.
+
+Uue registreerija andmed:
+<%= render 'mailers/shared/registrant/registrant.et.text', registrant: new_registrant %>
+
+Lugupidamisega
+Eesti Interneti Sihtasutus
+
+--------------------------------------
+
+Hi,
+
+Process for changing registrant of the domain <%= domain.name %> has been approved and the data in the registry is updated.
+
+New registrant:
+<%= render 'mailers/shared/registrant/registrant.en.text', registrant: new_registrant %>
+
+Best Regards,
+Estonian Internet Foundation