From ef2f6a90b971d8546853a691a801ad81b91088d0 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 27 Apr 2023 17:30:37 +0200
Subject: [PATCH] feat(crons): reorganized crons

---
 api/app.py                                       | 3 +--
 api/{routers => }/crons/__init__.py              | 0
 api/{routers => }/crons/core_crons.py            | 0
 api/{routers => }/crons/core_dynamic_crons.py    | 0
 ee/api/.gitignore                                | 4 ++--
 ee/api/app.py                                    | 4 +---
 ee/api/app_crons.py                              | 2 +-
 ee/api/clean-dev.sh                              | 4 ++--
 ee/api/{routers => }/crons/core_dynamic_crons.py | 0
 ee/api/{routers => }/crons/ee_crons.py           | 0
 10 files changed, 7 insertions(+), 10 deletions(-)
 rename api/{routers => }/crons/__init__.py (100%)
 rename api/{routers => }/crons/core_crons.py (100%)
 rename api/{routers => }/crons/core_dynamic_crons.py (100%)
 rename ee/api/{routers => }/crons/core_dynamic_crons.py (100%)
 rename ee/api/{routers => }/crons/ee_crons.py (100%)

diff --git a/api/app.py b/api/app.py
index 50cd7342f..e02a1655c 100644
--- a/api/app.py
+++ b/api/app.py
@@ -11,8 +11,7 @@ from starlette.responses import StreamingResponse
 from chalicelib.utils import helper
 from chalicelib.utils import pg_client
 from routers import core, core_dynamic
-from routers.crons import core_crons
-from routers.crons import core_dynamic_crons
+from crons import core_crons, core_dynamic_crons
 from routers.subs import insights, metrics, v1_api, health
 
 loglevel = config("LOGLEVEL", default=logging.INFO)
diff --git a/api/routers/crons/__init__.py b/api/crons/__init__.py
similarity index 100%
rename from api/routers/crons/__init__.py
rename to api/crons/__init__.py
diff --git a/api/routers/crons/core_crons.py b/api/crons/core_crons.py
similarity index 100%
rename from api/routers/crons/core_crons.py
rename to api/crons/core_crons.py
diff --git a/api/routers/crons/core_dynamic_crons.py b/api/crons/core_dynamic_crons.py
similarity index 100%
rename from api/routers/crons/core_dynamic_crons.py
rename to api/crons/core_dynamic_crons.py
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 9484964ea..ab9b50029 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -244,7 +244,7 @@ Pipfile.lock
 /chalicelib/utils/strings.py
 /chalicelib/utils/TimeUTC.py
 /routers/app/__init__.py
-/routers/crons/__init__.py
+/crons/__init__.py
 /routers/subs/__init__.py
 /routers/__init__.py
 /chalicelib/core/assist.py
@@ -253,7 +253,7 @@ Pipfile.lock
 /build.sh
 /routers/base.py
 /routers/core.py
-/routers/crons/core_crons.py
+/crons/core_crons.py
 /db_changes.sql
 /Dockerfile_bundle
 /entrypoint.bundle.sh
diff --git a/ee/api/app.py b/ee/api/app.py
index 82cead468..cba8ddf31 100644
--- a/ee/api/app.py
+++ b/ee/api/app.py
@@ -15,9 +15,7 @@ from chalicelib.utils import events_queue
 from chalicelib.utils import helper
 from chalicelib.utils import pg_client
 from routers import core, core_dynamic, ee, saml
-from routers.crons import core_crons
-from routers.crons import core_dynamic_crons
-from routers.crons import ee_crons
+from crons import core_crons, ee_crons, core_dynamic_crons
 from routers.subs import insights, metrics, v1_api_ee
 from routers.subs import v1_api, health
 
diff --git a/ee/api/app_crons.py b/ee/api/app_crons.py
index f4770c2b2..6b7621f59 100644
--- a/ee/api/app_crons.py
+++ b/ee/api/app_crons.py
@@ -2,7 +2,7 @@ print("============= CRONS =============")
 import asyncio
 import sys
 
-from routers.crons import core_dynamic_crons
+from crons import core_dynamic_crons
 
 ACTIONS = {
     "TELEMETRY": core_dynamic_crons.telemetry_cron,
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index 22e30a1c1..8a1f6a263 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -64,7 +64,7 @@ rm -rf ./chalicelib/utils/sql_helper.py
 rm -rf ./chalicelib/utils/strings.py
 rm -rf ./chalicelib/utils/TimeUTC.py
 rm -rf ./routers/app/__init__.py
-rm -rf ./routers/crons/__init__.py
+rm -rf ./crons/__init__.py
 rm -rf ./routers/subs/__init__.py
 rm -rf ./routers/__init__.py
 rm -rf ./chalicelib/core/assist.py
@@ -74,7 +74,7 @@ rm -rf ./build.sh
 rm -rf ./build_crons.sh
 rm -rf ./routers/base.py
 rm -rf ./routers/core.py
-rm -rf ./routers/crons/core_crons.py
+rm -rf ./crons/core_crons.py
 rm -rf ./db_changes.sql
 rm -rf ./Dockerfile_bundle
 rm -rf ./entrypoint.bundle.sh
diff --git a/ee/api/routers/crons/core_dynamic_crons.py b/ee/api/crons/core_dynamic_crons.py
similarity index 100%
rename from ee/api/routers/crons/core_dynamic_crons.py
rename to ee/api/crons/core_dynamic_crons.py
diff --git a/ee/api/routers/crons/ee_crons.py b/ee/api/crons/ee_crons.py
similarity index 100%
rename from ee/api/routers/crons/ee_crons.py
rename to ee/api/crons/ee_crons.py