From 66ce43ea083e68f71c195725ec22bcb94f779e25 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 29 Dec 2021 17:37:55 +0100 Subject: [PATCH] feat(api): fixed search TIME_BETWEEN_EVENTS feat(api): added = to MathOperator --- api/chalicelib/core/sessions.py | 5 ++--- api/schemas.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 0067b7c29..01d14c7a1 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -505,8 +505,8 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f event.value[0].value = [event.value[0].value] if not isinstance(event.value[1].value, list): event.value[1].value = [event.value[1].value] - event.value[0].value = helper.values_for_operator(value=event.value[0].value, op=event.operator) - event.value[1].value = helper.values_for_operator(value=event.value[1].value, op=event.operator) + event.value[0].value = helper.values_for_operator(value=event.value[0].value, op=event.value[0].operator) + event.value[1].value = helper.values_for_operator(value=event.value[1].value, op=event.value[0].operator) e_k1 = e_k + "_e1" e_k2 = e_k + "_e2" full_args = {**full_args, @@ -534,7 +534,6 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f else: - print("LLLLLLLLLLLLLL") continue if event_index == 0 or or_events: event_where += ss_constraints diff --git a/api/schemas.py b/api/schemas.py index 37118bd1d..e3d7a5be4 100644 --- a/api/schemas.py +++ b/api/schemas.py @@ -313,6 +313,7 @@ class AlertColumn(str, Enum): class MathOperator(str, Enum): + _equal = "=" _less = "<" _greater = ">" _less_eq = "<="