From c21aa47f6e470fb07fa1c4da0d784069e752c5fa Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 30 Sep 2022 15:54:02 +0200 Subject: [PATCH] feat(chalice): search notes by tags --- api/chalicelib/core/sessions_notes.py | 11 ++++------- ee/api/chalicelib/core/sessions_notes.py | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/api/chalicelib/core/sessions_notes.py b/api/chalicelib/core/sessions_notes.py index 77e487df3..d7b29fbb3 100644 --- a/api/chalicelib/core/sessions_notes.py +++ b/api/chalicelib/core/sessions_notes.py @@ -1,9 +1,6 @@ -import json - import schemas -from chalicelib.core import users -from chalicelib.core.sessions import _multiple_conditions, _multiple_values -from chalicelib.utils import pg_client, helper, dev +from chalicelib.core import sessions +from chalicelib.utils import pg_client, helper from chalicelib.utils.TimeUTC import TimeUTC @@ -35,8 +32,8 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se extra_params = {} if data.tags and len(data.tags) > 0: k = "tag" - conditions.append(_multiple_conditions(f"%({k})s = ANY (s.issue_types)", data.tags, value_key=k)) - extra_params = _multiple_values(data.tags, value_key=k) + conditions.append(sessions._multiple_conditions(f"%({k})s = ANY (s.issue_types)", data.tags, value_key=k)) + extra_params = sessions._multiple_values(data.tags, value_key=k) query = cur.mogrify(f"""SELECT sessions_notes.* FROM sessions_notes WHERE {" AND ".join(conditions)} diff --git a/ee/api/chalicelib/core/sessions_notes.py b/ee/api/chalicelib/core/sessions_notes.py index baf71526d..fe26e23ac 100644 --- a/ee/api/chalicelib/core/sessions_notes.py +++ b/ee/api/chalicelib/core/sessions_notes.py @@ -1,9 +1,6 @@ -import json - import schemas -from chalicelib.core import users -from chalicelib.core.sessions import _multiple_conditions, _multiple_values -from chalicelib.utils import pg_client, helper, dev +from chalicelib.core import sessions +from chalicelib.utils import pg_client, helper from chalicelib.utils.TimeUTC import TimeUTC @@ -36,8 +33,8 @@ def get_all_notes_by_project_id(tenant_id, project_id, user_id, data: schemas.Se extra_params = {} if data.tags and len(data.tags) > 0: k = "tag" - conditions.append(_multiple_conditions(f"%({k})s = ANY (s.issue_types)", data.tags, value_key=k)) - extra_params = _multiple_values(data.tags, value_key=k) + conditions.append(sessions._multiple_conditions(f"%({k})s = ANY (s.issue_types)", data.tags, value_key=k)) + extra_params = sessions._multiple_values(data.tags, value_key=k) query = cur.mogrify(f"""SELECT sessions_notes.* FROM sessions_notes INNER JOIN users USING (user_id)