zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 22:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1736 from internetee/897-fix-pending-update-emails

Browse source 
Fix DomainCron sending registrant change expired mail
This commit is contained in:
Timo Võhmar 2021-03-03 16:15:50 +02:00 • committed by GitHub
commit 632ee16acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/interactions/domains/expired_pendings/process_clean.rb
View file

@ -17,7 +17,8 @@ module Domains
def notify_pending_update def notify_pending_update
RegistrantChangeMailer.expired(domain: domain, RegistrantChangeMailer.expired(domain: domain,
registrar: domain.registrar, registrar: domain.registrar,
registrant: domain.registrant).deliver_later registrant: domain.registrant,
send_to: domain.new_registrant_email).deliver_later
end end
def notify_pending_delete def notify_pending_delete

20
app/jobs/registrant_change_expired_email_job.rb
View file

@ -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

4
app/mailers/registrant_change_mailer.rb
View file

@ -38,13 +38,13 @@ class RegistrantChangeMailer < ApplicationMailer
mail(to: domain.new_registrant_email, subject: subject) mail(to: domain.new_registrant_email, subject: subject)
end end
def expired(domain:, registrar:, registrant:) def expired(domain:, registrar:, registrant:, send_to:)
@domain = DomainPresenter.new(domain: domain, view: view_context) @domain = DomainPresenter.new(domain: domain, view: view_context)
@registrar = RegistrarPresenter.new(registrar: registrar, view: view_context) @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
@registrant = RegistrantPresenter.new(registrant: registrant, view: view_context) @registrant = RegistrantPresenter.new(registrant: registrant, view: view_context)
subject = default_i18n_subject(domain_name: domain.name) subject = default_i18n_subject(domain_name: domain.name)
mail(to: domain.new_registrant_email, subject: subject) mail(to: send_to, subject: subject)
end end
private private

5
test/mailers/registrant_change_mailer_test.rb
View file

@ -72,11 +72,12 @@ class RegistrantChangeMailerTest < ActionMailer::TestCase
email = RegistrantChangeMailer.expired(domain: @domain, email = RegistrantChangeMailer.expired(domain: @domain,
registrar: @domain.registrar, registrar: @domain.registrar,
registrant: @domain.registrant).deliver_now registrant: @domain.registrant,
send_to: @domain.new_registrant_email).deliver_now
assert_emails 1 assert_emails 1
assert_equal ['william@inbox.test'], email.to assert_equal ['william@inbox.test'], email.to
assert_equal 'Domeeni shop.test registreerija vahetuse taotlus on tühistatud' \ assert_equal 'Domeeni shop.test registreerija vahetuse taotlus on tühistatud' \
' / shop.test registrant change cancelled', email.subject ' / shop.test registrant change cancelled', email.subject
end end
end end