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

feat(api): changed get bookmarked errors

Browse source
This commit is contained in:
Taha Yassine Kraiem 2022-03-14 14:37:02 +01:00
parent 1adf08b7a9
commit 87ef2b3c1c
4 changed files with 49 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
api/chalicelib/core/errors.py
View file

@ -1,5 +1,6 @@
import json import json
import schemas
from chalicelib.core import sourcemaps, sessions from chalicelib.core import sourcemaps, sessions
from chalicelib.utils import pg_client, helper, dev from chalicelib.utils import pg_client, helper, dev
from chalicelib.utils.TimeUTC import TimeUTC from chalicelib.utils.TimeUTC import TimeUTC
@ -405,9 +406,9 @@ def __get_basic_constraints(platform=None, time_constraint=True, startTime_arg_n
if chart: if chart:
ch_sub_query += [f"timestamp >= generated_timestamp", ch_sub_query += [f"timestamp >= generated_timestamp",
f"timestamp < generated_timestamp + %({step_size_name})s"] f"timestamp < generated_timestamp + %({step_size_name})s"]
if platform == 'mobile': if platform == schemas.PlatformType.mobile:
ch_sub_query.append("user_device_type = 'mobile'") ch_sub_query.append("user_device_type = 'mobile'")
elif platform == 'desktop': elif platform == schemas.PlatformType.desktop:
ch_sub_query.append("user_device_type = 'desktop'") ch_sub_query.append("user_device_type = 'desktop'")
return ch_sub_query return ch_sub_query
@ -421,23 +422,28 @@ def __get_sort_key(key):
@dev.timed @dev.timed
def search(data, project_id, user_id, flows=False, status="ALL", favorite_only=False): def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, status="ALL", favorite_only=False):
status = status.upper() status = status.upper()
if status.lower() not in ['all', 'unresolved', 'resolved', 'ignored']: if status.lower() not in ['all', 'unresolved', 'resolved', 'ignored']:
return {"errors": ["invalid error status"]} return {"errors": ["invalid error status"]}
pg_sub_query = __get_basic_constraints(data.get('platform'), project_key="sessions.project_id") platform = None
for f in data.filters:
if f.type == schemas.FilterType.platform and len(f.value) > 0:
platform = f.value[0]
pg_sub_query = __get_basic_constraints(platform, project_key="sessions.project_id")
pg_sub_query += ["sessions.start_ts>=%(startDate)s", "sessions.start_ts<%(endDate)s", "source ='js_exception'", pg_sub_query += ["sessions.start_ts>=%(startDate)s", "sessions.start_ts<%(endDate)s", "source ='js_exception'",
"pe.project_id=%(project_id)s"] "pe.project_id=%(project_id)s"]
pg_sub_query_chart = __get_basic_constraints(data.get('platform'), time_constraint=False, chart=True) pg_sub_query_chart = __get_basic_constraints(platform, time_constraint=False, chart=True)
pg_sub_query_chart.append("source ='js_exception'") pg_sub_query_chart.append("source ='js_exception'")
pg_sub_query_chart.append("errors.error_id =details.error_id") pg_sub_query_chart.append("errors.error_id =details.error_id")
statuses = [] statuses = []
error_ids = None error_ids = None
if data.get("startDate") is None: if data.startDate is None:
data["startDate"] = TimeUTC.now(-30) data.startDate = TimeUTC.now(-30)
if data.get("endDate") is None: if data.endDate is None:
data["endDate"] = TimeUTC.now(1) data.endDate = TimeUTC.now(1)
if len(data.get("events", [])) > 0 or len(data.get("filters", [])) > 0 or status != "ALL" or favorite_only: if len(data.events) > 0 or len(data.filters) > 0 or status != "ALL":
# if favorite_only=True search for sessions associated with favorite_error
statuses = sessions.search2_pg(data=data, project_id=project_id, user_id=user_id, errors_only=True, statuses = sessions.search2_pg(data=data, project_id=project_id, user_id=user_id, errors_only=True,
error_status=status, favorite_only=favorite_only) error_status=status, favorite_only=favorite_only)
if len(statuses) == 0: if len(statuses) == 0:
@ -447,28 +453,30 @@ def search(data, project_id, user_id, flows=False, status="ALL", favorite_only=F
}} }}
error_ids = [e["error_id"] for e in statuses] error_ids = [e["error_id"] for e in statuses]
with pg_client.PostgresClient() as cur: with pg_client.PostgresClient() as cur:
if data.get("startDate") is None: if data.startDate is None:
data["startDate"] = TimeUTC.now(-7) data.startDate = TimeUTC.now(-7)
if data.get("endDate") is None: if data.endDate is None:
data["endDate"] = TimeUTC.now() data.endDate = TimeUTC.now()
density = data.get("density", 7) step_size = __get_step_size(data.startDate, data.endDate, data.density, factor=1)
step_size = __get_step_size(data["startDate"], data["endDate"], density, factor=1)
sort = __get_sort_key('datetime') sort = __get_sort_key('datetime')
if data.get("sort") is not None: if data.sort is not None:
sort = __get_sort_key(data["sort"]) sort = __get_sort_key(data.sort)
order = "DESC" order = "DESC"
if data.get("order") is not None: if data.order is not None:
order = data["order"] order = data.order
extra_join = ""
params = { params = {
"startDate": data['startDate'], "startDate": data.startDate,
"endDate": data['endDate'], "endDate": data.endDate,
"project_id": project_id, "project_id": project_id,
"userId": user_id, "userId": user_id,
"step_size": step_size} "step_size": step_size}
if error_ids is not None: if error_ids is not None:
params["error_ids"] = tuple(error_ids) params["error_ids"] = tuple(error_ids)
pg_sub_query.append("error_id IN %(error_ids)s") pg_sub_query.append("error_id IN %(error_ids)s")
if favorite_only:
pg_sub_query.append("ufe.user_id = %(userId)s")
extra_join += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)"
main_pg_query = f"""\ main_pg_query = f"""\
SELECT error_id, SELECT error_id,
name, name,
@ -488,6 +496,7 @@ def search(data, project_id, user_id, flows=False, status="ALL", favorite_only=F
FROM events.errors FROM events.errors
INNER JOIN public.errors AS pe USING (error_id) INNER JOIN public.errors AS pe USING (error_id)
INNER JOIN public.sessions USING (session_id) INNER JOIN public.sessions USING (session_id)
{extra_join}
WHERE {" AND ".join(pg_sub_query)} WHERE {" AND ".join(pg_sub_query)}
GROUP BY error_id, name, message GROUP BY error_id, name, message
ORDER BY {sort} {order}) AS details ORDER BY {sort} {order}) AS details
@ -581,7 +590,7 @@ def __save_stacktrace(error_id, data):
def get_trace(project_id, error_id): def get_trace(project_id, error_id):
error = get(error_id=error_id) error = get(error_id=error_id, family=False)
if error is None: if error is None:
return {"errors": ["error not found"]} return {"errors": ["error not found"]}
if error.get("source", "") != "js_exception": if error.get("source", "") != "js_exception":

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

