From a219f5dbe3cea44a29ba96c0a4fb2314cb66128b Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Mon, 26 Aug 2024 10:36:07 -0700 Subject: [PATCH] pass timezone in stats CH query --- src/queries/analytics/pageviews/getPageviewStats.ts | 6 +++--- src/queries/analytics/sessions/getSessionStats.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts index 96e9f1e1..2230da91 100644 --- a/src/queries/analytics/pageviews/getPageviewStats.ts +++ b/src/queries/analytics/pageviews/getPageviewStats.ts @@ -41,7 +41,7 @@ async function clickhouseQuery( websiteId: string, filters: QueryFilters, ): Promise<{ x: string; y: number }[]> { - const { unit = 'day' } = filters; + const { timezone = 'utc', unit = 'day' } = filters; const { parseFilters, rawQuery } = clickhouse; const { filterQuery, params } = await parseFilters(websiteId, { ...filters, @@ -57,7 +57,7 @@ async function clickhouseQuery( g.y as y from ( select - date_trunc('${unit}', created_at) as t, + date_trunc('${unit}', created_at, '${timezone}') as t, count(*) as y from website_event where website_id = {websiteId:UUID} @@ -75,7 +75,7 @@ async function clickhouseQuery( g.y as y from ( select - date_trunc('${unit}', created_at) as t, + date_trunc('${unit}', created_at, '${timezone}') as t, sum(views)as y from website_event_stats_hourly website_event where website_id = {websiteId:UUID} diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts index 8fde94f3..bddebcec 100644 --- a/src/queries/analytics/sessions/getSessionStats.ts +++ b/src/queries/analytics/sessions/getSessionStats.ts @@ -41,7 +41,7 @@ async function clickhouseQuery( websiteId: string, filters: QueryFilters, ): Promise<{ x: string; y: number }[]> { - const { unit = 'day' } = filters; + const { timezone = 'utc', unit = 'day' } = filters; const { parseFilters, rawQuery } = clickhouse; const { filterQuery, params } = await parseFilters(websiteId, { ...filters, @@ -57,7 +57,7 @@ async function clickhouseQuery( g.y as y from ( select - date_trunc('${unit}', created_at) as t, + date_trunc('${unit}', created_at, '${timezone}') as t, count(distinct session_id) as y from website_event where website_id = {websiteId:UUID} @@ -75,7 +75,7 @@ async function clickhouseQuery( g.y as y from ( select - date_trunc('${unit}', created_at) as t, + date_trunc('${unit}', created_at, '${timezone}') as t, uniq(session_id) as y from website_event_stats_hourly website_event where website_id = {websiteId:UUID}