diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 6f5ad3fc1..ad91076a6 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -153,7 +153,7 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ if data.order is None: data.order = schemas.SortOrderType.desc.value else: - data.order = data.order.upper() + data.order = data.order.value if data.sort is not None and data.sort != 'sessionsCount': sort = helper.key_to_snake_case(data.sort) g_sort = f"{'MIN' if data.order == schemas.SortOrderType.desc else 'MAX'}({sort})" @@ -187,6 +187,8 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ else: if data.order is None: data.order = schemas.SortOrderType.desc.value + else: + data.order = data.order.value sort = 'session_id' if data.sort is not None and data.sort != "session_id": # sort += " " + data.order + "," + helper.key_to_snake_case(data.sort) diff --git a/ee/api/chalicelib/core/sessions.py b/ee/api/chalicelib/core/sessions.py index 2ff245eb3..67877b455 100644 --- a/ee/api/chalicelib/core/sessions.py +++ b/ee/api/chalicelib/core/sessions.py @@ -155,7 +155,7 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ if data.order is None: data.order = schemas.SortOrderType.desc.value else: - data.order = data.order.upper() + data.order = data.order.value if data.sort is not None and data.sort != 'sessionsCount': sort = helper.key_to_snake_case(data.sort) g_sort = f"{'MIN' if data.order == schemas.SortOrderType.desc else 'MAX'}({sort})" @@ -189,6 +189,8 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ else: if data.order is None: data.order = schemas.SortOrderType.desc.value + else: + data.order = data.order.value sort = 'session_id' if data.sort is not None and data.sort != "session_id": # sort += " " + data.order + "," + helper.key_to_snake_case(data.sort) diff --git a/ee/api/chalicelib/core/sessions_exp.py b/ee/api/chalicelib/core/sessions_exp.py index fad24c4ac..e0ca6e971 100644 --- a/ee/api/chalicelib/core/sessions_exp.py +++ b/ee/api/chalicelib/core/sessions_exp.py @@ -239,7 +239,7 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ if data.order is None: data.order = schemas.SortOrderType.desc.value else: - data.order = data.order.upper() + data.order = data.order.value if data.sort is not None and data.sort != 'sessionsCount': sort = helper.key_to_snake_case(data.sort) g_sort = f"{'MIN' if data.order == schemas.SortOrderType.desc else 'MAX'}({sort})" @@ -267,6 +267,8 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ else: if data.order is None: data.order = schemas.SortOrderType.desc.value + else: + data.order = data.order.value sort = 'session_id' if data.sort is not None and data.sort != "session_id": # sort += " " + data.order + "," + helper.key_to_snake_case(data.sort)