From 502307b84128c67be144f5b443921eecb955d5bb Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Mon, 28 Jun 2021 16:49:50 +0200 Subject: [PATCH] Assist (#63) * feat(api): assist peerJS server * feat(api): install assist_server dependencies and start it with the API * feat(api): assist: list live sessions * feat(nginx): expose assist_server and block peers listing * feat(api): merged sourcemaps reader and assist-server feat(api): change image definition feat(api): changed service start command feat(utilities): created full server & image definition feat(nginx): reset chalice configuration * feat(utilities): utilities.yaml * feat(nginx): utilities URL * feat(utilities): utilities template * feat(ci): Adding utilities GH action. Signed-off-by: Rajesh Rajendran * feat(utilities): build script * feat(utilities): build script fix image name * feat(utilities): tag and push image as latest * feat(api): tag and push image as latest * feat(api): extract peers host * feat(api): fixed utilities URL * feat(api): assist logs * feat(api): assist: fixed peerjs URL * feat(api): log peers URL * feat(api): assit: get all durations, even if it is not null * feat(api): assit: include peerId in response Co-authored-by: Rajesh Rajendran --- api/chalicelib/core/assist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/chalicelib/core/assist.py b/api/chalicelib/core/assist.py index 50e1b0655..be5431990 100644 --- a/api/chalicelib/core/assist.py +++ b/api/chalicelib/core/assist.py @@ -33,11 +33,11 @@ def get_live_sessions(project_id): connected_peers = tuple(connected_peers) with pg_client.PostgresClient() as cur: query = cur.mogrify(f"""\ - SELECT {SESSION_PROJECTION_COLS} + SELECT {SESSION_PROJECTION_COLS}, %(project_key)s||'-'|| session_id AS peer_id FROM public.sessions AS s WHERE s.project_id = %(project_id)s AND session_id IN %(connected_peers)s;""", - {"project_id": project_id, "connected_peers": connected_peers}) + {"project_id": project_id, "connected_peers": connected_peers, "project_key":project_key}) cur.execute(query) results = cur.fetchall() return helper.list_to_camel_case(results)