From f113a4350175c921431368de9f24177d14a69be8 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Wed, 12 Jun 2024 15:52:32 +0200 Subject: [PATCH] fix(chalice): fixed create clickmap card & generate clickmap's chart (#2270) --- api/chalicelib/core/click_maps.py | 19 +++++++++++-------- api/chalicelib/core/custom_metrics.py | 4 ++-- ee/api/chalicelib/core/custom_metrics.py | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/api/chalicelib/core/click_maps.py b/api/chalicelib/core/click_maps.py index 84f27ef8e..6cf30d3c3 100644 --- a/api/chalicelib/core/click_maps.py +++ b/api/chalicelib/core/click_maps.py @@ -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() diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 6a7f0da99..2a2a639d6 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -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()), diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index 5f53cad52..3a1086a59 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -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()),