jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(chalice): refactored code

Browse source
This commit is contained in:
Taha Yassine Kraiem 2025-03-28 15:44:22 +01:00 • committed by Kraiem Taha Yassine
parent e95bdab478
commit 9f464e3b41
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/chalicelib/core/sessions/sessions_ch.py
View file

@ -48,8 +48,8 @@ def search2_series(data: schemas.SessionsSearchPayloadSchema, project_id: int, d
query = f"""SELECT gs.generate_series AS timestamp, query = f"""SELECT gs.generate_series AS timestamp,
COALESCE(COUNT(DISTINCT processed_sessions.user_id),0) AS count COALESCE(COUNT(DISTINCT processed_sessions.user_id),0) AS count
FROM generate_series(%(startDate)s, %(endDate)s, %(step_size)s) AS gs FROM generate_series(%(startDate)s, %(endDate)s, %(step_size)s) AS gs
LEFT JOIN (SELECT multiIf(s.user_id IS NOT NULL AND s.user_id != '', s.user_id, LEFT JOIN (SELECT multiIf(isNotNull(s.user_id) AND notEmpty(s.user_id), s.user_id,
s.user_anonymous_id IS NOT NULL AND s.user_anonymous_id != '', isNotNull(s.user_anonymous_id) AND notEmpty(s.user_anonymous_id),
s.user_anonymous_id, toString(s.user_uuid)) AS user_id, s.user_anonymous_id, toString(s.user_uuid)) AS user_id,
s.datetime AS datetime s.datetime AS datetime
{query_part}) AS processed_sessions ON(TRUE) {query_part}) AS processed_sessions ON(TRUE)
@ -253,7 +253,7 @@ def search2_table(data: schemas.SessionsSearchPayloadSchema, project_id: int, de
FROM (SELECT s.user_id AS user_id {extra_col} FROM (SELECT s.user_id AS user_id {extra_col}
{query_part} {query_part}
WHERE isNotNull(user_id) WHERE isNotNull(user_id)
AND user_id != '') AS filtred_sessions AND notEmpty(user_id)) AS filtred_sessions
{extra_where} {extra_where}
GROUP BY {main_col} GROUP BY {main_col}
ORDER BY total DESC ORDER BY total DESC
@ -1210,7 +1210,7 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu
elif event_type == schemas.EventType.EVENT: elif event_type == schemas.EventType.EVENT:
event_from = event_from % f"{MAIN_EVENTS_TABLE} AS main " event_from = event_from % f"{MAIN_EVENTS_TABLE} AS main "
_column = events.EventType.CLICK.column _column = events.EventType.CLICK.column
event_where.append(f"main.`$event_name`=%({e_k})s AND main.session_id != ''") event_where.append(f"main.`$event_name`=%({e_k})s AND notEmpty(main.session_id)")
events_conditions.append({"type": event_where[-1], "condition": ""}) events_conditions.append({"type": event_where[-1], "condition": ""})
else: else:

2
api/chalicelib/core/sessions/sessions_search_ch.py
View file

@ -262,7 +262,7 @@ def search_by_metadata(tenant_id, user_id, m_key, m_value, project_id=None):
FROM public.user_favorite_sessions FROM public.user_favorite_sessions
WHERE user_favorite_sessions.user_id = %(userId)s WHERE user_favorite_sessions.user_id = %(userId)s
) AS favorite_sessions USING (session_id) ) AS favorite_sessions USING (session_id)
WHERE s.project_id = %(id)s AND s.duration IS NOT NULL AND s.{col_name} = %(value)s WHERE s.project_id = %(id)s AND isNotNull(s.duration) AND s.{col_name} = %(value)s
) AS full_sessions ) AS full_sessions
ORDER BY favorite DESC, issue_score DESC ORDER BY favorite DESC, issue_score DESC
LIMIT 10 LIMIT 10