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

feat(api): custom metrics fixed get progress by series

Browse source 
feat(api): custom metrics fixed progress try
This commit is contained in:
Taha Yassine Kraiem 2022-02-06 19:25:53 +01:00
parent c43306ff32
commit 8a1f3d2547
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ 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 s in 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,
@ -21,12 +21,16 @@ def try_live(project_id, data: schemas.TryCustomMetricsSchema):
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)
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
r["seriesId"] = s.series_id if s.series_id else None
results[-1] = r results[-1] = r
return results return results
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:
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)):
for j, series_chart in enumerate(series_charts): for j, series_chart in enumerate(series_charts):
@ -41,6 +45,8 @@ def make_chart(project_id, user_id, metric_id, data: schemas.CustomMetricChartPa
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:
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)):
for j, series_chart in enumerate(series_charts): for j, series_chart in enumerate(series_charts):