From 25892f594c2dc00e204a571d73afe51ef5df87ea Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 8 Apr 2024 18:27:20 +0200
Subject: [PATCH 1/2] fix(jobs): don't enqueue crons to default adapter anymore

---
 app/jobs/cron/cron_job.rb                    | 4 ++--
 config/initializers/transition_to_sidekiq.rb | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/jobs/cron/cron_job.rb b/app/jobs/cron/cron_job.rb
index 2938024e0..e7f4c66e1 100644
--- a/app/jobs/cron/cron_job.rb
+++ b/app/jobs/cron/cron_job.rb
@@ -11,7 +11,7 @@ class Cron::CronJob < ApplicationJob
       remove if cron_expression_changed?
 
       if !scheduled?
-        if SIDEKIQ_ENABLED
+        if queue_adapter == :sidekiq
           Sidekiq::Cron::Job.create(name: name, cron: cron_expression, class: name)
         else
           set(cron: cron_expression).perform_later
@@ -36,7 +36,7 @@ class Cron::CronJob < ApplicationJob
     end
 
     def enqueued_cron_job
-      if SIDEKIQ_ENABLED
+      if queue_adapter == :sidekiq
         sidekiq_cron_job
       else
         delayed_job
diff --git a/config/initializers/transition_to_sidekiq.rb b/config/initializers/transition_to_sidekiq.rb
index 3f9d33160..6dd570e85 100644
--- a/config/initializers/transition_to_sidekiq.rb
+++ b/config/initializers/transition_to_sidekiq.rb
@@ -53,5 +53,9 @@ if Rails.env.production? && SIDEKIQ_ENABLED
     class Migrations::BackfillStableIdJob
       self.queue_adapter = :sidekiq
     end
+
+    class Cron::CronJob < ApplicationJob
+      self.queue_adapter = :sidekiq
+    end
   end
 end

From e21636e371579b7306d4837ccf0314d681667229 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 8 Apr 2024 18:34:45 +0200
Subject: [PATCH 2/2] chore: don't load anymore delayed_cron_job by default

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 47bf1af2a..03173c548 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'chunky_png'
 gem 'clamav-client', require: 'clamav/client'
 gem 'daemons'
 gem 'deep_cloneable' # Enable deep clone of active record models
-gem 'delayed_cron_job' # Cron jobs
+gem 'delayed_cron_job', require: false # Cron jobs
 gem 'delayed_job_active_record'
 gem 'delayed_job_web'
 gem 'devise', git: 'https://github.com/heartcombo/devise.git', ref: "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1" # Gestion des comptes utilisateurs, drop ref on next release: 4.9.4