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

fix(chalice): heatmap handles null replay (#2695)

Browse source 
refactor(chalice): heatmap use path only

(cherry picked from commit 9eeaeaf4eb)
This commit is contained in:
Kraiem Taha Yassine 2024-10-28 16:47:51 +01:00 • committed by Taha Yassine Kraiem
parent 7c6409ee74
commit 8d26f77590
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ def get_by_url(project_id, data: schemas.GetHeatMapPayloadSchema):
args = {"startDate": data.startTimestamp, "endDate": data.endTimestamp,
"project_id": project_id, "url": data.url}
constraints = ["sessions.project_id = %(project_id)s",
"(url = %(url)s OR path= %(url)s)",
"path= %(url)s",
"clicks.timestamp >= %(startDate)s",
"clicks.timestamp <= %(endDate)s",
"start_ts >= %(startDate)s",
@ -84,7 +84,7 @@ def get_by_url(project_id, data: schemas.GetHeatMapPayloadSchema):
def get_x_y_by_url_and_session_id(project_id, session_id, data: schemas.GetHeatMapPayloadSchema):
args = {"session_id": session_id, "url": data.url}
constraints = ["session_id = %(session_id)s",
"(url = %(url)s OR path= %(url)s)",
"path= %(url)s",
"normalized_x IS NOT NULL"]
query_from = "events.clicks"
@ -112,7 +112,7 @@ def get_x_y_by_url_and_session_id(project_id, session_id, data: schemas.GetHeatM
def get_selectors_by_url_and_session_id(project_id, session_id, data: schemas.GetHeatMapPayloadSchema):
args = {"session_id": session_id, "url": data.url}
constraints = ["session_id = %(session_id)s",
"(url = %(url)s OR path= %(url)s)"]
"path= %(url)s"]
query_from = "events.clicks"
with pg_client.PostgresClient() as cur:

2
api/schemas/schemas.py
View file

@ -1595,7 +1595,7 @@ class HeatMapFilterSchema(BaseModel):
class GetHeatMapPayloadSchema(_TimedSchema):
url: Optional[str] = Field(...)
url: Optional[str] = Field(default=None)
filters: List[HeatMapFilterSchema] = Field(default=[])
click_rage: bool = Field(default=False)

6
ee/api/chalicelib/core/heatmaps.py
View file

@ -22,7 +22,7 @@ def get_by_url(project_id, data: schemas.GetHeatMapPayloadSchema):
args = {"startDate": data.startTimestamp, "endDate": data.endTimestamp,
"project_id": project_id, "url": data.url}
constraints = ["main_events.project_id = toUInt16(%(project_id)s)",
"(main_events.url_hostpath = %(url)s OR main_events.url_path = %(url)s)",
"main_events.url_path = %(url)s",
"main_events.datetime >= toDateTime(%(startDate)s/1000)",
"main_events.datetime <= toDateTime(%(endDate)s/1000)",
"main_events.event_type='CLICK'",
@ -94,7 +94,7 @@ def get_x_y_by_url_and_session_id(project_id, session_id, data: schemas.GetHeatM
args = {"project_id": project_id, "session_id": session_id, "url": data.url}
constraints = ["main_events.project_id = toUInt16(%(project_id)s)",
"main_events.session_id = %(session_id)s",
"(main_events.url_hostpath = %(url)s OR main_events.url_path = %(url)s)",
"main_events.url_path = %(url)s",
"main_events.event_type='CLICK'",
"isNotNull(main_events.normalized_x)"]
query_from = f"{exp_ch_helper.get_main_events_table(0)} AS main_events"
@ -124,7 +124,7 @@ def get_selectors_by_url_and_session_id(project_id, session_id, data: schemas.Ge
args = {"project_id": project_id, "session_id": session_id, "url": data.url}
constraints = ["main_events.project_id = toUInt16(%(project_id)s)",
"main_events.session_id = %(session_id)s",
"(main_events.url_hostpath = %(url)s OR main_events.url_path = %(url)s)",
"main_events.url_path = %(url)s",
"main_events.event_type='CLICK'"]
query_from = f"{exp_ch_helper.get_main_events_table(0)} AS main_events"