From 1593aa19e3840410ef9d6ab09f4f480cbe0c3ef5 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Wed, 6 Dec 2023 16:23:29 +0100 Subject: [PATCH] fix(chalice): fixed sessions-perf filter (#1748) --- api/chalicelib/core/sessions.py | 7 ++----- ee/api/chalicelib/core/sessions_exp.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 2a16c3cc3..2d41850b2 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -872,12 +872,9 @@ def search_query_parts(data: schemas.SessionsSearchPayloadSchema, error_status, event.value, value_key=e_k)) e_k += "_custom" full_args = {**full_args, **sh.multi_values(event.source, value_key=e_k)} - try: - operator = event.sourceOperator.value - except AttributeError: - operator = event.sourceOperator + event_where.append(f"{tname}.{colname} IS NOT NULL AND {tname}.{colname}>0 AND " + - sh.multi_conditions(f"{tname}.{colname} {operator} %({e_k})s", + sh.multi_conditions(f"{tname}.{colname} {event.sourceOperator} %({e_k})s", event.source, value_key=e_k)) elif event_type == schemas.EventType.request_details: diff --git a/ee/api/chalicelib/core/sessions_exp.py b/ee/api/chalicelib/core/sessions_exp.py index 9f8876312..769e26e00 100644 --- a/ee/api/chalicelib/core/sessions_exp.py +++ b/ee/api/chalicelib/core/sessions_exp.py @@ -1087,7 +1087,7 @@ def search_query_parts_ch(data: schemas.SessionsSearchPayloadSchema, error_statu full_args = {**full_args, **_multiple_values(event.source, value_key=e_k)} event_where.append(f"isNotNull({tname}.{colname}) AND {tname}.{colname}>0 AND " + - _multiple_conditions(f"{tname}.{colname} {event.sourceOperator.value} %({e_k})s", + _multiple_conditions(f"{tname}.{colname} {event.sourceOperator} %({e_k})s", event.source, value_key=e_k)) events_conditions[-1]["condition"].append(event_where[-1]) events_conditions[-1]["condition"] = " AND ".join(events_conditions[-1]["condition"])