pass timezone in stats CH query

This commit is contained in:
Francis Cao 2024-08-26 10:36:07 -07:00
parent bba584a09f
commit a219f5dbe3
2 changed files with 6 additions and 6 deletions

View File

@ -41,7 +41,7 @@ async function clickhouseQuery(
websiteId: string, websiteId: string,
filters: QueryFilters, filters: QueryFilters,
): Promise<{ x: string; y: number }[]> { ): Promise<{ x: string; y: number }[]> {
const { unit = 'day' } = filters; const { timezone = 'utc', unit = 'day' } = filters;
const { parseFilters, rawQuery } = clickhouse; const { parseFilters, rawQuery } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
@ -57,7 +57,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, date_trunc('${unit}', created_at, '${timezone}') as t,
count(*) as y count(*) as y
from website_event from website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
@ -75,7 +75,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, date_trunc('${unit}', created_at, '${timezone}') as t,
sum(views)as y sum(views)as y
from website_event_stats_hourly website_event from website_event_stats_hourly website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}

View File

@ -41,7 +41,7 @@ async function clickhouseQuery(
websiteId: string, websiteId: string,
filters: QueryFilters, filters: QueryFilters,
): Promise<{ x: string; y: number }[]> { ): Promise<{ x: string; y: number }[]> {
const { unit = 'day' } = filters; const { timezone = 'utc', unit = 'day' } = filters;
const { parseFilters, rawQuery } = clickhouse; const { parseFilters, rawQuery } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
@ -57,7 +57,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, date_trunc('${unit}', created_at, '${timezone}') as t,
count(distinct session_id) as y count(distinct session_id) as y
from website_event from website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
@ -75,7 +75,7 @@ async function clickhouseQuery(
g.y as y g.y as y
from ( from (
select select
date_trunc('${unit}', created_at) as t, date_trunc('${unit}', created_at, '${timezone}') as t,
uniq(session_id) as y uniq(session_id) as y
from website_event_stats_hourly website_event from website_event_stats_hourly website_event
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}