From 1bb8f3a7b32f1964384405fab8b8050f7fc52bc7 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 16 May 2025 16:32:36 +0200
Subject: [PATCH] refactor(chalice): refactored issues refactor(chalice):
 support issues in CH

---
 api/chalicelib/core/events/events_pg.py       |  2 +-
 api/chalicelib/core/issues/__init__.py        | 11 +++++++
 api/chalicelib/core/issues/issues_ch.py       | 31 +++++++++++++++++++
 .../core/{issues.py => issues/issues_pg.py}   |  0
 api/chalicelib/core/metrics/custom_metrics.py |  2 +-
 .../core/sessions/sessions_replay.py          |  3 +-
 api/routers/core.py                           |  3 +-
 7 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 api/chalicelib/core/issues/__init__.py
 create mode 100644 api/chalicelib/core/issues/issues_ch.py
 rename api/chalicelib/core/{issues.py => issues/issues_pg.py} (100%)

diff --git a/api/chalicelib/core/events/events_pg.py b/api/chalicelib/core/events/events_pg.py
index 62c599b6e..d481e6259 100644
--- a/api/chalicelib/core/events/events_pg.py
+++ b/api/chalicelib/core/events/events_pg.py
@@ -2,7 +2,7 @@ from functools import cache
 from typing import Optional
 
 import schemas
-from chalicelib.core import issues
+from chalicelib.core.issues import issues
 from chalicelib.core.autocomplete import autocomplete
 from chalicelib.core.sessions import sessions_metas
 from chalicelib.utils import pg_client, helper
diff --git a/api/chalicelib/core/issues/__init__.py b/api/chalicelib/core/issues/__init__.py
new file mode 100644
index 000000000..bdb52cb86
--- /dev/null
+++ b/api/chalicelib/core/issues/__init__.py
@@ -0,0 +1,11 @@
+import logging
+
+from decouple import config
+
+logger = logging.getLogger(__name__)
+
+if config("EXP_EVENTS", cast=bool, default=False):
+    logger.info(">>> Using experimental issues")
+    from . import issues_ch as issues
+else:
+    from . import issues_pg as issues
diff --git a/api/chalicelib/core/issues/issues_ch.py b/api/chalicelib/core/issues/issues_ch.py
new file mode 100644
index 000000000..d705e3288
--- /dev/null
+++ b/api/chalicelib/core/issues/issues_ch.py
@@ -0,0 +1,31 @@
+from chalicelib.utils import ch_client, helper
+from .issues_pg import get_all_types
+
+
+def get(project_id, issue_id):
+    with ch_client.ClickHouseClient() as cur:
+        query = cur.format(query=""" \
+                                 SELECT *
+                                 FROM product_analytics.events
+                                 WHERE project_id = %(project_id)s
+                                   AND issue_id = %(issue_id)s;""",
+                           parameters={"project_id": project_id, "issue_id": issue_id})
+        data = cur.execute(query=query)
+        if data is not None and len(data) > 0:
+            data = data[0]
+            data["title"] = helper.get_issue_title(data["type"])
+    return helper.dict_to_camel_case(data)
+
+
+def get_by_session_id(session_id, project_id, issue_type=None):
+    with ch_client.ClickHouseClient as cur:
+        query = cur.format(query=f"""\
+                            SELECT *
+                            FROM product_analytics.events
+                            WHERE session_id = %(session_id)s 
+                                AND project_id= %(project_id)s
+                                {"AND issue_type = %(type)s" if issue_type is not None else ""}
+                            ORDER BY created_at;""",
+                           parameters={"session_id": session_id, "project_id": project_id, "type": issue_type})
+        data = cur.execute(query)
+        return helper.list_to_camel_case(data)
diff --git a/api/chalicelib/core/issues.py b/api/chalicelib/core/issues/issues_pg.py
similarity index 100%
rename from api/chalicelib/core/issues.py
rename to api/chalicelib/core/issues/issues_pg.py
diff --git a/api/chalicelib/core/metrics/custom_metrics.py b/api/chalicelib/core/metrics/custom_metrics.py
index c73bd282f..2a2dd3b30 100644
--- a/api/chalicelib/core/metrics/custom_metrics.py
+++ b/api/chalicelib/core/metrics/custom_metrics.py
@@ -4,7 +4,7 @@ import logging
 from fastapi import HTTPException, status
 
 import schemas
-from chalicelib.core import issues
+from chalicelib.core.issues import issues
 from chalicelib.core.errors import errors
 from chalicelib.core.metrics import heatmaps, product_analytics, funnels
 from chalicelib.core.sessions import sessions, sessions_search
diff --git a/api/chalicelib/core/sessions/sessions_replay.py b/api/chalicelib/core/sessions/sessions_replay.py
index b0ea40613..6602cc434 100644
--- a/api/chalicelib/core/sessions/sessions_replay.py
+++ b/api/chalicelib/core/sessions/sessions_replay.py
@@ -1,5 +1,6 @@
 import schemas
-from chalicelib.core import metadata, issues, assist, canvas, user_testing
+from chalicelib.core import metadata, assist, canvas, user_testing
+from chalicelib.core.issues import issues
 from chalicelib.core.events import events, events_mobile
 from . import sessions_mobs, sessions_devtool
 from chalicelib.core.errors.modules import errors_helper
diff --git a/api/routers/core.py b/api/routers/core.py
index 42ba9b281..260df30f2 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -4,8 +4,9 @@ from decouple import config
 from fastapi import Depends, Body, BackgroundTasks
 
 import schemas
-from chalicelib.core import events, projects, issues, metadata, reset_password, log_tools, \
+from chalicelib.core import events, projects, metadata, reset_password, log_tools, \
     announcements, weekly_report, assist, mobile, tenants, boarding, notifications, webhook, users, saved_search, tags
+from chalicelib.core.issues import issues
 from chalicelib.core.sourcemaps import sourcemaps
 from chalicelib.core.metrics import custom_metrics
 from chalicelib.core.alerts import alerts