Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

pass timezone in stats CH query

Francis Caoa219f5dbe3ce
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 96e9f1e13..2230da91d 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 8fde94f37..bddebcec1 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}