diff --git a/app/interactions/domains/expired_pendings/process_clean.rb b/app/interactions/domains/expired_pendings/process_clean.rb index c6277c3c5..4d22c08ff 100644 --- a/app/interactions/domains/expired_pendings/process_clean.rb +++ b/app/interactions/domains/expired_pendings/process_clean.rb @@ -17,7 +17,8 @@ module Domains def notify_pending_update RegistrantChangeMailer.expired(domain: domain, registrar: domain.registrar, - registrant: domain.registrant).deliver_later + registrant: domain.registrant, + send_to: domain.new_registrant_email).deliver_later end def notify_pending_delete diff --git a/app/jobs/registrant_change_expired_email_job.rb b/app/jobs/registrant_change_expired_email_job.rb deleted file mode 100644 index 3c1bc35e2..000000000 --- a/app/jobs/registrant_change_expired_email_job.rb +++ /dev/null @@ -1,20 +0,0 @@ -class RegistrantChangeExpiredEmailJob < Que::Job - def run(domain_id) - domain = Domain.find(domain_id) - log(domain) - RegistrantChangeMailer.expired(domain: domain, - registrar: domain.registrar, - registrant: domain.registrant).deliver_now - end - - private - - def log(domain) - message = "Send RegistrantChangeMailer#expired email for domain #{domain.name} (##{domain.id}) to #{domain.new_registrant_email}" - logger.info(message) - end - - def logger - Rails.logger - end -end diff --git a/app/mailers/registrant_change_mailer.rb b/app/mailers/registrant_change_mailer.rb index 8f43f4ab5..101e6c3e1 100644 --- a/app/mailers/registrant_change_mailer.rb +++ b/app/mailers/registrant_change_mailer.rb @@ -38,13 +38,13 @@ class RegistrantChangeMailer < ApplicationMailer mail(to: domain.new_registrant_email, subject: subject) end - def expired(domain:, registrar:, registrant:) + def expired(domain:, registrar:, registrant:, send_to:) @domain = DomainPresenter.new(domain: domain, view: view_context) @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context) @registrant = RegistrantPresenter.new(registrant: registrant, view: view_context) subject = default_i18n_subject(domain_name: domain.name) - mail(to: domain.new_registrant_email, subject: subject) + mail(to: send_to, subject: subject) end private diff --git a/test/mailers/registrant_change_mailer_test.rb b/test/mailers/registrant_change_mailer_test.rb index 5d14972e3..2022d71f9 100644 --- a/test/mailers/registrant_change_mailer_test.rb +++ b/test/mailers/registrant_change_mailer_test.rb @@ -72,11 +72,12 @@ class RegistrantChangeMailerTest < ActionMailer::TestCase email = RegistrantChangeMailer.expired(domain: @domain, registrar: @domain.registrar, - registrant: @domain.registrant).deliver_now + registrant: @domain.registrant, + send_to: @domain.new_registrant_email).deliver_now assert_emails 1 assert_equal ['william@inbox.test'], email.to assert_equal 'Domeeni shop.test registreerija vahetuse taotlus on tühistatud' \ ' / shop.test registrant change cancelled', email.subject end -end \ No newline at end of file +end