From d36a68431565eb4d54da5ac1e36e6a8df4a7fc24 Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Wed, 24 Feb 2021 19:01:27 +0100
Subject: [PATCH] config: fix zeitwekr warning when reloading the app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Turns out we need not only to load the Job constants later, but also
not to do the same work twice – otherwise we'll get a

> ApiEntreprise::Job constant is already defined

when attempting to re-define the constant.
---
 .../initializers/active_job_compatibility.rb  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/config/initializers/active_job_compatibility.rb b/config/initializers/active_job_compatibility.rb
index a73482124..9a90cfe50 100644
--- a/config/initializers/active_job_compatibility.rb
+++ b/config/initializers/active_job_compatibility.rb
@@ -11,22 +11,24 @@
 # - but let's keep these for a while to make external integrators's life easier.
 # To keep some margin, let's say this file can be safely deleted in May 2021.)
 
-require 'excon'
-
 Rails.application.reloader.to_prepare do
-  module ApiEntreprise
-    Job = APIEntreprise::Job
-    AssociationJob = APIEntreprise::AssociationJob
-    AttestationFiscaleJob = APIEntreprise::AttestationFiscaleJob
-    AttestationSocialeJob = APIEntreprise::AttestationSocialeJob
-    BilansBdfJob = APIEntreprise::BilansBdfJob
-    EffectifsAnnuelsJob = APIEntreprise::EffectifsAnnuelsJob
-    EffectifsJob = APIEntreprise::EffectifsJob
-    EntrepriseJob = APIEntreprise::EntrepriseJob
-    ExercicesJob = APIEntreprise::ExercicesJob
-  end
+  if !defined?(ApiEntreprise)
+    require 'excon'
 
-  module Cron
-    FixMissingAntivirusAnalysis = FixMissingAntivirusAnalysisJob
+    module ApiEntreprise
+      Job = APIEntreprise::Job
+      AssociationJob = APIEntreprise::AssociationJob
+      AttestationFiscaleJob = APIEntreprise::AttestationFiscaleJob
+      AttestationSocialeJob = APIEntreprise::AttestationSocialeJob
+      BilansBdfJob = APIEntreprise::BilansBdfJob
+      EffectifsAnnuelsJob = APIEntreprise::EffectifsAnnuelsJob
+      EffectifsJob = APIEntreprise::EffectifsJob
+      EntrepriseJob = APIEntreprise::EntrepriseJob
+      ExercicesJob = APIEntreprise::ExercicesJob
+    end
+
+    module Cron
+      FixMissingAntivirusAnalysis = FixMissingAntivirusAnalysisJob
+    end
   end
 end