From 15b1e6c76717b5f189f8d68b3800e95fb8525bcd Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 26 May 2025 13:24:16 +0200 Subject: [PATCH] fix(chalice): fixed total-sessions and total-users count for all table cards in CH --- api/chalicelib/core/sessions/sessions_ch.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/api/chalicelib/core/sessions/sessions_ch.py b/api/chalicelib/core/sessions/sessions_ch.py index fb5457932..e64555d72 100644 --- a/api/chalicelib/core/sessions/sessions_ch.py +++ b/api/chalicelib/core/sessions/sessions_ch.py @@ -240,8 +240,10 @@ 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 session_id) AS total, - COALESCE(SUM(count(DISTINCT session_id)) OVER (), 0) AS total_count - FROM (SELECT s.session_id AS session_id {extra_col} + any(total_count) as total_count + FROM (SELECT s.session_id AS session_id, + count(DISTINCT s.session_id) OVER () AS total_count + {extra_col} {query_part}) AS filtred_sessions {extra_where} GROUP BY {main_col} @@ -251,8 +253,10 @@ 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 total, - COALESCE(SUM(count(DISTINCT user_id)) OVER (), 0) AS total_count - FROM (SELECT s.user_id AS user_id {extra_col} + any(total_count) AS total_count + FROM (SELECT s.user_id AS user_id, + count(DISTINCT s.user_id) OVER () AS total_count + {extra_col} {query_part} WHERE isNotNull(user_id) AND notEmpty(user_id)) AS filtred_sessions