move scheduler, add bounced email check

Author: ptgms

Gemfile

@@ -66,7 +66,7 @@ gem 'sprockets-rails'
 gem 'uuid', '~> 2.3', '>= 2.3.9'
 gem 'uuidtools', '~> 2.1', '>= 2.1.5'
 gem 'vuejs-rails', '~> 2.3.2'
-gem 'whenever'
+gem 'rufus-scheduler', '~> 3.9'
 gem "altcha", "~> 1.0"
 
 group :development do

app/mailers/bounce_interceptor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class BounceInterceptor
+  def self.delivering_email(message)
+    return unless defined?(BouncedEmail)
+
+    original_to = Array(message.to)
+    filtered_to = original_to.reject { |email| BouncedEmail.bounced?(email) }
+
+    if filtered_to.empty?
+      message.perform_deliveries = false
+      Rails.logger.info("[BounceInterceptor] Blocked email to bounced address(es): #{original_to.join(', ')}")
+    elsif filtered_to.size < original_to.size
+      blocked = original_to - filtered_to
+      Rails.logger.info("[BounceInterceptor] Removed bounced address(es) from recipients: #{blocked.join(', ')}")
+      message.to = filtered_to
+    end
+  end
+end

app/models/bounced_email.rb

@@ -0,0 +1,11 @@
+class BouncedEmail < ApplicationRecord
+  validates :email, presence: true, uniqueness: { case_sensitive: false }
+
+  PERMANENTLY_BLOCKED = %w[deactivated_account@tosdr.org].freeze
+
+  def self.bounced?(email)
+    return true if PERMANENTLY_BLOCKED.include?(email.downcase)
+
+    where('lower(email) = ?', email.downcase).exists?
+  end
+end

config/initializers/bounce_interceptor.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.config.after_initialize do
+  ActionMailer::Base.register_interceptor(BounceInterceptor)
+end

config/initializers/scheduler.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# In-process scheduler using rufus-scheduler.
+# Replaces system cron (which doesn't work reliably in Docker).
+# All times are UTC.
+
+require 'rufus-scheduler'
+
+return unless defined?(Rails::Server) || ENV['RUN_SCHEDULER'] == 'true'
+
+scheduler = Rufus::Scheduler.singleton
+
+# service:perform_rating — Mon, Wed, Fri at 3:00 AM
+scheduler.cron '0 3 * * 1,3,5' do
+  Rails.logger.info('[Scheduler] Running service:perform_rating')
+  Rake::Task['service:perform_rating'].reenable
+  Rake::Task['service:perform_rating'].invoke
+end
+
+# spam:clean_spam — Tue, Thu at 3:00 AM
+scheduler.cron '0 3 * * 2,4' do
+  Rails.logger.info('[Scheduler] Running spam:clean_spam')
+  Rake::Task['spam:clean_spam'].reenable
+  Rake::Task['spam:clean_spam'].invoke
+end
+
+# bounced_emails:fetch — Daily at 4:00 AM
+scheduler.cron '0 4 * * *' do
+  Rails.logger.info('[Scheduler] Running bounced_emails:fetch')
+  Rake::Task['bounced_emails:fetch'].reenable
+  Rake::Task['bounced_emails:fetch'].invoke
+end

config/schedule.rb

@@ -1,40 +1,8 @@
-# Use this file to easily define all of your cron jobs.
-#
-# It's helpful, but not entirely necessary to understand cron before proceeding.
-# http://en.wikipedia.org/wiki/Cron
-
-# Example:
-#
-# set :output, "/path/to/my/cron_log.log"
-#
-# every 2.hours do
-#   command "/usr/bin/some_great_command"
-#   runner "MyModel.some_method"
-#   rake "some:great:rake:task"
-# end
-#
-# every 4.days do
-#   runner "AnotherModel.prune_old_records"
-# end
-
-# Learn more: http://github.com/javan/whenever
-
-every :monday, at: '3:00 am' do
-  rake 'service:perform_rating'
-end
-
-every :wednesday, at: '3:00 am' do
-  rake 'service:perform_rating'
-end
-
-every :friday, at: '3:00 am' do
-  rake 'service:perform_rating'
-end
-
-every :tuesday, at: '3:00 am' do
-  rake 'spam:clean_spam'
-end
-
-every :thursday, at: '3:00 am' do
-  rake 'spam:clean_spam'
-end
+# DEPRECATED: This file was used by the `whenever` gem for system cron.
+# Scheduled tasks are now managed by rufus-scheduler in
+# config/initializers/scheduler.rb (runs in-process, Docker-friendly).
+#
+# Schedule overview:
+#   Mon, Wed, Fri at 3:00 AM — service:perform_rating
+#   Tue, Thu at 3:00 AM      — spam:clean_spam
+#   Daily at 4:00 AM          — bounced_emails:fetch

db/migrate/20260329120000_create_bounced_emails.rb

@@ -0,0 +1,12 @@
+class CreateBouncedEmails < ActiveRecord::Migration[7.1]
+  def change
+    create_table :bounced_emails do |t|
+      t.string :email, null: false
+      t.string :bounce_type
+      t.datetime :bounced_at
+      t.timestamps
+    end
+
+    add_index :bounced_emails, :email, unique: true
+  end
+end

docker-entrypoint.sh

@@ -16,10 +16,6 @@ if [ -v INIT_SETUP ]; then
 	bundle exec rake db:seed
 fi
 
-# Start cron in the background
-service cron start
-whenever --update-crontab
-
 # Starting the Rails server
 # Option 1: Using puma
 exec bundle exec puma -C config/puma.rb

lib/tasks/bounced_emails.rake

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+namespace :bounced_emails do
+  desc 'Fetch bounced emails from Mailtrap and store them'
+  task fetch: :environment do
+    account_id = ENV['MAILTRAP_ACCOUNT_ID']
+    api_token = ENV['SMTP_PASSWORD']
+
+    if account_id.blank?
+      puts 'MAILTRAP_ACCOUNT_ID not set, skipping bounce fetch.'
+      next
+    end
+
+    if api_token.blank?
+      puts 'SMTP_PASSWORD not set, skipping bounce fetch.'
+      next
+    end
+
+    url = "https://mailtrap.io/api/accounts/#{account_id}/email_logs"
+    params = {
+      'filters[events][operator]' => 'include_event',
+      'filters[events][value][]' => %w[bounce soft_bounce]
+    }
+
+    response = HTTParty.get(url, query: params, headers: { 'Api-Token' => api_token })
+
+    unless response.success?
+      puts "Failed to fetch bounced emails: #{response.code} #{response.message}"
+      next
+    end
+
+    messages = response.parsed_response['messages'] || []
+    count = 0
+
+    messages.each do |msg|
+      email = msg['to']&.downcase
+      next if email.blank?
+
+      bounced = BouncedEmail.find_or_initialize_by(email: email)
+      bounced.bounce_type ||= 'bounce'
+      bounced.bounced_at ||= msg['sent_at']
+      if bounced.new_record?
+        bounced.save!
+        count += 1
+      end
+    end
+
+    puts "Fetched #{messages.size} bounced messages, added #{count} new bounced emails."
+  end
+end