From 246144d8f75dd09e9b4049243f0a192c607cb8ac Mon Sep 17 00:00:00 2001 From: Luis M Rodriguez-R Date: Mon, 9 Nov 2026 15:38:02 +0100 Subject: [PATCH] Spread-out reminder emails --- app/models/reminder_mail.rb | 92 +++++++++---- config/schedule.rb | 4 +- ...00000_add_register_reminder_at_to_users.rb | 7 + db/schema.rb | 3 +- test/models/reminder_mail_test.rb | 128 ++++++++++++++++++ 5 files changed, 207 insertions(+), 27 deletions(-) create mode 100644 db/migrate/20261110100000_add_register_reminder_at_to_users.rb create mode 100644 test/models/reminder_mail_test.rb diff --git a/app/models/reminder_mail.rb b/app/models/reminder_mail.rb index 6224066e..0cc26069 100644 --- a/app/models/reminder_mail.rb +++ b/app/models/reminder_mail.rb @@ -1,53 +1,95 @@ class ReminderMail < ApplicationRecord SMTP_MAX_RETRIES = 5 + # Longest wait for a server-requested retry. Longer blocks (e.g., the + # provider's daily quota) end the run instead, and it resumes the next day + SMTP_MAX_WAIT = 15.minutes + + # Reminders sent per run (the task runs daily), leaving room in the SMTP + # provider's daily quota for regular notifications + DAILY_LIMIT = 40 + class << self - def register_reminder - users = - User.joins(:registers) - .where(registers: { notified: false }) - .distinct! - - users.each do |user| - registers = - user.registers.select do |register| - !register.validated? && (register.updated_at < 1.month.ago) && ( - !register.submitted? || - (!register.notified? && register.all_endorsed?) - ) - end - - unless registers.empty? - deliver_with_retry( - AdminMailer.with(user: user, registers: registers) - .register_reminder_email - ) - sleep 2 # Stay under the SMTP provider's recipient rate limit + ## + # Remind users with pending registers, at most once a month per user and + # up to +limit+ users per run, oldest reminders first. Returns the number + # of reminders sent + def register_reminder(limit: DAILY_LIMIT) + sent = 0 + due_users.each do |user| + break if sent >= limit + + registers = pending_registers(user) + next if registers.empty? || !user.opt_notification? + + message = + AdminMailer.with(user: user, registers: registers) + .register_reminder_email + unless deliver_with_retry(message) + $stderr.puts "Stopped after #{sent} reminders: #{@stop_reason}" + break end + + user.update_column(:register_reminder_at, Time.current) + sent += 1 + sleep 2 # Stay under the SMTP provider's recipient rate limit end + sent end private - # Retry deliveries temporarily rejected by the SMTP server (421), - # waiting until the time the server asks for + def due_users + User.joins(:registers) + .where(registers: { notified: false }) + .where( + 'users.register_reminder_at IS NULL OR ' \ + 'users.register_reminder_at < ?', 1.month.ago + ) + .distinct + .order(Arel.sql('users.register_reminder_at ASC NULLS FIRST'), :id) + end + + def pending_registers(user) + user.registers.select do |register| + !register.validated? && (register.updated_at < 1.month.ago) && ( + !register.submitted? || + (!register.notified? && register.all_endorsed?) + ) + end + end + + ## + # Deliver +message+, retrying when the SMTP server temporarily rejects it + # (421) and asks to wait no longer than +SMTP_MAX_WAIT+. Returns +false+ + # (with the reason in +@stop_reason+) if the server asks to wait longer def deliver_with_retry(message) attempts = 0 begin message.deliver_now + true rescue Net::SMTPServerBusy => e attempts += 1 raise if attempts > SMTP_MAX_RETRIES - sleep(smtp_retry_delay(e.message)) + delay = smtp_retry_delay(e.message) + if delay > SMTP_MAX_WAIT + @stop_reason = e.message.strip + return false + end + + sleep(delay) retry end end + ## + # Seconds to wait before retrying, as requested by the server's + # "try again after