From 61d6e017089e8eb0e9bd398a9d8a011e3865b0b0 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 3 Mar 2022 16:30:00 +0100 Subject: [PATCH] feat(api): reverted countProgress formula --- api/chalicelib/core/custom_metrics.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index d4e0b6b45..785324591 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -22,9 +22,9 @@ def __try_live(project_id, data: schemas.CreateCustomMetricsSchema): r["previousCount"] = sessions.search2_series(data=s.filter, project_id=project_id, density=data.density, view_type=data.view_type, metric_type=data.metric_type, metric_of=data.metric_of, metric_value=data.metric_value) - # r["countProgress"] = helper.__progress(old_val=r["previousCount"], new_val=r["count"]) - r["countProgress"] = ((r["count"] - r["previousCount"]) / r["previousCount"]) * 100 \ - if r["previousCount"] > 0 else 0 + r["countProgress"] = helper.__progress(old_val=r["previousCount"], new_val=r["count"]) + # r["countProgress"] = ((r["count"] - r["previousCount"]) / r["previousCount"]) * 100 \ + # if r["previousCount"] > 0 else 0 r["seriesName"] = s.name if s.name else i + 1 r["seriesId"] = s.series_id if s.series_id else None results[-1] = r @@ -63,8 +63,7 @@ def get_sessions(project_id, user_id, metric_id, data: schemas.CustomMetricSessi metric = get(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if metric is None: return None - metric: schemas.CreateCustomMetricsSchema = schemas.CreateCustomMetricsSchema.parse_obj( - {**data.dict(), **metric}) + metric: schemas.CreateCustomMetricsSchema = schemas.CreateCustomMetricsSchema.parse_obj({**data.dict(), **metric}) results = [] for s in metric.series: s.filter.startDate = data.startDate