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

feat(api): custom metrics for user_os, user_browser, user_device, user_country, user_id

Browse source
This commit is contained in:
Taha Yassine Kraiem 2022-02-25 18:09:47 +01:00
parent 35ccc18cbe
commit df5772d487
3 changed files with 78 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/chalicelib/core/custom_metrics.py
View file

@ -6,20 +6,22 @@ from chalicelib.utils import helper, pg_client
from chalicelib.utils.TimeUTC import TimeUTC from chalicelib.utils.TimeUTC import TimeUTC
def try_live(project_id, data: schemas.TryCustomMetricsSchema): def __try_live(project_id, data: schemas.TryCustomMetricsSchema):
results = [] results = []
for i, s in enumerate(data.series): for i, s in enumerate(data.series):
s.filter.startDate = data.startDate s.filter.startDate = data.startDate
s.filter.endDate = data.endDate s.filter.endDate = data.endDate
results.append(sessions.search2_series(data=s.filter, project_id=project_id, density=data.density, results.append(sessions.search2_series(data=s.filter, project_id=project_id, density=data.density,
view_type=data.viewType)) view_type=data.viewType, metric_type=data.metricType,
metric_of=data.metricOf))
if data.viewType == schemas.MetricViewType.progress: if data.viewType == schemas.MetricViewType.progress:
r = {"count": results[-1]} r = {"count": results[-1]}
diff = s.filter.endDate - s.filter.startDate diff = s.filter.endDate - s.filter.startDate
s.filter.startDate = data.endDate s.filter.startDate = data.endDate
s.filter.endDate = data.endDate - diff s.filter.endDate = data.endDate - diff
r["previousCount"] = sessions.search2_series(data=s.filter, project_id=project_id, density=data.density, r["previousCount"] = sessions.search2_series(data=s.filter, project_id=project_id, density=data.density,
view_type=data.viewType) view_type=data.viewType, metric_type=data.metricType,
metric_of=data.metricOf)
r["countProgress"] = helper.__progress(old_val=r["previousCount"], new_val=r["count"]) r["countProgress"] = helper.__progress(old_val=r["previousCount"], new_val=r["count"])
r["seriesName"] = s.name if s.name else i + 1 r["seriesName"] = s.name if s.name else i + 1
r["seriesId"] = s.series_id if s.series_id else None r["seriesId"] = s.series_id if s.series_id else None
@ -28,8 +30,8 @@ def try_live(project_id, data: schemas.TryCustomMetricsSchema):
def merged_live(project_id, data: schemas.TryCustomMetricsSchema): def merged_live(project_id, data: schemas.TryCustomMetricsSchema):
series_charts = try_live(project_id=project_id, data=data) series_charts = __try_live(project_id=project_id, data=data)
if data.viewType == schemas.MetricViewType.progress: if data.viewType == schemas.MetricViewType.progress or data.metricType == schemas.MetricType.table:
return series_charts return series_charts
results = [{}] * len(series_charts[0]) results = [{}] * len(series_charts[0])
for i in range(len(results)): for i in range(len(results)):
@ -44,7 +46,7 @@ def make_chart(project_id, user_id, metric_id, data: schemas.CustomMetricChartPa
if metric is None: if metric is None:
return None return None
metric: schemas.TryCustomMetricsSchema = schemas.TryCustomMetricsSchema.parse_obj({**data.dict(), **metric}) metric: schemas.TryCustomMetricsSchema = schemas.TryCustomMetricsSchema.parse_obj({**data.dict(), **metric})
series_charts = try_live(project_id=project_id, data=metric) series_charts = __try_live(project_id=project_id, data=metric)
if data.viewType == schemas.MetricViewType.progress: if data.viewType == schemas.MetricViewType.progress:
return series_charts return series_charts
results = [{}] * len(series_charts[0]) results = [{}] * len(series_charts[0])

88
api/chalicelib/core/sessions.py
View file

@ -198,7 +198,7 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
ROW_NUMBER() OVER (ORDER BY count(full_sessions) DESC) AS rn 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 *, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY start_ts DESC) AS rn
FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS} FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}
{"," if len(meta_keys)>0 else ""}{",".join([f'metadata_{m["index"]}' for m in meta_keys])} {"," if len(meta_keys) > 0 else ""}{",".join([f'metadata_{m["index"]}' for m in meta_keys])}
{query_part} {query_part}
ORDER BY s.session_id desc) AS filtred_sessions ORDER BY s.session_id desc) AS filtred_sessions
ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions
@ -210,7 +210,7 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
main_query = cur.mogrify(f"""SELECT COUNT(full_sessions) AS count, COALESCE(JSONB_AGG(full_sessions) FILTER (WHERE rn <= 200), '[]'::JSONB) AS sessions 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 *, 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 DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}
{"," if len(meta_keys)>0 else ""}{",".join([f'metadata_{m["index"]}' for m in meta_keys])} {"," if len(meta_keys) > 0 else ""}{",".join([f'metadata_{m["index"]}' for m in meta_keys])}
{query_part} {query_part}
ORDER BY s.session_id desc) AS filtred_sessions ORDER BY s.session_id desc) AS filtred_sessions
ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions;""", ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions;""",
@ -264,40 +264,74 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
} }
@dev.timed
def search2_series(data: schemas.SessionsSearchPayloadSchema, project_id: int, density: int, def search2_series(data: schemas.SessionsSearchPayloadSchema, project_id: int, density: int,
view_type: schemas.MetricViewType): view_type: schemas.MetricViewType, metric_type: schemas.MetricType, metric_of: schemas.MetricOfType):
step_size = int(metrics_helper.__get_step_size(endTimestamp=data.endDate, startTimestamp=data.startDate, step_size = int(metrics_helper.__get_step_size(endTimestamp=data.endDate, startTimestamp=data.startDate,
density=density, factor=1, decimal=True)) density=density, factor=1, decimal=True))
full_args, query_part, sort = search_query_parts(data=data, error_status=None, errors_only=False, full_args, query_part, sort = search_query_parts(data=data, error_status=None, errors_only=False,
favorite_only=False, issue=None, project_id=project_id, favorite_only=False, issue=None, project_id=project_id,
user_id=None) user_id=None)
full_args["step_size"] = step_size full_args["step_size"] = step_size
sessions = []
with pg_client.PostgresClient() as cur: with pg_client.PostgresClient() as cur:
if view_type == schemas.MetricViewType.line_chart: if metric_type == schemas.MetricType.timeseries:
main_query = cur.mogrify(f"""WITH full_sessions AS (SELECT DISTINCT ON(s.session_id) s.session_id, s.start_ts if view_type == schemas.MetricViewType.line_chart:
{query_part}) main_query = cur.mogrify(f"""WITH full_sessions AS (SELECT DISTINCT ON(s.session_id) s.session_id, s.start_ts
SELECT generated_timestamp AS timestamp, {query_part})
COUNT(s) AS count SELECT generated_timestamp AS timestamp,
FROM generate_series(%(startDate)s, %(endDate)s, %(step_size)s) AS generated_timestamp COUNT(s) AS count
LEFT JOIN LATERAL ( SELECT 1 AS s FROM generate_series(%(startDate)s, %(endDate)s, %(step_size)s) AS generated_timestamp
FROM full_sessions LEFT JOIN LATERAL ( SELECT 1 AS s
WHERE start_ts >= generated_timestamp FROM full_sessions
AND start_ts <= generated_timestamp + %(step_size)s) AS sessions ON (TRUE) WHERE start_ts >= generated_timestamp
GROUP BY generated_timestamp AND start_ts <= generated_timestamp + %(step_size)s) AS sessions ON (TRUE)
ORDER BY generated_timestamp;""", full_args) GROUP BY generated_timestamp
else: ORDER BY generated_timestamp;""", full_args)
main_query = cur.mogrify(f"""SELECT count(DISTINCT s.session_id) AS count else:
{query_part};""", full_args) main_query = cur.mogrify(f"""SELECT count(DISTINCT s.session_id) AS count
{query_part};""", full_args)
# print("--------------------")
# print(main_query)
cur.execute(main_query)
# print("--------------------")
if view_type == schemas.MetricViewType.line_chart:
sessions = cur.fetchall()
else:
sessions = cur.fetchone()["count"]
elif metric_type == schemas.MetricType.table:
if isinstance(metric_of, schemas.MetricOfType):
main_col = "user_id"
if metric_of == schemas.MetricOfType.user_country:
main_col = "user_country"
elif metric_of == schemas.MetricOfType.user_device:
main_col = "user_device"
elif metric_of == schemas.MetricOfType.user_browser:
main_col = "user_browser"
main_query = cur.mogrify(f"""SELECT COUNT(*) AS count, COALESCE(JSONB_AGG(users_sessions) FILTER ( WHERE rn <= 200 ), '[]'::JSONB) AS values
FROM (SELECT {main_col} AS name,
count(full_sessions) AS session_count,
ROW_NUMBER() OVER (ORDER BY count(full_sessions) DESC) AS rn
FROM (SELECT *
FROM (SELECT DISTINCT ON(s.session_id) s.session_id, s.user_uuid,
s.user_id, s.user_os,
s.user_browser, s.user_device,
s.user_device_type, s.user_country
{query_part}
ORDER BY s.session_id desc) AS filtred_sessions
) AS full_sessions
GROUP BY {main_col}
ORDER BY session_count DESC) AS users_sessions;""",
full_args)
# print("--------------------")
# print(main_query)
# print("--------------------")
cur.execute(main_query)
sessions = cur.fetchone()
for s in sessions["values"]:
s.pop("rn")
sessions["values"] = helper.list_to_camel_case(sessions["values"])
# print("--------------------")
# print(main_query)
cur.execute(main_query)
# print("--------------------")
if view_type == schemas.MetricViewType.line_chart:
sessions = cur.fetchall()
else:
sessions = cur.fetchone()["count"]
return sessions return sessions

10
api/schemas.py
View file

@ -725,13 +725,21 @@ class CustomMetricRawPayloadSchema2(CustomMetricRawPayloadSchema):
metric_id: int = Field(...) metric_id: int = Field(...)
class MetricOfType(str, Enum):
user_os = FilterType.user_os
user_browser = FilterType.user_browser
user_device = FilterType.user_device
user_country = FilterType.user_country
user_id = FilterType.user_id
class CustomMetricChartPayloadSchema(CustomMetricRawPayloadSchema): class CustomMetricChartPayloadSchema(CustomMetricRawPayloadSchema):
startDate: int = Field(TimeUTC.now(-7)) startDate: int = Field(TimeUTC.now(-7))
endDate: int = Field(TimeUTC.now()) endDate: int = Field(TimeUTC.now())
density: int = Field(7) density: int = Field(7)
viewType: MetricViewType = Field(MetricViewType.line_chart) viewType: MetricViewType = Field(MetricViewType.line_chart)
metricType: MetricType = Field(MetricType.timeseries) metricType: MetricType = Field(MetricType.timeseries)
groupField: Optional[Union[FilterType]] = Field(None) metricOf: MetricOfType = Field(MetricOfType.user_id)
class CustomMetricChartPayloadSchema2(CustomMetricChartPayloadSchema): class CustomMetricChartPayloadSchema2(CustomMetricChartPayloadSchema):