jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(chalice): fixed create clickmap card & generate clickmap's chart

Browse source
This commit is contained in:
Taha Yassine Kraiem 2024-06-12 15:51:11 +02:00
parent c8be96dbdc
commit 415919a8fc
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
api/chalicelib/core/click_maps.py
View file

@ -1,7 +1,10 @@
import logging
import schemas
from chalicelib.core import sessions_mobs, sessions_legacy as sessions_search, events
from chalicelib.utils import pg_client, helper
logger = logging.getLogger(__name__)
SESSION_PROJECTION_COLS = """s.project_id,
s.session_id::text AS session_id,
s.user_uuid,
@ -53,17 +56,17 @@ def search_short_session(data: schemas.ClickMapSessionsSearch, project_id, user_
{query_part}
ORDER BY {data.sort} {data.order.value}
LIMIT 1;""", full_args)
# print("--------------------")
# print(main_query)
# print("--------------------")
logger.debug("--------------------")
logger.debug(main_query)
logger.debug("--------------------")
try:
cur.execute(main_query)
except Exception as err:
print("--------- CLICK MAP SHORT SESSION SEARCH QUERY EXCEPTION -----------")
print(main_query.decode('UTF-8'))
print("--------- PAYLOAD -----------")
print(data.model_dump_json())
print("--------------------")
logger.warning("--------- CLICK MAP SHORT SESSION SEARCH QUERY EXCEPTION -----------")
logger.warning(main_query.decode('UTF-8'))
logger.warning("--------- PAYLOAD -----------")
logger.warning(data.model_dump_json())
logger.warning("--------------------")
raise err
session = cur.fetchone()

4
api/chalicelib/core/custom_metrics.py
View file

@ -88,8 +88,8 @@ def __get_sessions_list(project_id, user_id, data: schemas.CardSchema):
def __get_click_map_chart(project_id, user_id, data: schemas.CardClickMap, include_mobs: bool = True):
if len(data.series) == 0:
return None
# this code is duplicating the clickmap filters when creating a card
# data.series[0].filter.filters += data.series[0].filter.events
data.series[0].filter.filters += data.series[0].filter.events
data.series[0].filter.events = []
return click_maps.search_short_session(project_id=project_id, user_id=user_id,
data=schemas.ClickMapSessionsSearch(
**data.series[0].filter.model_dump()),

4
ee/api/chalicelib/core/custom_metrics.py
View file

@ -99,8 +99,8 @@ def __get_sessions_list(project_id, user_id, data: schemas.CardSchema):
def __get_click_map_chart(project_id, user_id, data: schemas.CardClickMap, include_mobs: bool = True):
if len(data.series) == 0:
return None
# this code is duplicating the clickmap filters when creating a card
# data.series[0].filter.filters += data.series[0].filter.events
data.series[0].filter.filters += data.series[0].filter.events
data.series[0].filter.events = []
return click_maps.search_short_session(project_id=project_id, user_id=user_id,
data=schemas.ClickMapSessionsSearch(
**data.series[0].filter.model_dump()),