From cfa5caa9706430df1ad9191317d22ca008babe97 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 14 Aug 2024 13:29:41 +0100 Subject: [PATCH] feat(chalice): table of referrers&requests by users count --- api/schemas/schemas.py | 3 ++- ee/api/chalicelib/core/sessions_exp.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/schemas/schemas.py b/api/schemas/schemas.py index b5a7276d9d..ef9bd8df68 100644 --- a/api/schemas/schemas.py +++ b/api/schemas/schemas.py @@ -1178,7 +1178,8 @@ def __transform(self): def __validator(self): if self.metric_of not in (MetricOfTable.ISSUES, MetricOfTable.USER_BROWSER, MetricOfTable.USER_DEVICE, MetricOfTable.USER_COUNTRY, - MetricOfTable.VISITED_URL): + MetricOfTable.VISITED_URL, MetricOfTable.REFERRER, + MetricOfTable.FETCH): assert self.metric_format == MetricExtendedFormatType.SESSION_COUNT, \ f'metricFormat:{MetricExtendedFormatType.USER_COUNT.value} is not supported for this metricOf' return self diff --git a/ee/api/chalicelib/core/sessions_exp.py b/ee/api/chalicelib/core/sessions_exp.py index 2c870be494..8798d67f1e 100644 --- a/ee/api/chalicelib/core/sessions_exp.py +++ b/ee/api/chalicelib/core/sessions_exp.py @@ -469,8 +469,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de main_query = f"""SELECT COUNT(DISTINCT {main_col}) OVER () AS main_count, {main_col} AS name, count(DISTINCT user_id) AS user_count - FROM (SELECT s.user_id AS user_id, - {extra_col} + FROM (SELECT s.user_id AS user_id {extra_col} {query_part} WHERE isNotNull(user_id) AND user_id != '') AS filtred_sessions