Refactor domain expiration mailer

#186

app/jobs/domain_expiration_email_job.rb

@@ -1,10 +1,10 @@
 class DomainExpirationEmailJob < Que::Job
-  def run(domain_id:)
+  def run(domain_id)
     domain = Domain.find(domain_id)
 
     return if domain.registered?
 
-    DomainMailer.expiration(domain: domain).deliver
+    DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
     destroy
   end
 end

app/mailers/domain_expire_mailer.rb

@@ -0,0 +1,9 @@
+class DomainExpireMailer < ApplicationMailer
+  def expired(domain:, registrar:)
+    @domain = DomainPresenter.new(domain: domain, view: view_context)
+    @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
+
+    subject = default_i18n_subject(domain_name: domain.name)
+    mail(to: domain.primary_contact_emails, subject: subject)
+  end
+end

app/mailers/domain_mailer.rb

@@ -83,14 +83,6 @@ class DomainMailer < ApplicationMailer
     mail(to: domain.primary_contact_emails)
   end
 
-  def expiration(domain:)
-    @domain = DomainPresenter.new(domain: domain, view: view_context)
-    @registrar = RegistrarPresenter.new(registrar: domain.registrar, view: view_context)
-
-    subject = default_i18n_subject(domain_name: domain.name)
-    mail(to: domain.primary_contact_emails, subject: subject)
-  end
-
   private
   # app/models/DomainMailModel provides the data for mail that can be composed_from
   # which ensures that values of objects are captured when they are valid, not later when this method is executed

app/models/domain_cron.rb

@@ -49,7 +49,7 @@ class DomainCron
       saved = domain.save(validate: false)
 
       if saved
-        DomainExpirationEmailJob.enqueue(domain_id: domain.id, run_at: send_time)
+        DomainExpirationEmailJob.enqueue(domain.id, run_at: send_time)
         marked += 1
       end
     end