From e31dd82b92b90c66fd8e2e6e5f9d205a3151beb1 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Tue, 12 Apr 2022 19:44:34 +0200
Subject: [PATCH] feat(api): optimized get session replay

---
 api/chalicelib/core/resources.py    | 10 +++++-----
 api/chalicelib/core/sessions.py     |  2 +-
 ee/api/chalicelib/core/resources.py |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/chalicelib/core/resources.py b/api/chalicelib/core/resources.py
index 6a7e395f8..d85e56b6f 100644
--- a/api/chalicelib/core/resources.py
+++ b/api/chalicelib/core/resources.py
@@ -1,23 +1,23 @@
 from chalicelib.utils import helper, pg_client
 
 
-def get_by_session_id(session_id):
+def get_by_session_id(session_id, project_id):
     with pg_client.PostgresClient() as cur:
         ch_query = """\
                 SELECT
                       timestamp AS datetime,
                       url,
                       type,
-                      duration,
+                      resources.duration AS duration,
                       ttfb,
                       header_size,
                       encoded_body_size,
                       decoded_body_size,
                       success,
                       COALESCE(status, CASE WHEN success THEN 200 END) AS status
-                FROM events.resources
-                WHERE session_id = %(session_id)s;"""
-        params = {"session_id": session_id}
+                FROM events.resources INNER JOIN sessions USING (session_id)
+                WHERE session_id = %(session_id)s AND project_id= %(project_id)s;"""
+        params = {"session_id": session_id, "project_id": project_id}
         cur.execute(cur.mogrify(ch_query, params))
         rows = cur.fetchall()
         return helper.list_to_camel_case(rows)
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index 83cad2ad7..c0fdf57bd 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -94,7 +94,7 @@ def get_by_id2_pg(project_id, session_id, user_id, full_data=False, include_fav_
                     data['userEvents'] = events.get_customs_by_sessionId2_pg(project_id=project_id,
                                                                              session_id=session_id)
                     data['mobsUrl'] = sessions_mobs.get_web(sessionId=session_id)
-                    data['resources'] = resources.get_by_session_id(session_id=session_id)
+                    data['resources'] = resources.get_by_session_id(session_id=session_id, project_id=project_id)
 
                 data['metadata'] = __group_metadata(project_metadata=data.pop("projectMetadata"), session=data)
                 data['issues'] = issues.get_by_session_id(session_id=session_id)
diff --git a/ee/api/chalicelib/core/resources.py b/ee/api/chalicelib/core/resources.py
index 332d3709a..4e4f1c4e8 100644
--- a/ee/api/chalicelib/core/resources.py
+++ b/ee/api/chalicelib/core/resources.py
@@ -3,14 +3,14 @@ from chalicelib.utils import ch_client
 from chalicelib.utils.TimeUTC import TimeUTC
 
 
-def get_by_session_id(session_id):
+def get_by_session_id(session_id, project_id):
     with ch_client.ClickHouseClient() as ch:
         ch_query = """\
                 SELECT
                        datetime,url,type,duration,ttfb,header_size,encoded_body_size,decoded_body_size,success,coalesce(status,if(success, 200, status)) AS status
                 FROM resources
-                WHERE session_id = toUInt64(%(session_id)s);"""
-        params = {"session_id": session_id}
+                WHERE session_id = toUInt64(%(session_id)s) AND project_id=%(project_id)s;"""
+        params = {"session_id": session_id, "project_id": project_id}
         rows = ch.execute(query=ch_query, params=params)
         results = []
         for r in rows: