jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/api-v1.9.5' into dev

Browse source
This commit is contained in:
Taha Yassine Kraiem 2023-01-31 18:30:44 +01:00
commit 9fcd6b0cfc
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/chalicelib/core/custom_metrics.py
View file

@ -241,6 +241,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema):
s.filter.page = data.page s.filter.page = data.page
if len(data.filters) > 0: if len(data.filters) > 0:
s.filter.filters += data.filters s.filter.filters += data.filters
if len(data.events) > 0:
s.filter.events += data.events
results.append({"seriesId": None, "seriesName": s.name, results.append({"seriesId": None, "seriesName": s.name,
**sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)}) **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)})

6
api/chalicelib/core/sessions.py
View file

@ -204,9 +204,9 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_
ORDER BY s.session_id desc) AS filtred_sessions ORDER BY s.session_id desc) AS filtred_sessions
ORDER BY {sort} {data.order}, issue_score DESC) AS full_sessions;""", ORDER BY {sort} {data.order}, issue_score DESC) AS full_sessions;""",
full_args) full_args)
print("--------------------") # print("--------------------")
print(main_query) # print(main_query)
print("--------------------") # print("--------------------")
try: try:
cur.execute(main_query) cur.execute(main_query)
except Exception as err: except Exception as err:

2
ee/api/chalicelib/core/custom_metrics.py
View file

@ -270,6 +270,8 @@ def try_sessions(project_id, user_id, data: schemas.CardSessionsSchema):
s.filter.page = data.page s.filter.page = data.page
if len(data.filters) > 0: if len(data.filters) > 0:
s.filter.filters += data.filters s.filter.filters += data.filters
if len(data.events) > 0:
s.filter.events += data.events
results.append({"seriesId": None, "seriesName": s.name, results.append({"seriesId": None, "seriesName": s.name,
**sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)}) **sessions.search_sessions(data=s.filter, project_id=project_id, user_id=user_id)})