From 7846f63aeac38dff7699db4e0e60e2c5ccc3dccc Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@adaptiveconstant.com>
Date: Fri, 13 Oct 2023 07:22:38 +0200
Subject: [PATCH] Reduced cyclic compilation dependencies

---
 core/frameworks/signal/_public.ex | 29 +++++++++++++++--------------
 core/test/test_helper.exs         |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/frameworks/signal/_public.ex b/core/frameworks/signal/_public.ex
index cafd1dcf6..297db4049 100644
--- a/core/frameworks/signal/_public.ex
+++ b/core/frameworks/signal/_public.ex
@@ -4,18 +4,18 @@ defmodule Frameworks.Signal.Public do
   import Frameworks.Utililty.PrettyPrint
 
   @signal_handlers [
-    Core.Accounts.SignalHandlers,
-    Core.Mailer.SignalHandlers,
-    Core.WebPush.SignalHandlers,
-    Core.APNS.SignalHandlers,
-    Systems.Observatory.Switch,
-    Systems.Project.Switch,
-    Systems.Assignment.Switch,
-    Systems.Workflow.Switch,
-    Systems.Pool.Switch,
-    Systems.Student.Switch,
-    Systems.Campaign.Switch,
-    Systems.NextAction.Switch
+    "Core.Accounts.SignalHandlers",
+    "Core.Mailer.SignalHandlers",
+    "Core.WebPush.SignalHandlers",
+    "Core.APNS.SignalHandlers",
+    "Systems.Observatory.Switch",
+    "Systems.Project.Switch",
+    "Systems.Assignment.Switch",
+    "Systems.Workflow.Switch",
+    "Systems.Pool.Switch",
+    "Systems.Student.Switch",
+    "Systems.Campaign.Switch",
+    "Systems.NextAction.Switch"
   ]
 
   def dispatch(signal, message) do
@@ -46,7 +46,8 @@ defmodule Frameworks.Signal.Public do
   end
 
   defp signal_handlers do
-    Application.get_env(:core, :signal_handlers, []) ++
-      @signal_handlers
+    (Application.get_env(:core, :signal_handlers, []) ++
+       @signal_handlers)
+    |> Enum.map(fn module_name -> String.to_atom("Elixir.#{module_name}") end)
   end
 end
diff --git a/core/test/test_helper.exs b/core/test/test_helper.exs
index 2b2934be9..4ed23dca8 100644
--- a/core/test/test_helper.exs
+++ b/core/test/test_helper.exs
@@ -9,7 +9,7 @@ Application.put_env(:core, :web_push_backend, Core.WebPush.MockBackend)
 Mox.defmock(Core.APNS.MockBackend, for: Core.APNS.Backend)
 Application.put_env(:core, :apns_backend, Core.APNS.MockBackend)
 
-Application.put_env(:core, :signal_handlers, [Frameworks.Signal.TestHelper])
+Application.put_env(:core, :signal_handlers, ["Frameworks.Signal.TestHelper"])
 
 Application.put_env(
   :core,