From 6cb997def795be9402ec804f4bf1692cf1d69ebd Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Wed, 22 Jun 2022 16:16:38 +0200
Subject: [PATCH] feat(api): changed get session's live flag

---
 api/chalicelib/core/assist.py   | 9 ++++++---
 api/chalicelib/core/sessions.py | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/api/chalicelib/core/assist.py b/api/chalicelib/core/assist.py
index bfacd9295..090a13d42 100644
--- a/api/chalicelib/core/assist.py
+++ b/api/chalicelib/core/assist.py
@@ -81,10 +81,13 @@ def get_live_session_by_id(project_id, session_id):
             print("!! issue with the peer-server")
             print(connected_peers.text)
             return False
-        connected_peers = connected_peers.json().get("data", [])
+        connected_peers = connected_peers.json().get("data")
+        if connected_peers is None:
+            return None
+        connected_peers["live"] = True
     except requests.exceptions.Timeout:
         print("Timeout getting Assist response")
-        return False
+        return None
     except Exception as e:
         print("issue getting Assist response")
         print(str(e))
@@ -93,7 +96,7 @@ def get_live_session_by_id(project_id, session_id):
             print(connected_peers.text)
         except:
             print("couldn't get response")
-        return False
+        return None
     return connected_peers
 
 
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index b3cd81c1d..3856acaa0 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -99,14 +99,16 @@ def get_by_id2_pg(project_id, session_id, user_id, full_data=False, include_fav_
                                                                     duration=data["duration"])
 
                 data['metadata'] = __group_metadata(project_metadata=data.pop("projectMetadata"), session=data)
-                data['issues'] = issues.get_by_session_id(session_id=session_id,project_id=project_id)
+                data['issues'] = issues.get_by_session_id(session_id=session_id, project_id=project_id)
                 data['live'] = live and assist.is_live(project_id=project_id,
                                                        session_id=session_id,
                                                        project_key=data["projectKey"])
             data["inDB"] = True
             return data
-        else:
+        elif live:
             return assist.get_live_session_by_id(project_id=project_id, session_id=session_id)
+        else:
+            return None
 
 
 def __get_sql_operator(op: schemas.SearchEventOperator):