fix(chalice): fixed missing totalSessions in card-tables in EE (#2390)
* fix(chalice): fixed missing totalSessions in card-tables in EE * fix(chalice): fixed missing totalSessions in card-tables in EE
This commit is contained in:
parent
b3f545849a
commit
72afae226b
1 changed files with 6 additions and 2 deletions
|
|
@ -442,7 +442,8 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
|
||||||
if metric_format == schemas.MetricExtendedFormatType.session_count:
|
if metric_format == schemas.MetricExtendedFormatType.session_count:
|
||||||
main_query = f"""SELECT COUNT(DISTINCT {main_col}) OVER () AS main_count,
|
main_query = f"""SELECT COUNT(DISTINCT {main_col}) OVER () AS main_count,
|
||||||
{main_col} AS name,
|
{main_col} AS name,
|
||||||
count(DISTINCT session_id) AS session_count
|
count(DISTINCT session_id) AS session_count,
|
||||||
|
COALESCE(SUM(count(DISTINCT session_id)) OVER (), 0) AS total_sessions
|
||||||
FROM (SELECT s.session_id AS session_id,
|
FROM (SELECT s.session_id AS session_id,
|
||||||
{extra_col}
|
{extra_col}
|
||||||
{query_part}) AS filtred_sessions
|
{query_part}) AS filtred_sessions
|
||||||
|
|
@ -470,11 +471,14 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
|
||||||
logging.debug("--------------------")
|
logging.debug("--------------------")
|
||||||
sessions = cur.execute(main_query)
|
sessions = cur.execute(main_query)
|
||||||
count = 0
|
count = 0
|
||||||
|
total_sessions = 0
|
||||||
if len(sessions) > 0:
|
if len(sessions) > 0:
|
||||||
count = sessions[0]["main_count"]
|
count = sessions[0]["main_count"]
|
||||||
|
total_sessions = sessions[0]["total_sessions"]
|
||||||
for s in sessions:
|
for s in sessions:
|
||||||
s.pop("main_count")
|
s.pop("main_count")
|
||||||
sessions = {"count": count, "values": helper.list_to_camel_case(sessions)}
|
s.pop("total_sessions")
|
||||||
|
sessions = {"count": count, "totalSessions": total_sessions, "values": helper.list_to_camel_case(sessions)}
|
||||||
|
|
||||||
return sessions
|
return sessions
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue