diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 5f7cd23af..bbb0e6670 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -183,10 +183,24 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f main_query = cur.mogrify(f"""SELECT COUNT(DISTINCT s.session_id) AS count_sessions, COUNT(DISTINCT s.user_uuid) AS count_users {query_part};""", full_args) + elif data.group_by_user: + main_query = cur.mogrify(f"""SELECT COUNT(*) AS count, jsonb_agg(users_sessions) FILTER ( WHERE rn <= 200 ) AS sessions + FROM (SELECT user_id, + count(full_sessions) AS user_sessions_count, + jsonb_agg(full_sessions) FILTER (WHERE rn <= 1) AS last_session, + ROW_NUMBER() OVER (ORDER BY count(full_sessions) DESC) AS rn + FROM (SELECT *, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY start_ts DESC) AS rn + FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS} + {query_part} + ORDER BY s.session_id desc) AS filtred_sessions + ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions + GROUP BY user_id + ORDER BY user_sessions_count DESC) AS users_sessions;""", + full_args) else: main_query = cur.mogrify(f"""SELECT COUNT(full_sessions) AS count, COALESCE(JSONB_AGG(full_sessions) FILTER (WHERE rn <= 200), '[]'::JSONB) AS sessions - FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY favorite DESC, issue_score DESC, session_id desc, start_ts desc) AS rn FROM - (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS} + FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY favorite DESC, issue_score DESC, session_id desc, start_ts desc) AS rn + FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS} {query_part} ORDER BY s.session_id desc) AS filtred_sessions ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions;""", @@ -199,11 +213,11 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f # ORDER BY favorite DESC, issue_score DESC, {sort} {order};""", # full_args) - # print("--------------------") - # print(main_query) + print("--------------------") + print(main_query) cur.execute(main_query) - # print("--------------------") + print("--------------------") if count_only: return helper.dict_to_camel_case(cur.fetchone()) sessions = cur.fetchone() @@ -221,7 +235,7 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f if errors_only: return sessions - if data.sort is not None and data.sort != "session_id": + if not data.group_by_user and data.sort is not None and data.sort != "session_id": sessions = sorted(sessions, key=lambda s: s[helper.key_to_snake_case(data.sort)], reverse=data.order.upper() == "DESC") return { diff --git a/api/schemas.py b/api/schemas.py index 11d882e79..a9e1059a1 100644 --- a/api/schemas.py +++ b/api/schemas.py @@ -470,7 +470,7 @@ class _SessionSearchEventRaw(__MixedSearchFilter): value: Union[str, List[str]] = Field(...) type: Union[EventType, PerformanceEventType] = Field(...) operator: SearchEventOperator = Field(...) - source: Optional[Union[ErrorSource,List[Union[int, str]]]] = Field(default=ErrorSource.js_exception) + source: Optional[Union[ErrorSource, List[Union[int, str]]]] = Field(default=ErrorSource.js_exception) sourceOperator: Optional[MathOperator] = Field(None) @root_validator @@ -536,6 +536,7 @@ class SessionsSearchPayloadSchema(BaseModel): sort: str = Field(default="startTs") order: str = Field(default="DESC") events_order: Optional[SearchEventOrder] = Field(default=SearchEventOrder._then) + group_by_user: bool = Field(default=False) class Config: alias_generator = attribute_to_camel_case @@ -577,6 +578,7 @@ class FunnelSearchPayloadSchema(FlatSessionsSearchPayloadSchema): range_value: Optional[str] = Field(None) sort: Optional[str] = Field(None) order: Optional[str] = Field(None) + group_by_user: Optional[bool] = Field(default=False, const=True) class Config: alias_generator = attribute_to_camel_case @@ -601,6 +603,7 @@ class FunnelInsightsPayloadSchema(FlatSessionsSearchPayloadSchema): # class FunnelInsightsPayloadSchema(SessionsSearchPayloadSchema): sort: Optional[str] = Field(None) order: Optional[str] = Field(None) + group_by_user: Optional[bool] = Field(default=False, const=True) class MetricPayloadSchema(BaseModel): @@ -634,6 +637,7 @@ class CustomMetricSeriesFilterSchema(FlatSessionsSearchPayloadSchema): endDate: Optional[int] = Field(None) sort: Optional[str] = Field(None) order: Optional[str] = Field(None) + group_by_user: Optional[bool] = Field(default=False, const=True) class CustomMetricCreateSeriesSchema(BaseModel):