@ -232,11 +232,12 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
# print("--------------------") # print("--------------------")
# print(main_query) # print(main_query)
# print("--------------------") # print("--------------------")
cur.execute(main_query)
if count_only: cur.execute(main_query)
return helper.dict_to_camel_case(cur.fetchone())
sessions = cur.fetchone() sessions = cur.fetchone()
if count_only:
return helper.dict_to_camel_case(sessions)
total = sessions["count"] total = sessions["count"]
sessions = sessions["sessions"] sessions = sessions["sessions"]
# sessions = [] # sessions = []
@ -973,7 +974,7 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
full_args["status"] = error_status.lower() full_args["status"] = error_status.lower()
if favorite_only: if favorite_only:
extra_from += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)" extra_from += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)"
extra_constraints.append("ufe.user_id = %(user_id)s") extra_constraints.append("ufe.user_id = %(userId)s")
# extra_constraints = [extra.decode('UTF-8') + "\n" for extra in extra_constraints] # extra_constraints = [extra.decode('UTF-8') + "\n" for extra in extra_constraints]
if not favorite_only and not errors_only and user_id is not None: if not favorite_only and not errors_only and user_id is not None:
extra_from += """LEFT JOIN (SELECT user_id, session_id extra_from += """LEFT JOIN (SELECT user_id, session_id
@ -1196,11 +1197,11 @@ def get_session_user(project_id, user_id):
"public".sessions "public".sessions
WHERE WHERE
project_id = %(project_id)s project_id = %(project_id)s
AND user_id = %(user_id)s AND user_id = %(userId)s
AND duration is not null AND duration is not null
GROUP BY user_id; GROUP BY user_id;
""", """,
{"project_id": project_id, "user_id": user_id} {"project_id": project_id, "userId": user_id}
) )
cur.execute(query=query) cur.execute(query=query)
data = cur.fetchone() data = cur.fetchone()
@ -1213,8 +1214,8 @@ def get_session_ids_by_user_ids(project_id, user_ids):
"""\ """\
SELECT session_id FROM public.sessions SELECT session_id FROM public.sessions
WHERE WHERE
project_id = %(project_id)s AND user_id IN %(user_id)s;""", project_id = %(project_id)s AND user_id IN %(userId)s;""",
{"project_id": project_id, "user_id": tuple(user_ids)} {"project_id": project_id, "userId": tuple(user_ids)}
) )
ids = cur.execute(query=query) ids = cur.execute(query=query)
return ids return ids
@ -1240,8 +1241,8 @@ def delete_sessions_by_user_ids(project_id, user_ids):
"""\ """\
DELETE FROM public.sessions DELETE FROM public.sessions
WHERE WHERE
project_id = %(project_id)s AND user_id IN %(user_id)s;""", project_id = %(project_id)s AND user_id IN %(userId)s;""",
{"project_id": project_id, "user_id": tuple(user_ids)} {"project_id": project_id, "userId": tuple(user_ids)}
) )
cur.execute(query=query) cur.execute(query=query)

