Calling deliver_later for forms instead of deliver_now

Author: David Zuckerman

app/mailers/request_mailer.rb

@@ -8,7 +8,7 @@ class RequestMailer < ApplicationMailer
 
   # Sends the AffiliateBorrowRequestForm
   def affiliate_borrow_request_form_email(borrow_request)
-    @borrow_request = borrow_request
+    @borrow_request = Struct.new(borrow_request)
 
     mail(to: borrow_request.department_head_email)
   end

app/models/affiliate_borrow_request_form.rb

@@ -1,16 +1,19 @@
+# app/models/affiliate_borrow_request_form.rb
 class AffiliateBorrowRequestForm < Form
-  attr_accessor(
-    :department_head_email,
-    :department_head_name,
-    :department_name,
-    :employee_email,
-    :employee_id,
-    :employee_name,
-    :employee_personal_email,
-    :employee_phone,
-    :employee_preferred_name,
-    :employee_address
-  )
+  ATTRIBUTES = %i[
+    department_head_email
+    department_head_name
+    department_name
+    employee_email
+    employee_id
+    employee_name
+    employee_personal_email
+    employee_phone
+    employee_preferred_name
+    employee_address
+  ].freeze
+
+  attr_accessor(*ATTRIBUTES)
 
   validates :department_name,
             presence: true
@@ -39,9 +42,14 @@ class AffiliateBorrowRequestForm < Form
   validates :employee_address,
             presence: true
 
-  private
+  # Return a serializable hash for deliver_later
+  def to_h
+    ATTRIBUTES.index_with { |attr| public_send(attr) }
+  end
+
+  def submit!
+    raise ActiveModel::ValidationError, self unless valid?
 
-  def submit
-    RequestMailer.affiliate_borrow_request_form_email(self).deliver_now
+    RequestMailer.affiliate_borrow_request_form_email(to_h).deliver_later
   end
 end

app/models/doemoff_patron_email_form.rb

@@ -15,6 +15,6 @@ class DoemoffPatronEmailForm < Form
   private
 
   def submit
-    RequestMailer.doemoff_patron_email(self).deliver_now
+    RequestMailer.doemoff_patron_email(:patron_email, :patron_message, :sender, :recipient_email).deliver_later
   end
 end

app/models/efees_invoice.rb

@@ -41,7 +41,7 @@ def encode
 
   def submit!
     # Send the email with the link to the user!
-    RequestMailer.efee_invoice_email(self).deliver_now
+    RequestMailer.efee_invoice_email(alma_id).deliver_later
   end
 
   private

spec/models/affiliate_borrow_request_form_spec.rb

@@ -1,6 +1,11 @@
 require 'rails_helper'
 
+ActiveJob::Base.queue_adapter = :test
+
 describe AffiliateBorrowRequestForm do
