From 18aa31db457348d45ceba0fefa5dd940c5aed858 Mon Sep 17 00:00:00 2001 From: Guillermo Grau Date: Mon, 29 Aug 2022 07:37:52 +0200 Subject: [PATCH] Allowed filtering events in MetricsCard by url. --- queries/analytics/stats/getWebsiteStats.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.js index e220f8b4..3a2edadf 100644 --- a/queries/analytics/stats/getWebsiteStats.js +++ b/queries/analytics/stats/getWebsiteStats.js @@ -25,7 +25,12 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) { filters, params, ); - const { joinSession: joinEventSession } = parseFilters('event', null, filters, params); + const { eventQuery, joinSession: joinEventSession } = parseFilters( + 'event', + null, + { ...filters, event_url: filters.url }, + params, + ); return rawQuery( ` @@ -54,6 +59,7 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) { ${joinEventSession} where event.website_id=$1 and event.created_at between $2 and $3 + ${eventQuery} ${sessionQuery} ) stats_events `, @@ -70,7 +76,12 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) { params, 'session_uuid', ); - const { joinSession: joinEventSession } = parseFilters('event', null, filters, params); + const { eventQuery, joinSession: joinEventSession } = parseFilters( + 'event', + null, + filters, + params, + ); return rawQueryClickhouse( ` @@ -101,6 +112,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) { ${joinEventSession} where event.website_id=$1 and ${getBetweenDatesClickhouse('event.created_at', start_at, end_at)} + ${eventQuery} ${sessionQuery} ) stats_events `,