.dockerignore

@@ -1,30 +1,5 @@
+log/*
+tmp/*
 Dockerfile
+.env*
 .git
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore pidfiles, but keep the directory.
-/tmp/pids/*
-!/tmp/pids/
-!/tmp/pids/.keep
-
-# Ignore uploaded files in development.
-/storage/*
-!/storage/.keep
-/tmp/storage/*
-!/tmp/storage/
-!/tmp/storage/.keep
-
-/public/assets
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
-
-/.env*.local

Gemfile

@@ -5,19 +5,18 @@ ruby "3.1.2"
 
 gem "bootsnap", require: false
 gem "clearance"
-gem "combine_pdf"
 gem "dotenv-rails"
 gem "importmap-rails"
-gem "nokogiri"
 gem "paper_trail"
 gem "pg", "~> 1.1"
 gem "propshaft"
-gem "puma", "~> 6.0"
+gem "puma", "~> 5.0"
 gem "pundit"
-gem "rails", "~> 7.1"
+gem "rails", "~> 7.0.3"
 gem "ransack"
+gem "nokogiri"
 gem "rubyzip"
-gem "solid_queue"
+gem "combine_pdf"
 
 group :development, :test do
   gem "debug", platforms: %i[ mri mingw x64_mingw ]

Gemfile.lock

@@ -1,86 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.2)
+    actioncable (7.0.8.1)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
+    actionmailbox (7.0.8.1)
-    actionmailbox (7.1.3.2)
+      actionpack (= 7.0.8.1)
-      actionpack (= 7.1.3.2)
+      activejob (= 7.0.8.1)
-      activejob (= 7.1.3.2)
+      activerecord (= 7.0.8.1)
-      activerecord (= 7.1.3.2)
+      activestorage (= 7.0.8.1)
-      activestorage (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.2)
+    actionmailer (7.0.8.1)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.0.8.1)
-      actionview (= 7.1.3.2)
+      actionview (= 7.0.8.1)
-      activejob (= 7.1.3.2)
+      activejob (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-    actionpack (7.1.3.2)
+    actionpack (7.0.8.1)
-      actionview (= 7.1.3.2)
+      actionview (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      nokogiri (>= 1.8.5)
+      rack (~> 2.0, >= 2.2.4)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.6)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.1.3.2)
+    actiontext (7.0.8.1)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.0.8.1)
-      activerecord (= 7.1.3.2)
+      activerecord (= 7.0.8.1)
-      activestorage (= 7.1.3.2)
+      activestorage (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
+    actionview (7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
       builder (~> 3.1)
-      erubi (~> 1.11)
+      erubi (~> 1.4)
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.1.3.2)
+    activejob (7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
+    activemodel (7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-    activerecord (7.1.3.2)
+    activerecord (7.0.8.1)
-      activemodel (= 7.1.3.2)
+      activemodel (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      timeout (>= 0.4.0)
+    activestorage (7.0.8.1)
-    activestorage (7.1.3.2)
+      actionpack (= 7.0.8.1)
-      actionpack (= 7.1.3.2)
+      activejob (= 7.0.8.1)
-      activejob (= 7.1.3.2)
+      activerecord (= 7.0.8.1)
-      activerecord (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.3.2)
+      mini_mime (>= 1.1.0)
-      base64
+    activesupport (7.0.8.1)
-      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
-      mutex_m
       tzinfo (~> 2.0)
     argon2 (2.3.0)
       ffi (~> 1.15)
       ffi-compiler (~> 1.0)
-    base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.7)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -97,7 +86,6 @@ GEM
       matrix
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
     debug (1.9.1)
@@ -107,19 +95,13 @@ GEM
     dotenv-rails (3.1.0)
       dotenv (= 3.1.0)
       railties (>= 6.1)
-    drb (2.2.1)
     email_validator (2.2.4)
       activemodel
     erubi (1.12.0)
-    et-orbi (1.2.11)
-      tzinfo
     ffi (1.16.3)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    fugit (1.9.0)
-      et-orbi (~> 1, >= 1.2.7)
-      raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.4)
@@ -142,10 +124,10 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
+    method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.22.3)
     msgpack (1.7.2)
-    mutex_m (0.2.0)
     net-imap (0.4.10)
       date
       net-protocol
@@ -153,7 +135,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.1)
     nokogiri (1.16.3-x86_64-linux)
@@ -169,34 +151,28 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    puma (6.4.2)
+    puma (5.6.8)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)
-    raabro (1.4.0)
     racc (1.7.3)
-    rack (3.0.10)
+    rack (2.2.9)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rails (7.0.8.1)
-      rack (>= 3)
+      actioncable (= 7.0.8.1)
-      webrick (~> 1.8)
+      actionmailbox (= 7.0.8.1)
-    rails (7.1.3.2)
+      actionmailer (= 7.0.8.1)
-      actioncable (= 7.1.3.2)
+      actionpack (= 7.0.8.1)
-      actionmailbox (= 7.1.3.2)
+      actiontext (= 7.0.8.1)
-      actionmailer (= 7.1.3.2)
+      actionview (= 7.0.8.1)
-      actionpack (= 7.1.3.2)
+      activejob (= 7.0.8.1)
-      actiontext (= 7.1.3.2)
+      activemodel (= 7.0.8.1)
-      actionview (= 7.1.3.2)
+      activerecord (= 7.0.8.1)
-      activejob (= 7.1.3.2)
+      activestorage (= 7.0.8.1)
-      activemodel (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.0.8.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -204,14 +180,13 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.2)
+    railties (7.0.8.1)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.0.8.1)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.0.8.1)
-      irb
+      method_source
-      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
+      thor (~> 1.0)
-      zeitwerk (~> 2.6)
+      zeitwerk (~> 2.5)
     rake (13.1.0)
     ransack (4.1.1)
       activerecord (>= 6.1.5)
@@ -219,18 +194,12 @@ GEM
       i18n
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    reline (0.5.0)
+    reline (0.4.3)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
     ruby-rc4 (0.1.5)
     rubyzip (2.3.2)
-    solid_queue (0.3.0)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      concurrent-ruby (~> 1.2.2)
-      fugit (~> 1.9.0)
-      railties (>= 7.1)
     stringio (3.1.0)
     thor (1.3.1)
     timecop (0.9.8)
@@ -242,7 +211,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -262,12 +230,11 @@ DEPENDENCIES
   paper_trail
   pg (~> 1.1)
   propshaft
-  puma (~> 6.0)
+  puma (~> 5.0)
   pundit
-  rails (~> 7.1)
+  rails (~> 7.0.3)
   ransack
   rubyzip
-  solid_queue
   timecop
   web-console
 

app/jobs/notify_job.rb

@@ -1,5 +0,0 @@
-class NotifyJob < ApplicationJob
-  def perform
-    Notification.send_scheduled_for_today
-  end
-end

app/jobs/sync_job.rb

@@ -1,5 +0,0 @@
-class SyncJob < ApplicationJob
-  def perform
-    Member.reset_all_status!
-  end
-end

bin/setup

@@ -5,7 +5,7 @@ require "fileutils"
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args, exception: true)
+  system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do

config/application.rb

@@ -21,12 +21,7 @@ Bundler.require(*Rails.groups)
 module Saucy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.1
+    config.load_defaults 7.0
-
-    # Please, add to the `ignore` list any other `lib` subdirectories that do
-    # not contain `.rb` files, or that should not be reloaded or eager loaded.
-    # Common ones are `templates`, `generators`, or `middleware`, for example.
-    config.autoload_lib(ignore: %w(assets tasks))
 
     # Configuration for the application, engines, and railties goes here.
     #

config/environments/development.rb

@@ -6,7 +6,7 @@ Rails.application.configure do
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.enable_reloading = true
+  config.cache_classes = false
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -74,11 +74,6 @@ Rails.application.configure do
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Highlight code that enqueued background job in logs.
-  config.active_job.verbose_enqueue_logs = true
-
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
 
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
@@ -86,6 +81,6 @@ Rails.application.configure do
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Raise error when a before_action's only/except options reference missing actions
+  # Uncomment if you wish to allow Action Cable access from any origin.
-  config.action_controller.raise_on_missing_callback_actions = true
+  # config.action_cable.disable_request_forgery_protection = true
 end

config/environments/production.rb

@@ -4,7 +4,7 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
-  config.enable_reloading = false
+  config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers
@@ -13,22 +13,17 @@ Rails.application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local = false
+  config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
-  # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
   # config.require_master_key = true
 
-  # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-
-  # Do not fall back to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
 
@@ -39,31 +34,21 @@ Rails.application.configure do
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
-  # Assume all access to the app is happening through a SSL-terminating reverse proxy.
-  # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
-  # config.assume_ssl = true
-
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  # config.force_ssl = true
 
-  # Log to STDOUT by default
+  # Include generic and useful information about system operation, but avoid logging too much
-  config.logger = ActiveSupport::Logger.new(STDOUT)
+  # information to avoid inadvertent exposure of personally identifiable information (PII).
-    .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+  config.log_level = :info
-    .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # "info" includes generic and useful information about system operation, but avoids logging too much
-  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
-  # want to log everything, set the level to "debug".
-  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
-
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  config.active_job.queue_adapter = :solid_queue
+  # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "saucy_production"
 
   config.action_mailer.perform_caching = false
@@ -110,12 +95,4 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Enable DNS rebinding protection and other `Host` header attacks.
-  # config.hosts = [
-  #   "example.com",     # Allow requests from example.com
-  #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
-  # ]
-  # Skip DNS rebinding protection for the default health check endpoint.
-  # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 end

config/environments/test.rb

@@ -8,13 +8,12 @@ require "active_support/core_ext/integer/time"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # While tests run files are not watched, reloading is not necessary.
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
-  config.enable_reloading = false
+  config.cache_classes = true
 
-  # Eager loading loads your entire application. When running a single test locally,
+  # Eager loading loads your whole application. When running a single test locally,
-  # this is usually not necessary, and can slow down your test suite. However, it's
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
-  # recommended that you enable it in continuous integration systems to ensure eager
+  # system, or in some way before deploying your code.
-  # loading is working properly before deploying your code.
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
@@ -24,12 +23,12 @@ Rails.application.configure do
   }
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local = true
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
-  # Render exception templates for rescuable exceptions and raise for other exceptions.
+  # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = :rescuable
+  config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
@@ -58,7 +57,4 @@ Rails.application.configure do
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
-
-  # Raise error when a before_action's only/except options reference missing actions
-  config.action_controller.raise_on_missing_callback_actions = true
 end

config/initializers/content_security_policy.rb

@@ -16,9 +16,9 @@
 #     # policy.report_uri "/csp-violation-report-endpoint"
 #   end
 #
-#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
+#   # Generate session nonces for permitted importmap and inline scripts
 #   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-#   config.content_security_policy_nonce_directives = %w(script-src style-src)
+#   config.content_security_policy_nonce_directives = %w(script-src)
 #
 #   # Report violations without enforcing the policy.
 #   # config.content_security_policy_report_only = true

config/initializers/filter_parameter_logging.rb

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
-# Use this to limit dissemination of sensitive information.
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
-# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
+# notations and behaviors.
 Rails.application.config.filter_parameters += [
   :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]

config/initializers/new_framework_defaults_7_1.rb

@@ -1,284 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 7.1 framework defaults upgrade.
-#
-# Uncomment each configuration one by one to switch to the new default.
-# Once your application is ready to run with all new defaults, you can remove
-# this file and set the `config.load_defaults` to `7.1`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-###
-# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
-# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
-#
-# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
-# of the bootsnap cache if you use it.
-#
-# To set this configuration, add the following line to `config/application.rb` (NOT this file):
-#   config.add_autoload_paths_to_load_path = false
-
-###
-# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
-# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
-#++
-# Rails.application.config.action_dispatch.default_headers = {
-#   "X-Frame-Options" => "SAMEORIGIN",
-#   "X-XSS-Protection" => "0",
-#   "X-Content-Type-Options" => "nosniff",
-#   "X-Permitted-Cross-Domain-Policies" => "none",
-#   "Referrer-Policy" => "strict-origin-when-cross-origin"
-# }
-
-###
-# Do not treat an `ActionController::Parameters` instance
-# as equal to an equivalent `Hash` by default.
-#++
-# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
-
-###
-# Active Record Encryption now uses SHA-256 as its hash digest algorithm.
-#
-# There are 3 scenarios to consider.
-#
-# 1. If you have data encrypted with previous Rails versions, and you have
-# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
-# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
-#++
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
-#
-# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
-# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
-#++
-# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
-#
-# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
-# configure the default behavior starting 7.1+:
-#++
-# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
-
-###
-# No longer run after_commit callbacks on the first of multiple Active Record
-# instances to save changes to the same database row within a transaction.
-# Instead, run these callbacks on the instance most likely to have internal
-# state which matches what was committed to the database, typically the last
-# instance to save.
-#++
-# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
-
-###
-# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
-#
-# SQLite has some quirks around double-quoted string literals.
-# It first tries to consider double-quoted strings as identifier names, but if they don't exist
-# it then considers them as string literals. Because of this, typos can silently go unnoticed.
-# For example, it is possible to create an index for a non existing column.
-# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
-#++
-# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
-
-###
-# Disable deprecated singular associations names.
-#++
-# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
-
-###
-# Enable the Active Job `BigDecimal` argument serializer, which guarantees
-# roundtripping. Without this serializer, some queue adapters may serialize
-# `BigDecimal` arguments as simple (non-roundtrippable) strings.
-#
-# When deploying an application with multiple replicas, old (pre-Rails 7.1)
-# replicas will not be able to deserialize `BigDecimal` arguments from this
-# serializer. Therefore, this setting should only be enabled after all replicas
-# have been successfully upgraded to Rails 7.1.
-#++
-# Rails.application.config.active_job.use_big_decimal_serializer = true
-
-###
-# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
-# `write` are given an invalid `expires_at` or `expires_in` time.
-# Options are `true`, and `false`. If `false`, the exception will be reported
-# as `handled` and logged instead.
-#++
-# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
-
-###
-# Specify whether Query Logs will format tags using the SQLCommenter format
-# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
-# Options are `:legacy` and `:sqlcommenter`.
-#++
-# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
-
-###
-# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
-# instances.
-#
-# The legacy default is `:marshal`, which is a potential vector for
-# deserialization attacks in cases where a message signing secret has been
-# leaked.
-#
-# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
-# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
-# with `Marshal` so that legacy messages can still be read.
-#
-# In Rails 7.2, the default will become `:json` which serializes and
-# deserializes with `ActiveSupport::JSON` only.
-#
-# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
-# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
-# can roundtrip some Ruby types that are not supported by JSON, and may provide
-# improved performance, but it requires the `msgpack` gem.
-#
-# For more information, see
-# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
-#
-# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
-# that have not yet been upgraded must be able to read messages from upgraded
-# servers, first deploy without changing the serializer, then set the serializer
-# in a subsequent deploy.
-#++
-Rails.application.config.active_support.message_serializer = :json
-
-###
-# Enable a performance optimization that serializes message data and metadata
-# together. This changes the message format, so messages serialized this way
-# cannot be read by older versions of Rails. However, messages that use the old
-# format can still be read, regardless of whether this optimization is enabled.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read messages from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-#++
-# Rails.application.config.active_support.use_message_serializer_for_metadata = true
-
-###
-# Set the maximum size for Rails log files.
-#
-# `config.load_defaults 7.1` does not set this value for environments other than
-# development and test.
-#++
-# if Rails.env.local?
-#   Rails.application.config.log_file_size = 100 * 1024 * 1024
-# end
-
-###
-# Enable raising on assignment to attr_readonly attributes. The previous
-# behavior would allow assignment but silently not persist changes to the
-# database.
-#++
-# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
-
-###
-# Enable validating only parent-related columns for presence when the parent is mandatory.
-# The previous behavior was to validate the presence of the parent record, which performed an extra query
-# to get the parent every time the child record was updated, even when parent has not changed.
-#++
-# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
-
-###
-# Enable precompilation of `config.filter_parameters`. Precompilation can
-# improve filtering performance, depending on the quantity and types of filters.
-#++
-# Rails.application.config.precompile_filter_parameters = true
-
-###
-# Enable before_committed! callbacks on all enrolled records in a transaction.
-# The previous behavior was to only run the callbacks on the first copy of a record
-# if there were multiple copies of the same record enrolled in the transaction.
-#++
-# Rails.application.config.active_record.before_committed_on_all_records = true
-
-###
-# Disable automatic column serialization into YAML.
-# To keep the historic behavior, you can set it to `YAML`, however it is
-# recommended to explicitly define the serialization method for each column
-# rather than to rely on a global default.
-#++
-# Rails.application.config.active_record.default_column_serializer = nil
-
-###
-# Enable a performance optimization that serializes Active Record models
-# in a faster and more compact way.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read caches from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-#++
-# Rails.application.config.active_record.marshalling_format_version = 7.1
-
-###
-# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
-# This matches the behaviour of all other callbacks.
-# In previous versions of Rails, they ran in the inverse order.
-#++
-# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
-
-###
-# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
-#++
-# Rails.application.config.active_record.commit_transaction_on_non_local_return = true
-
-###
-# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
-#++
-# Rails.application.config.active_record.generate_secure_token_on = :initialize
-
-###
-# ** Please read carefully, this must be configured in config/application.rb **
-#
-# Change the format of the cache entry.
-#
-# Changing this default means that all new cache entries added to the cache
-# will have a different format that is not supported by Rails 7.0
-# applications.
-#
-# Only change this value after your application is fully deployed to Rails 7.1
-# and you have no plans to rollback.
-# When you're ready to change format, add this to `config/application.rb` (NOT
-# this file):
-#   config.active_support.cache_format_version = 7.1
-
-
-###
-# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
-#++
-# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-
-###
-# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
-# platform.
-#
-# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
-# sanitizers if they are supported, else fall back to HTML4 sanitizers.
-#
-# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
-#++
-# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-
-
-###
-# Configure the log level used by the DebugExceptions middleware when logging
-# uncaught exceptions during requests.
-#++
-# Rails.application.config.action_dispatch.debug_exception_log_level = :error
-
-
-###
-# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
-# parsers.
-#
-# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
-#
-# In previous versions of Rails, these test helpers always used an HTML4 parser.
-#++
-# Rails.application.config.dom_testing_default_html_version = :html5

config/initializers/permissions_policy.rb

@@ -1,13 +1,11 @@
-# Be sure to restart your server when you modify this file.
-
 # Define an application-wide HTTP permissions policy. For further
-# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
-
+#
-# Rails.application.config.permissions_policy do |policy|
+# Rails.application.config.permissions_policy do |f|
-#   policy.camera      :none
+#   f.camera      :none
-#   policy.gyroscope   :none
+#   f.gyroscope   :none
-#   policy.microphone  :none
+#   f.microphone  :none
-#   policy.usb         :none
+#   f.usb         :none
-#   policy.fullscreen  :self
+#   f.fullscreen  :self
-#   policy.payment     :self, "https://secure.example.com"
+#   f.payment     :self, "https://secure.example.com"
 # end

config/puma.rb

@@ -41,4 +41,3 @@ pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
-plugin :solid_queue

config/solid_queue.yml

@@ -1,25 +0,0 @@
-default: &default
-  dispatchers:
-    - polling_interval: 1
-      batch_size: 500
-      recurring_tasks:
-        sync:
-          class: SyncJob
-          schedule: every 5 minutes
-        sync:
-          class: NotifyJob
-          schedule: every 2 hours
-  workers:
-    - queues: "*"
-      threads: 5
-      processes: 1
-      polling_interval: 0.1
-
-development:
- <<: *default
-
-test:
- <<: *default
-
-production:
- <<: *default

db/migrate/20240328095517_add_service_name_to_active_storage_blobs.active_storage.rb

@@ -1,22 +0,0 @@
-# This migration comes from active_storage (originally 20190112182829)
-class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
-  def up
-    return unless table_exists?(:active_storage_blobs)
-
-    unless column_exists?(:active_storage_blobs, :service_name)
-      add_column :active_storage_blobs, :service_name, :string
-
-      if configured_service = ActiveStorage::Blob.service.name
-        ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
-      end
-
-      change_column :active_storage_blobs, :service_name, :string, null: false
-    end
-  end
-
-  def down
-    return unless table_exists?(:active_storage_blobs)
-
-    remove_column :active_storage_blobs, :service_name
-  end
-end

db/migrate/20240328095518_create_active_storage_variant_records.active_storage.rb

@@ -1,27 +0,0 @@
-# This migration comes from active_storage (originally 20191206030411)
-class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
-  def change
-    return unless table_exists?(:active_storage_blobs)
-
-    # Use Active Record's configured type for primary key
-    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
-      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
-      t.string :variation_digest, null: false
-
-      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
-      t.foreign_key :active_storage_blobs, column: :blob_id
-    end
-  end
-
-  private
-    def primary_key_type
-      config = Rails.configuration.generators
-      config.options[config.orm][:primary_key_type] || :primary_key
-    end
-
-    def blobs_primary_key_type
-      pkey_name = connection.primary_key(:active_storage_blobs)
-      pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
-      pkey_column.bigint? ? :bigint : pkey_column.type
-    end
-end

db/migrate/20240328095519_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb

@@ -1,8 +0,0 @@
-# This migration comes from active_storage (originally 20211119233751)
-class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
-  def change
-    return unless table_exists?(:active_storage_blobs)
-
-    change_column_null(:active_storage_blobs, :checksum, true)
-  end
-end

db/migrate/20240328101456_create_solid_queue_tables.solid_queue.rb

@@ -1,101 +0,0 @@
-# This migration comes from solid_queue (originally 20231211200639)
-class CreateSolidQueueTables < ActiveRecord::Migration[7.0]
-  def change
-    create_table :solid_queue_jobs do |t|
-      t.string :queue_name, null: false
-      t.string :class_name, null: false, index: true
-      t.text :arguments
-      t.integer :priority, default: 0, null: false
-      t.string :active_job_id, index: true
-      t.datetime :scheduled_at
-      t.datetime :finished_at, index: true
-      t.string :concurrency_key
-
-      t.timestamps
-
-      t.index [ :queue_name, :finished_at ], name: "index_solid_queue_jobs_for_filtering"
-      t.index [ :scheduled_at, :finished_at ], name: "index_solid_queue_jobs_for_alerting"
-    end
-
-    create_table :solid_queue_scheduled_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.string :queue_name, null: false
-      t.integer :priority, default: 0, null: false
-      t.datetime :scheduled_at, null: false
-
-      t.datetime :created_at, null: false
-
-      t.index [ :scheduled_at, :priority, :job_id ], name: "index_solid_queue_dispatch_all"
-    end
-
-    create_table :solid_queue_ready_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.string :queue_name, null: false
-      t.integer :priority, default: 0, null: false
-
-      t.datetime :created_at, null: false
-
-      t.index [ :priority, :job_id ], name: "index_solid_queue_poll_all"
-      t.index [ :queue_name, :priority, :job_id ], name: "index_solid_queue_poll_by_queue"
-    end
-
-    create_table :solid_queue_claimed_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.bigint :process_id
-      t.datetime :created_at, null: false
-
-      t.index [ :process_id, :job_id ]
-    end
-
-    create_table :solid_queue_blocked_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.string :queue_name, null: false
-      t.integer :priority, default: 0, null: false
-      t.string :concurrency_key, null: false
-      t.datetime :expires_at, null: false
-
-      t.datetime :created_at, null: false
-
-      t.index [ :expires_at, :concurrency_key ], name: "index_solid_queue_blocked_executions_for_maintenance"
-    end
-
-    create_table :solid_queue_failed_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.text :error
-      t.datetime :created_at, null: false
-    end
-
-    create_table :solid_queue_pauses do |t|
-      t.string :queue_name, null: false, index: { unique: true }
-      t.datetime :created_at, null: false
-    end
-
-    create_table :solid_queue_processes do |t|
-      t.string :kind, null: false
-      t.datetime :last_heartbeat_at, null: false, index: true
-      t.bigint :supervisor_id, index: true
-
-      t.integer :pid, null: false
-      t.string :hostname
-      t.text :metadata
-
-      t.datetime :created_at, null: false
-    end
-
-    create_table :solid_queue_semaphores do |t|
-      t.string :key, null: false, index: { unique: true }
-      t.integer :value, default: 1, null: false
-      t.datetime :expires_at, null: false, index: true
-
-      t.timestamps
-
-      t.index [ :key, :value ], name: "index_solid_queue_semaphores_on_key_and_value"
-    end
-
-    add_foreign_key :solid_queue_blocked_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-    add_foreign_key :solid_queue_claimed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-    add_foreign_key :solid_queue_failed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-    add_foreign_key :solid_queue_ready_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-    add_foreign_key :solid_queue_scheduled_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-  end
-end

db/migrate/20240328101457_add_missing_index_to_blocked_executions.solid_queue.rb

@@ -1,6 +0,0 @@
-# This migration comes from solid_queue (originally 20240110143450)
-class AddMissingIndexToBlockedExecutions < ActiveRecord::Migration[7.1]
-  def change
-    add_index :solid_queue_blocked_executions, [ :concurrency_key, :priority, :job_id ], name: "index_solid_queue_blocked_executions_for_release"
-  end
-end

db/migrate/20240328101458_create_recurring_executions.solid_queue.rb

@@ -1,15 +0,0 @@
-# This migration comes from solid_queue (originally 20240218110712)
-class CreateRecurringExecutions < ActiveRecord::Migration[7.1]
-  def change
-    create_table :solid_queue_recurring_executions do |t|
-      t.references :job, index: { unique: true }, null: false
-      t.string :task_key, null: false
-      t.datetime :run_at, null: false
-      t.datetime :created_at, null: false
-
-      t.index [ :task_key, :run_at ], unique: true
-    end
-
-    add_foreign_key :solid_queue_recurring_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_03_28_101458) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_12_103042) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -68,109 +68,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_28_101458) do
     t.index ["member_id"], name: "index_payments_on_member_id"
   end
 
-  create_table "solid_queue_blocked_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.string "queue_name", null: false
-    t.integer "priority", default: 0, null: false
-    t.string "concurrency_key", null: false
-    t.datetime "expires_at", null: false
-    t.datetime "created_at", null: false
-    t.index ["concurrency_key", "priority", "job_id"], name: "index_solid_queue_blocked_executions_for_release"
-    t.index ["expires_at", "concurrency_key"], name: "index_solid_queue_blocked_executions_for_maintenance"
-    t.index ["job_id"], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
-  end
-
-  create_table "solid_queue_claimed_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.bigint "process_id"
-    t.datetime "created_at", null: false
-    t.index ["job_id"], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
-    t.index ["process_id", "job_id"], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
-  end
-
-  create_table "solid_queue_failed_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.text "error"
-    t.datetime "created_at", null: false
-    t.index ["job_id"], name: "index_solid_queue_failed_executions_on_job_id", unique: true
-  end
-
-  create_table "solid_queue_jobs", force: :cascade do |t|
-    t.string "queue_name", null: false
-    t.string "class_name", null: false
-    t.text "arguments"
-    t.integer "priority", default: 0, null: false
-    t.string "active_job_id"
-    t.datetime "scheduled_at"
-    t.datetime "finished_at"
-    t.string "concurrency_key"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["active_job_id"], name: "index_solid_queue_jobs_on_active_job_id"
-    t.index ["class_name"], name: "index_solid_queue_jobs_on_class_name"
-    t.index ["finished_at"], name: "index_solid_queue_jobs_on_finished_at"
-    t.index ["queue_name", "finished_at"], name: "index_solid_queue_jobs_for_filtering"
-    t.index ["scheduled_at", "finished_at"], name: "index_solid_queue_jobs_for_alerting"
-  end
-
-  create_table "solid_queue_pauses", force: :cascade do |t|
-    t.string "queue_name", null: false
-    t.datetime "created_at", null: false
-    t.index ["queue_name"], name: "index_solid_queue_pauses_on_queue_name", unique: true
-  end
-
-  create_table "solid_queue_processes", force: :cascade do |t|
-    t.string "kind", null: false
-    t.datetime "last_heartbeat_at", null: false
-    t.bigint "supervisor_id"
-    t.integer "pid", null: false
-    t.string "hostname"
-    t.text "metadata"
-    t.datetime "created_at", null: false
-    t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at"
-    t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id"
-  end
-
-  create_table "solid_queue_ready_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.string "queue_name", null: false
-    t.integer "priority", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.index ["job_id"], name: "index_solid_queue_ready_executions_on_job_id", unique: true
-    t.index ["priority", "job_id"], name: "index_solid_queue_poll_all"
-    t.index ["queue_name", "priority", "job_id"], name: "index_solid_queue_poll_by_queue"
-  end
-
-  create_table "solid_queue_recurring_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.string "task_key", null: false
-    t.datetime "run_at", null: false
-    t.datetime "created_at", null: false
-    t.index ["job_id"], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
-    t.index ["task_key", "run_at"], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
-  end
-
-  create_table "solid_queue_scheduled_executions", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.string "queue_name", null: false
-    t.integer "priority", default: 0, null: false
-    t.datetime "scheduled_at", null: false
-    t.datetime "created_at", null: false
-    t.index ["job_id"], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
-    t.index ["scheduled_at", "priority", "job_id"], name: "index_solid_queue_dispatch_all"
-  end
-
-  create_table "solid_queue_semaphores", force: :cascade do |t|
-    t.string "key", null: false
-    t.integer "value", default: 1, null: false
-    t.datetime "expires_at", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["expires_at"], name: "index_solid_queue_semaphores_on_expires_at"
-    t.index ["key", "value"], name: "index_solid_queue_semaphores_on_key_and_value"
-    t.index ["key"], name: "index_solid_queue_semaphores_on_key", unique: true
-  end
-
   create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -197,10 +94,4 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_28_101458) do
   add_foreign_key "contributions", "members"
   add_foreign_key "notifications", "members"
   add_foreign_key "payments", "members"
-  add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
-  add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
-  add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
-  add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
-  add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
-  add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
 end

lib/tasks/saucy.rake

@@ -2,12 +2,12 @@ desc "Application specific tasks"
 namespace :saucy do
   desc "Background sync operations"
   task sync: :environment do
-    SyncJob.perform_now
+    Member.reset_all_status!
   end
 
   desc "Send daily email notifications"
   task notify: :environment do
-    NotifyJob.perform_now
+    Notification.send_scheduled_for_today
   end
 
   desc "Import data from CiviCRM XML files"