+  include ActiveJob::TestHelper
+  include ActionMailer::TestHelper
+
   it 'validates the form' do
     tests = [
       {
@@ -90,10 +95,8 @@
       employee_address: '123 North St, Berkeley, CA 94707'
     )
 
-    expect { form.submit! }.to(change { ActionMailer::Base.deliveries.count }.by(1))
-    last_email = ActionMailer::Base.deliveries.last
-    expect(last_email.subject).to eq('UC Berkeley Borrowing Card Requested')
-    expect(last_email.to).to include('jeff@wilco.com')
+    expect { form.submit! }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
+
   end
 
   describe :model_name do

spec/models/doemoff_patron_email_form_spec.rb

@@ -4,7 +4,7 @@
 
   attr_reader :form
 
-  # verify params are valid
+  # verify params are valid and it sends an email
   describe 'is valid' do
     describe 'form' do
       before do
@@ -20,8 +20,16 @@
       end
 
       it 'sends an email' do
-        expect { @form.submit! }.to change { ActionMailer::Base.deliveries.count }.by(1)
+        expect do
+          @form.submit!
+        end.to have_enqueued_job(ActionMailer::MailDeliveryJob).with(
+          'RequestMailer',
+          'doemoff_patron_email',
+          'deliver_now',
+          any_args
+        )
       end
+
     end
   end
 

spec/models/efees_invoice_spec.rb

@@ -1,32 +1,84 @@
 require 'rails_helper'
 
 describe EfeesInvoice do
+  include ActiveJob::TestHelper
+
   let(:alma_api_key) { 'fake-api-key' }
-  let(:request_headers) { { 'Accept' => 'application/json', 'Authorization' => "apikey #{alma_api_key}" } }
+  let(:alma_id) { '10335026' }
+  let(:request_headers) do
+    {
+      'Accept' => 'application/json',
+      'Authorization' => "apikey #{alma_api_key}"
+    }
+  end
 
-  before do
-    alma_id = '10335026'
+  context 'JWT generation' do
+    before do
+      allow(Rails.application.config)
+        .to receive(:alma_api_key)
+        .and_return(alma_api_key)
 
-    allow(Rails.application.config).to receive(:alma_api_key).and_return(alma_api_key)
+      stub_request(
+        :get,
+        "https://api-na.hosted.exlibrisgroup.com/almaws/v1/users/#{alma_id}?expand=fees&view=full"
+      )
+        .with(headers: request_headers)
+        .to_return(
+          status: 200,
+          body: File.new('spec/data/fees/efee-lookup-data.json')
+        )
 
-    stub_request(:get, "https://api-na.hosted.exlibrisgroup.com/almaws/v1/users/#{alma_id}?expand=fees&view=full")
-      .with(headers: request_headers)
-      .to_return(status: 200, body: File.new('spec/data/fees/efee-lookup-data.json'))
+      stub_request(
+        :get,
+        "https://api-na.hosted.exlibrisgroup.com/almaws/v1/users/#{alma_id}/fees"
+      )
+        .with(headers: request_headers)
+        .to_return(
+          status: 200,
+          body: File.new('spec/data/fees/efee-lookup-fees.json')
+        )
+    end
 
-    stub_request(:get, "https://api-na.hosted.exlibrisgroup.com/almaws/v1/users/#{alma_id}/fees")
-      .with(headers: request_headers)
-      .to_return(status: 200, body: File.new('spec/data/fees/efee-lookup-fees.json'))
+    it 'encodes the user info into a jwt' do
+      invoice = EfeesInvoice.new(alma_id)
+      decoded_token = EfeesInvoice.decode(invoice.jwt)
 
-    @invoice = EfeesInvoice.new(alma_id)
+      expect(decoded_token[0]).to have_key('userName')
+      expect(decoded_token[0]['userName']).to eq(alma_id)
+    end
   end
 
-  it 'encodes the user info into a jwt' do
-    decoded_token = EfeesInvoice.decode(@invoice.jwt)
-    expect(decoded_token[0] { userName }).to have_key('userName')
-    expect(decoded_token[0] { userName }).to have_value('10335026')
-  end
+  describe '#submit!' do
+    let(:alma_id) { '123456' }
+
+    let(:user_double) do
+      double(
+        id: alma_id,
+        email: 'test@example.com',
+        name: 'Test User',
+        fees: 100.0
+      )
+    end
+
+    before do
+      allow(Alma::User)
+        .to receive(:find_if_exists)
+        .with(alma_id)
+        .and_return(user_double)
+    end
+
+    it 'enqueues the efee invoice email' do
+      invoice = EfeesInvoice.new(alma_id)
 
-  it 'submits the request mailer' do # rubocop:disable RSpec/NoExpectationExample
-    @invoice.submit!
+      expect do
+        invoice.submit!
+      end.to have_enqueued_job(ActionMailer::MailDeliveryJob)
+        .with(
+          'RequestMailer',
+          'efee_invoice_email',
+          'deliver_now',
+          { args: [alma_id] }
+        )
+    end
   end
 end