From 7d093ce06dc5627f1f699ccec08f24476e0bb4c3 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 31 Jan 2023 18:30:07 +0100 Subject: [PATCH] feat(chalice): support filter events before card creating for table of urls --- api/chalicelib/core/custom_metrics.py | 2 ++ api/chalicelib/core/sessions.py | 6 +++--- ee/api/chalicelib/core/custom_metrics.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 381b86553..5f7e831ad 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -241,6 +241,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema): s.filter.page = data.page if len(data.filters) > 0: s.filter.filters += data.filters + if len(data.events) > 0: + s.filter.events += data.events results.append({"seriesId": None, "seriesName": s.name, **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)}) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index fa1aa6aca..512c05769 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -204,9 +204,9 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ ORDER BY s.session_id desc) AS filtred_sessions ORDER BY {sort} {data.order}, issue_score DESC) AS full_sessions;""", full_args) - print("--------------------") - print(main_query) - print("--------------------") + # print("--------------------") + # print(main_query) + # print("--------------------") try: cur.execute(main_query) except Exception as err: diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index 2f7c39b99..bd652ba01 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -270,6 +270,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema): s.filter.page = data.page if len(data.filters) > 0: s.filter.filters += data.filters + if len(data.events) > 0: + s.filter.events += data.events results.append({"seriesId": None, "seriesName": s.name, **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)})