From b3a78aeca887a43c6673153b79021ed433e285c2 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 18 Jan 2022 12:39:41 +0100 Subject: [PATCH] feat(api): fixed update funnels --- api/chalicelib/core/funnels.py | 5 +++-- api/chalicelib/core/significance.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/chalicelib/core/funnels.py b/api/chalicelib/core/funnels.py index 281aeb422..22ab73cba 100644 --- a/api/chalicelib/core/funnels.py +++ b/api/chalicelib/core/funnels.py @@ -2,7 +2,7 @@ import json import chalicelib.utils.helper import schemas -from chalicelib.core import events, significance, sessions +from chalicelib.core import significance, sessions from chalicelib.utils import dev from chalicelib.utils import helper, pg_client from chalicelib.utils.TimeUTC import TimeUTC @@ -61,7 +61,8 @@ def update(funnel_id, user_id, project_id, name=None, filter=None, is_public=Non AND project_id = %(project_id)s AND (user_id = %(user_id)s OR is_public) RETURNING *;""", {"user_id": user_id, "funnel_id": funnel_id, "name": name, - "filter": json.dumps(filter) if filter is not None else None, "is_public": is_public}) + "filter": json.dumps(filter) if filter is not None else None, "is_public": is_public, + "project_id": project_id}) # print("--------------------") # print(query) # print("--------------------") diff --git a/api/chalicelib/core/significance.py b/api/chalicelib/core/significance.py index 9fc55065f..d81378ddb 100644 --- a/api/chalicelib/core/significance.py +++ b/api/chalicelib/core/significance.py @@ -223,9 +223,9 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: params = {"project_id": project_id, "startTimestamp": filter_d["startDate"], "endTimestamp": filter_d["endDate"], "issueTypes": tuple(filter_issues), **values} with pg_client.PostgresClient() as cur: - print("---------------------------------------------------") - print(cur.mogrify(n_stages_query, params)) - print("---------------------------------------------------") + # print("---------------------------------------------------") + # print(cur.mogrify(n_stages_query, params)) + # print("---------------------------------------------------") cur.execute(cur.mogrify(n_stages_query, params)) rows = cur.fetchall() return rows