From 30de40d4ad61d85bf7d27fe60dc7a5d477a8f9cc Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 30 Dec 2022 12:48:10 +0100 Subject: [PATCH] feat(chalice): fixed broken imports --- api/chalicelib/core/sessions_notes.py | 9 +++---- api/chalicelib/core/significance.py | 36 +++++++++++++-------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/api/chalicelib/core/sessions_notes.py b/api/chalicelib/core/sessions_notes.py index dd2de83f3..cc27b1931 100644 --- a/api/chalicelib/core/sessions_notes.py +++ b/api/chalicelib/core/sessions_notes.py @@ -2,12 +2,11 @@ from urllib.parse import urljoin from decouple import config -import chalicelib.utils.sql_helper import schemas -from chalicelib.core import sessions -from chalicelib.core.collaboration_slack import Slack from chalicelib.core.collaboration_msteams import MSTeams +from chalicelib.core.collaboration_slack import Slack from chalicelib.utils import pg_client, helper +from chalicelib.utils import sql_helper as sh from chalicelib.utils.TimeUTC import TimeUTC @@ -59,8 +58,8 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se if data.tags and len(data.tags) > 0: k = "tag_value" conditions.append( - chalicelib.utils.sql_helper.multi_conditions(f"%({k})s = sessions_notes.tag", data.tags, value_key=k)) - extra_params = chalicelib.utils.sql_helper.multi_values(data.tags, value_key=k) + sh.multi_conditions(f"%({k})s = sessions_notes.tag", data.tags, value_key=k)) + extra_params = sh.multi_values(data.tags, value_key=k) if data.shared_only: conditions.append("sessions_notes.is_public") elif data.mine_only: diff --git a/api/chalicelib/core/significance.py b/api/chalicelib/core/significance.py index 43d9d2fa9..291fcbb4e 100644 --- a/api/chalicelib/core/significance.py +++ b/api/chalicelib/core/significance.py @@ -1,7 +1,7 @@ __author__ = "AZNAUROV David" __maintainer__ = "KRAIEM Taha Yassine" -import chalicelib.utils.sql_helper +from chalicelib.utils import sql_helper as sh import schemas from chalicelib.core import events, metadata, sessions @@ -50,33 +50,33 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: continue f["value"] = helper.values_for_operator(value=f["value"], op=f["operator"]) # filter_args = _multiple_values(f["value"]) - op = chalicelib.utils.sql_helper.get_sql_operator(f["operator"]) + op = sh.get_sql_operator(f["operator"]) filter_type = f["type"] # values[f_k] = sessions.__get_sql_value_multiple(f["value"]) f_k = f"f_value{i}" values = {**values, - **chalicelib.utils.sql_helper.multi_values(helper.values_for_operator(value=f["value"], op=f["operator"]), + **sh.multi_values(helper.values_for_operator(value=f["value"], op=f["operator"]), value_key=f_k)} if filter_type == schemas.FilterType.user_browser: # op = sessions.__get_sql_operator_multiple(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_browser {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_browser {op} %({f_k})s', f["value"], value_key=f_k)) elif filter_type in [schemas.FilterType.user_os, schemas.FilterType.user_os_ios]: # op = sessions.__get_sql_operator_multiple(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_os {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_os {op} %({f_k})s', f["value"], value_key=f_k)) elif filter_type in [schemas.FilterType.user_device, schemas.FilterType.user_device_ios]: # op = sessions.__get_sql_operator_multiple(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_device {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_device {op} %({f_k})s', f["value"], value_key=f_k)) elif filter_type in [schemas.FilterType.user_country, schemas.FilterType.user_country_ios]: # op = sessions.__get_sql_operator_multiple(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_country {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_country {op} %({f_k})s', f["value"], value_key=f_k)) elif filter_type == schemas.FilterType.duration: if len(f["value"]) > 0 and f["value"][0] is not None: first_stage_extra_constraints.append(f's.duration >= %(minDuration)s') @@ -89,7 +89,7 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: filter_extra_from = [f"INNER JOIN {events.event_type.LOCATION.table} AS p USING(session_id)"] # op = sessions.__get_sql_operator_multiple(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f"p.base_referrer {op} %({f_k})s", f["value"], value_key=f_k)) + sh.multi_conditions(f"p.base_referrer {op} %({f_k})s", f["value"], value_key=f_k)) elif filter_type == events.event_type.METADATA.ui_type: if meta_keys is None: meta_keys = metadata.get(project_id=project_id) @@ -97,25 +97,25 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: # op = sessions.__get_sql_operator(f["operator"]) if f.get("key") in meta_keys.keys(): first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions( + sh.multi_conditions( f's.{metadata.index_to_colname(meta_keys[f["key"]])} {op} %({f_k})s', f["value"], value_key=f_k)) # values[f_k] = helper.string_to_sql_like_with_op(f["value"][0], op) elif filter_type in [schemas.FilterType.user_id, schemas.FilterType.user_id_ios]: # op = sessions.__get_sql_operator(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_id {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_id {op} %({f_k})s', f["value"], value_key=f_k)) # values[f_k] = helper.string_to_sql_like_with_op(f["value"][0], op) elif filter_type in [schemas.FilterType.user_anonymous_id, schemas.FilterType.user_anonymous_id_ios]: # op = sessions.__get_sql_operator(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.user_anonymous_id {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.user_anonymous_id {op} %({f_k})s', f["value"], value_key=f_k)) # values[f_k] = helper.string_to_sql_like_with_op(f["value"][0], op) elif filter_type in [schemas.FilterType.rev_id, schemas.FilterType.rev_id_ios]: # op = sessions.__get_sql_operator(f["operator"]) first_stage_extra_constraints.append( - chalicelib.utils.sql_helper.multi_conditions(f's.rev_id {op} %({f_k})s', f["value"], value_key=f_k)) + sh.multi_conditions(f's.rev_id {op} %({f_k})s', f["value"], value_key=f_k)) # values[f_k] = helper.string_to_sql_like_with_op(f["value"][0], op) i = -1 for s in stages: @@ -125,7 +125,7 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: if not isinstance(s["value"], list): s["value"] = [s["value"]] - is_any = chalicelib.utils.sql_helper.isAny_opreator(s["operator"]) + is_any = sh.isAny_opreator(s["operator"]) if not is_any and isinstance(s["value"], list) and len(s["value"]) == 0: continue i += 1 @@ -133,7 +133,7 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: extra_from = filter_extra_from + ["INNER JOIN public.sessions AS s USING (session_id)"] else: extra_from = [] - op = chalicelib.utils.sql_helper.get_sql_operator(s["operator"]) + op = sh.get_sql_operator(s["operator"]) event_type = s["type"].upper() if event_type == events.event_type.CLICK.ui_type: next_table = events.event_type.CLICK.table @@ -164,10 +164,10 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: print("=================UNDEFINED") continue - values = {**values, **chalicelib.utils.sql_helper.multi_values(helper.values_for_operator(value=s["value"], op=s["operator"]), + values = {**values, **sh.multi_values(helper.values_for_operator(value=s["value"], op=s["operator"]), value_key=f"value{i + 1}")} - if chalicelib.utils.sql_helper.is_negation_operator(op) and i > 0: - op = chalicelib.utils.sql_helper.reverse_sql_operator(op) + if sh.is_negation_operator(op) and i > 0: + op = sh.reverse_sql_operator(op) main_condition = "left_not.session_id ISNULL" extra_from.append(f"""LEFT JOIN LATERAL (SELECT session_id FROM {next_table} AS s_main @@ -178,7 +178,7 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]: if is_any: main_condition = "TRUE" else: - main_condition = chalicelib.utils.sql_helper.multi_conditions(f"main.{next_col_name} {op} %(value{i + 1})s", + main_condition = sh.multi_conditions(f"main.{next_col_name} {op} %(value{i + 1})s", values=s["value"], value_key=f"value{i + 1}") n_stages_query.append(f""" (SELECT main.session_id,