3
api/routers/core.py
View file

@ -907,8 +907,7 @@ def errors_search(projectId: int, status: str = "ALL", favorite: Union[str, bool
context: schemas.CurrentContext = Depends(OR_context)): context: schemas.CurrentContext = Depends(OR_context)):
if isinstance(favorite, str): if isinstance(favorite, str):
favorite = True if len(favorite) == 0 else False favorite = True if len(favorite) == 0 else False
return errors.search(data.dict(), projectId, user_id=context.user_id, status=status, return errors.search(data, projectId, user_id=context.user_id, status=status, favorite_only=favorite)
favorite_only=favorite)
@app.get('/{projectId}/errors/stats', tags=['errors']) @app.get('/{projectId}/errors/stats', tags=['errors'])

13
api/schemas.py
View file

@ -83,15 +83,6 @@ class EditSlackSchema(BaseModel):
url: HttpUrl = Field(...) url: HttpUrl = Field(...)
class SearchErrorsSchema(BaseModel):
platform: Optional[str] = Field(None)
startDate: Optional[int] = Field(TimeUTC.now(-7))
endDate: Optional[int] = Field(TimeUTC.now())
density: Optional[int] = Field(7)
sort: Optional[str] = Field(None)
order: Optional[str] = Field(None)
class CreateNotificationSchema(BaseModel): class CreateNotificationSchema(BaseModel):
token: str = Field(...) token: str = Field(...)
notifications: List = Field(...) notifications: List = Field(...)
@ -698,6 +689,10 @@ class FunnelInsightsPayloadSchema(FlatSessionsSearchPayloadSchema):
rangeValue: Optional[str] = Field(None) rangeValue: Optional[str] = Field(None)
class SearchErrorsSchema(SessionsSearchPayloadSchema):
density: Optional[int] = Field(7)
class MetricPayloadSchema(BaseModel): class MetricPayloadSchema(BaseModel):
startTimestamp: int = Field(TimeUTC.now(delta_days=-1)) startTimestamp: int = Field(TimeUTC.now(delta_days=-1))
endTimestamp: int = Field(TimeUTC.now()) endTimestamp: int = Field(TimeUTC.now())