From 1110ea3bd6f242249408f793db111be62bee485d Mon Sep 17 00:00:00 2001
From: SdgJlbl <sarah.diot-girard@owkin.com>
Date: Tue, 11 Jul 2023 09:34:25 +0200
Subject: [PATCH] chore: move the event handling to its own app

Signed-off-by: SdgJlbl <sarah.diot-girard@owkin.com>
---
 backend/backend/settings/common.py                            | 1 +
 backend/{substrapp => }/events/__init__.py                    | 0
 backend/{substrapp => }/events/handler_compute_engine.py      | 0
 backend/{substrapp => }/events/health.py                      | 0
 backend/{substrapp => events}/management/commands/consume.py  | 4 ++--
 backend/{substrapp => }/events/reactor.py                     | 4 ++--
 backend/{substrapp => }/events/tests/__init__.py              | 0
 .../events/tests/test_handler_compute_engine.py               | 2 +-
 8 files changed, 6 insertions(+), 5 deletions(-)
 rename backend/{substrapp => }/events/__init__.py (100%)
 rename backend/{substrapp => }/events/handler_compute_engine.py (100%)
 rename backend/{substrapp => }/events/health.py (100%)
 rename backend/{substrapp => events}/management/commands/consume.py (89%)
 rename backend/{substrapp => }/events/reactor.py (98%)
 rename backend/{substrapp => }/events/tests/__init__.py (100%)
 rename backend/{substrapp => }/events/tests/test_handler_compute_engine.py (99%)

diff --git a/backend/backend/settings/common.py b/backend/backend/settings/common.py
index bc34f2a9c..bf0dc58fe 100644
--- a/backend/backend/settings/common.py
+++ b/backend/backend/settings/common.py
@@ -50,6 +50,7 @@
     "django_celery_results",
     "rest_framework",
     "rest_framework_simplejwt.token_blacklist",
+    "events",
     "substrapp",
     "organization",
     "users",
diff --git a/backend/substrapp/events/__init__.py b/backend/events/__init__.py
similarity index 100%
rename from backend/substrapp/events/__init__.py
rename to backend/events/__init__.py
diff --git a/backend/substrapp/events/handler_compute_engine.py b/backend/events/handler_compute_engine.py
similarity index 100%
rename from backend/substrapp/events/handler_compute_engine.py
rename to backend/events/handler_compute_engine.py
diff --git a/backend/substrapp/events/health.py b/backend/events/health.py
similarity index 100%
rename from backend/substrapp/events/health.py
rename to backend/events/health.py
diff --git a/backend/substrapp/management/commands/consume.py b/backend/events/management/commands/consume.py
similarity index 89%
rename from backend/substrapp/management/commands/consume.py
rename to backend/events/management/commands/consume.py
index 75bb3fdb2..807dc2542 100644
--- a/backend/substrapp/management/commands/consume.py
+++ b/backend/events/management/commands/consume.py
@@ -3,8 +3,8 @@
 import structlog
 from django.core.management.base import BaseCommand
 
-from substrapp.events import health
-from substrapp.events.reactor import consume
+from events import health
+from events.reactor import consume
 
 logger = structlog.get_logger("events")
 
diff --git a/backend/substrapp/events/reactor.py b/backend/events/reactor.py
similarity index 98%
rename from backend/substrapp/events/reactor.py
rename to backend/events/reactor.py
index 4df8b5f8e..cc91e3581 100644
--- a/backend/substrapp/events/reactor.py
+++ b/backend/events/reactor.py
@@ -9,9 +9,9 @@
 import orchestrator.common_pb2 as common_pb2
 import orchestrator.computetask_pb2 as computetask_pb2
 import orchestrator.event_pb2 as event_pb2
+from events import handler_compute_engine
+from events import health
 from orchestrator import model_pb2
-from substrapp.events import handler_compute_engine
-from substrapp.events import health
 from substrapp.models import WorkerLastEvent
 from substrapp.orchestrator import get_orchestrator_client
 from substrapp.tasks.tasks_compute_plan import queue_delete_cp_pod_and_dirs_and_optionally_images
diff --git a/backend/substrapp/events/tests/__init__.py b/backend/events/tests/__init__.py
similarity index 100%
rename from backend/substrapp/events/tests/__init__.py
rename to backend/events/tests/__init__.py
diff --git a/backend/substrapp/events/tests/test_handler_compute_engine.py b/backend/events/tests/test_handler_compute_engine.py
similarity index 99%
rename from backend/substrapp/events/tests/test_handler_compute_engine.py
rename to backend/events/tests/test_handler_compute_engine.py
index c32c6f645..9089db128 100644
--- a/backend/substrapp/events/tests/test_handler_compute_engine.py
+++ b/backend/events/tests/test_handler_compute_engine.py
@@ -3,7 +3,7 @@
 
 import orchestrator
 import orchestrator.mock as orc_mock
-from substrapp.events import handler_compute_engine
+from events import handler_compute_engine
 
 
 @pytest.mark.parametrize(