Skip to content

Commit df14c1c

Browse files
committed
Update RequestMailer to use deliver_later
Deliver emails in the background job instead of doing it inline.
1 parent edc8901 commit df14c1c

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

app/mailers/request_mailer.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ def self.alert_overdue_requests
325325
overdue_alert(
326326
info_request,
327327
info_request.user
328-
).deliver_now
328+
).deliver_later
329329
elsif calculated_status == 'waiting_response_very_overdue'
330330
RequestMailer.
331331
very_overdue_alert(
332332
info_request,
333333
info_request.user
334-
).deliver_now
334+
).deliver_later
335335
else
336336
raise "unknown request status"
337337
end
@@ -387,7 +387,7 @@ def self.alert_new_response_reminders_internal(days_since, type_code)
387387
new_response_reminder_alert(
388388
info_request,
389389
last_response_message
390-
).deliver_now
390+
).deliver_later
391391
store_sent.save!
392392
end
393393
end
@@ -434,7 +434,7 @@ def self.alert_not_clarified_request
434434
RequestMailer.not_clarified_alert(
435435
info_request,
436436
last_response_message
437-
).deliver_now
437+
).deliver_later
438438
end
439439
store_sent.save!
440440
end
@@ -508,12 +508,12 @@ def self.alert_comment_on_request
508508
info_request,
509509
count,
510510
earliest_unalerted_comment_event.comment
511-
).deliver_now
511+
).deliver_later
512512
elsif count == 1
513513
RequestMailer.comment_on_alert(
514514
info_request,
515515
last_comment_event.comment
516-
).deliver_now
516+
).deliver_later
517517
else
518518
raise "internal error"
519519
end

app/models/comment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def report!(reason, message, user)
158158
"comment: #{comment_url(self)} " \
159159
"\nadmin: #{edit_admin_comment_url(self)}"
160160

161-
RequestMailer.requires_admin(info_request, user, message).deliver_now
161+
RequestMailer.requires_admin(info_request, user, message).deliver_later
162162

163163
info_request.log_event(
164164
'report_comment',

app/models/info_request.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ def receive(email, raw_email_data, *args)
951951
)
952952
user.notify(info_request_event)
953953
else
954-
RequestMailer.new_response(self, incoming_message).deliver_now
954+
RequestMailer.new_response(self, incoming_message).deliver_later
955955
end
956956
end
957957
end
@@ -1022,13 +1022,13 @@ def set_described_state(new_state, set_by = nil, message = "")
10221022
if old_described_state != described_state && requires_admin?
10231023
# Check there is someone to send the message "from"
10241024
if set_by && user
1025-
RequestMailer.requires_admin(self, set_by, message).deliver_now
1025+
RequestMailer.requires_admin(self, set_by, message).deliver_later
10261026
end
10271027
end
10281028

10291029
unless set_by.nil? || is_actual_owning_user?(set_by) || described_state == 'attention_requested'
10301030
RequestMailer.
1031-
old_unclassified_updated(self).deliver_now unless is_external?
1031+
old_unclassified_updated(self).deliver_later unless is_external?
10321032
end
10331033
end
10341034

spec/controllers/classifications_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def post_status(status, message: nil)
196196
it 'should send an email to the requester letting them know someone has
197197
updated the status of their request' do
198198
mail_mock = double('mail')
199-
allow(mail_mock).to receive :deliver_now
199+
allow(mail_mock).to receive :deliver_later
200200
expect(RequestMailer).to receive(:old_unclassified_updated).
201201
and_return(mail_mock)
202202
post_status('rejected')

spec/support/email_helpers.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def rebuild_raw_emails(info_request)
8282
end
8383

8484
def deliveries
85+
perform_enqueued_jobs
8586
@deliveries ||= []
8687
@deliveries += ActionMailer::Base.deliveries
8788
ActionMailer::Base.deliveries.clear

0 commit comments

Comments
 (0)