From 1457a6c5cff3b1de8e7ccf8f9cfd2c5d1768ec3e Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 22 Feb 2022 17:48:33 +0100 Subject: [PATCH] feat(api): search-sessions ignore null metadata feat(api): search-sessions group by userId ignore metadata --- api/chalicelib/core/sessions.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index f1add5dfe..36a5309cb 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -249,10 +249,12 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f for i, s in enumerate(sessions): sessions[i] = {**s.pop("last_session")[0], **s} sessions[i].pop("rn") - sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys} + sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys \ + if sessions[i][f'metadata_{k["index"]}'] is not None} else: for i, s in enumerate(sessions): - sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys} + sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys \ + if sessions[i][f'metadata_{k["index"]}'] is not None} if not data.group_by_user and data.sort is not None and data.sort != "session_id": sessions = sorted(sessions, key=lambda s: s[helper.key_to_snake_case(data.sort)], reverse=data.order.upper() == "DESC")