From fb167d09c0868d79b703f56e025daf808d0663c4 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 26 Jan 2023 14:59:11 +0100 Subject: [PATCH] feat(chalice): fixed card cast --- api/chalicelib/core/custom_metrics.py | 10 +++++----- ee/api/chalicelib/core/custom_metrics.py | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index bb46a54aa..944bebc4f 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -170,7 +170,7 @@ def make_chart(project_id, user_id, metric_id, data: schemas.CardChartSchema, def get_sessions(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): # raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False, include_data=True) - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if raw_metric is None: return None metric: schemas.CreateCardSchema = schemas.CreateCardSchema(**raw_metric) @@ -197,7 +197,7 @@ def get_sessions(project_id, user_id, metric_id, data: schemas.CardSessionsSchem def get_funnel_issues(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if raw_metric is None: return None metric: schemas.CreateCardSchema = schemas.CreateCardSchema(**raw_metric) @@ -214,7 +214,7 @@ def get_funnel_issues(project_id, user_id, metric_id, data: schemas.CardSessions def get_errors_list(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if raw_metric is None: return None metric: schemas.CreateCardSchema = schemas.CreateCardSchema(**raw_metric) @@ -569,13 +569,13 @@ def get_funnel_sessions_by_issue(user_id, project_id, metric_id, issue_id, def make_chart_from_card(project_id, user_id, metric_id, data: schemas.CardChartSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, include_data=True) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, include_data=True) if raw_metric is None: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="card not found") metric: schemas.CreateCardSchema = schemas.CreateCardSchema(**raw_metric) if metric.is_template: return get_predefined_metric(key=metric.metric_of, project_id=project_id, data=data.dict()) - elif __is_click_map(raw_metric) and raw_metric["data"]: + elif __is_click_map(metric) and raw_metric["data"]: keys = sessions_mobs. \ __get_mob_keys(project_id=project_id, session_id=raw_metric["data"]["sessionId"]) mob_exists = False diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index d3aff6822..eb47a767c 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -198,7 +198,8 @@ def make_chart(project_id, user_id, metric_id, data: schemas.CardChartSchema, def get_sessions(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False, include_data=True) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False, + include_data=True) if raw_metric is None: return None metric: schemas_ee.CreateCardSchema = schemas_ee.CreateCardSchema(**raw_metric) @@ -225,7 +226,7 @@ def get_sessions(project_id, user_id, metric_id, data: schemas.CardSessionsSchem def get_funnel_issues(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if raw_metric is None: return None metric: schemas_ee.CreateCardSchema = schemas_ee.CreateCardSchema(**raw_metric) @@ -242,7 +243,7 @@ def get_funnel_issues(project_id, user_id, metric_id, data: schemas.CardSessions def get_errors_list(project_id, user_id, metric_id, data: schemas.CardSessionsSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, flatten=False) if raw_metric is None: return None metric: schemas_ee.CreateCardSchema = schemas_ee.CreateCardSchema(**raw_metric) @@ -622,13 +623,13 @@ def get_funnel_sessions_by_issue(user_id, project_id, metric_id, issue_id, def make_chart_from_card(project_id, user_id, metric_id, data: schemas.CardChartSchema): - raw_metric = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, include_data=True) + raw_metric: dict = get_card(metric_id=metric_id, project_id=project_id, user_id=user_id, include_data=True) if raw_metric is None: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="card not found") metric: schemas_ee.CreateCardSchema = schemas_ee.CreateCardSchema(**raw_metric) if metric.is_template: return get_predefined_metric(key=metric.metric_of, project_id=project_id, data=data.dict()) - elif __is_click_map(raw_metric) and raw_metric["data"]: + elif __is_click_map(metric) and raw_metric["data"]: keys = sessions_mobs. \ __get_mob_keys(project_id=project_id, session_id=raw_metric["data"]["sessionId"]) mob_exists = False