From 502303aee79bfb6392f1f84fbc7d5625740ec900 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Thu, 6 Mar 2025 17:11:48 +0100
Subject: [PATCH] refactor(chalice): refactored product analytics

---
 api/chalicelib/core/metrics/__init__.py               |  5 +----
 api/chalicelib/core/metrics/heatmaps/__init__.py      | 11 +++++++++++
 .../core/metrics/{ => heatmaps}/heatmaps.py           |  0
 .../core/metrics/{ => heatmaps}/heatmaps_ch.py        |  0
 .../core/metrics/product_analytics/__init__.py        | 10 ++++++++++
 .../{ => product_analytics}/product_analytics.py      |  0
 .../{ => product_analytics}/product_analytics_ch.py   |  0
 ee/api/.gitignore                                     |  6 ++----
 ee/api/clean-dev.sh                                   |  6 ++----
 9 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 api/chalicelib/core/metrics/heatmaps/__init__.py
 rename api/chalicelib/core/metrics/{ => heatmaps}/heatmaps.py (100%)
 rename api/chalicelib/core/metrics/{ => heatmaps}/heatmaps_ch.py (100%)
 create mode 100644 api/chalicelib/core/metrics/product_analytics/__init__.py
 rename api/chalicelib/core/metrics/{ => product_analytics}/product_analytics.py (100%)
 rename api/chalicelib/core/metrics/{ => product_analytics}/product_analytics_ch.py (100%)

diff --git a/api/chalicelib/core/metrics/__init__.py b/api/chalicelib/core/metrics/__init__.py
index 9906cb8bc..db7e95e33 100644
--- a/api/chalicelib/core/metrics/__init__.py
+++ b/api/chalicelib/core/metrics/__init__.py
@@ -6,8 +6,5 @@ logger = logging.getLogger(__name__)
 
 if config("EXP_METRICS", cast=bool, default=False):
     logger.info(">>> Using experimental metrics")
-    from chalicelib.core.metrics import heatmaps_ch as heatmaps
-    from chalicelib.core.metrics import product_analytics_ch as product_analytics
 else:
-    from chalicelib.core.metrics import heatmaps
-    from chalicelib.core.metrics import product_analytics
+    pass
\ No newline at end of file
diff --git a/api/chalicelib/core/metrics/heatmaps/__init__.py b/api/chalicelib/core/metrics/heatmaps/__init__.py
new file mode 100644
index 000000000..7f3ab4eda
--- /dev/null
+++ b/api/chalicelib/core/metrics/heatmaps/__init__.py
@@ -0,0 +1,11 @@
+import logging
+
+from decouple import config
+
+logger = logging.getLogger(__name__)
+
+if config("EXP_METRICS", cast=bool, default=False):
+    logger.info(">>> Using experimental heatmaps")
+    from .heatmaps_ch import *
+else:
+    from .heatmaps import *
diff --git a/api/chalicelib/core/metrics/heatmaps.py b/api/chalicelib/core/metrics/heatmaps/heatmaps.py
similarity index 100%
rename from api/chalicelib/core/metrics/heatmaps.py
rename to api/chalicelib/core/metrics/heatmaps/heatmaps.py
diff --git a/api/chalicelib/core/metrics/heatmaps_ch.py b/api/chalicelib/core/metrics/heatmaps/heatmaps_ch.py
similarity index 100%
rename from api/chalicelib/core/metrics/heatmaps_ch.py
rename to api/chalicelib/core/metrics/heatmaps/heatmaps_ch.py
diff --git a/api/chalicelib/core/metrics/product_analytics/__init__.py b/api/chalicelib/core/metrics/product_analytics/__init__.py
new file mode 100644
index 000000000..1f94cce71
--- /dev/null
+++ b/api/chalicelib/core/metrics/product_analytics/__init__.py
@@ -0,0 +1,10 @@
+import logging
+
+from decouple import config
+
+logger = logging.getLogger(__name__)
+if config("EXP_METRICS", cast=bool, default=False):
+    logger.info(">>> Using experimental product-analytics")
+    from .product_analytics_ch import *
+else:
+    from .product_analytics import *
diff --git a/api/chalicelib/core/metrics/product_analytics.py b/api/chalicelib/core/metrics/product_analytics/product_analytics.py
similarity index 100%
rename from api/chalicelib/core/metrics/product_analytics.py
rename to api/chalicelib/core/metrics/product_analytics/product_analytics.py
diff --git a/api/chalicelib/core/metrics/product_analytics_ch.py b/api/chalicelib/core/metrics/product_analytics/product_analytics_ch.py
similarity index 100%
rename from api/chalicelib/core/metrics/product_analytics_ch.py
rename to api/chalicelib/core/metrics/product_analytics/product_analytics_ch.py
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index a6c0601d2..2376ed1ac 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -198,10 +198,8 @@ Pipfile.lock
 /chalicelib/core/metrics/custom_metrics.py
 /chalicelib/core/metrics/dashboards.py
 /chalicelib/core/metrics/funnels.py
-/chalicelib/core/metrics/heatmaps.py
-/chalicelib/core/metrics/heatmaps_ch.py
-/chalicelib/core/metrics/product_analytics.py
-/chalicelib/core/metrics/product_analytics_ch.py
+/chalicelib/core/metrics/heatmaps
+/chalicelib/core/metrics/product_analytics
 /chalicelib/core/metrics/product_anaytics2.py
 /chalicelib/core/events.py
 /chalicelib/core/events_mobile.py
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index a915a2f60..8466565be 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -18,10 +18,8 @@ rm -rf ./chalicelib/core/countries.py
 rm -rf ./chalicelib/core/metrics/custom_metrics.py
 rm -rf ./chalicelib/core/metrics/funnels.py
 rm -rf ./chalicelib/core/metrics/dashboards.py
-rm -rf ./chalicelib/core/metrics/heatmaps.py
-rm -rf ./chalicelib/core/metrics/heatmaps_ch.py
-rm -rf ./chalicelib/core/metrics/product_analytics.py
-rm -rf ./chalicelib/core/metrics/product_analytics_ch.py
+rm -rf ./chalicelib/core/metrics/heatmaps
+rm -rf ./chalicelib/core/metrics/product_analytics
 rm -rf ./chalicelib/core/metrics/product_anaytics2.py
 rm -rf ./chalicelib/core/events.py
 rm -rf ./chalicelib/core/events_mobile.py