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.

update event/pageview metrics

Francis Cao3a4cefef7264
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index 32cccd3e8..d8818bbab 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -51,17 +51,23 @@ async function clickhouseQuery(
eventType: EVENT_TYPE.customEvent,
});
+ const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
+
return rawQuery(
`
select
event_name x,
${getDateQuery('created_at', unit, timezone)} t,
count(*) y
- from website_event
- where website_id = {websiteId:UUID}
- and created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and event_type = {eventType:UInt32}
+ from (
+ select arrayJoin(event_name) as event_name,
+ created_at
+ from ${table} website_event
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and event_type = {eventType:UInt32}
${filterQuery}
+ ) as g
group by x, t
order by t
`,
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 34d26d9dc..f1c316d27 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -100,7 +100,7 @@ async function clickhouseQuery(
let columnAgg = column;
let excludeDomain = '';
if (column === 'referrer_domain') {
- excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
+ excludeDomain = `and t != {websiteDomain:String} and t != ''`;
}
if (type === 'entry') {
@@ -111,17 +111,19 @@ async function clickhouseQuery(
columnAgg = `argMaxMerge(${column})`;
}
- const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+ const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
return rawQuery(
`
- select ${column} x, sum(views) y
- from ${table} website_event
- where website_id = {websiteId:UUID}
- and created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and event_type = {eventType:UInt32}
- ${excludeDomain}
- ${filterQuery}
+ select g.t as x,
+ count(*) as y
+ from (
+ select arrayJoin(${column}) as t
+ from ${table} website_event
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and event_type = {eventType:UInt32}
+ ${filterQuery}) as g
group by x
order by y desc
limit ${limit}