From 63f8b176f61a5edffc76636a9c66e039bb6cf167 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Fri, 25 Oct 2024 15:33:59 +0200 Subject: [PATCH] fix(chalice): fixed heatmap for EE (#2684) --- ee/api/chalicelib/core/heatmaps.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/api/chalicelib/core/heatmaps.py b/ee/api/chalicelib/core/heatmaps.py index 463f9b264..848761251 100644 --- a/ee/api/chalicelib/core/heatmaps.py +++ b/ee/api/chalicelib/core/heatmaps.py @@ -198,7 +198,7 @@ if not config("EXP_SESSIONS_SEARCH", cast=bool, default=False): cur.execute(main_query) except Exception as err: logger.warning("--------- CLICK MAP BEST URL SEARCH QUERY EXCEPTION -----------") - logger.warning(main_query.decode('UTF-8')) + logger.warning(main_query) logger.warning("--------- PAYLOAD -----------") logger.warning(full_args) logger.warning("--------------------") @@ -369,7 +369,7 @@ else: op = sh.get_sql_operator(location_condition.operator) full_args = {**full_args, **sh.multi_values(location_condition.value, value_key=f_k)} sub_condition.append( - sh.multi_conditions(f'path {op} %({f_k})s', location_condition.value, is_not=False, + sh.multi_conditions(f'url_path {op} %({f_k})s', location_condition.value, is_not=False, value_key=f_k)) with ch_client.ClickHouseClient() as cur: main_query = cur.format(f"""WITH paths AS (SELECT DISTINCT url_path @@ -392,7 +392,7 @@ else: url = cur.execute(main_query) except Exception as err: logger.warning("--------- CLICK MAP BEST URL SEARCH QUERY EXCEPTION CH-----------") - logger.warning(main_query.decode('UTF-8')) + logger.warning(main_query) logger.warning("--------- PAYLOAD -----------") logger.warning(full_args) logger.warning("--------------------") @@ -506,8 +506,8 @@ else: try: session = cur.execute(main_query) except Exception as err: - logger.warning("--------- CLICK MAP GET SELECTED SESSION QUERY EXCEPTION -----------") - logger.warning(main_query.decode('UTF-8')) + logger.warning("--------- CLICK MAP GET SELECTED SESSION QUERY EXCEPTION CH-----------") + logger.warning(main_query) raise err if len(session) > 0: session = session[0]