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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fix clickhouse calls (#1536)
Brian Cao78c345363934
diff --git a/.gitignore b/.gitignoreindex 0bad6264a..544103243 100644--- a/.gitignore+++ b/.gitignore@@ -38,6 +38,3 @@ yarn-error.log**.dev.yml-# cert-/lib/cert-diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.jsindex 4277250fe..f2e110617 100644--- a/pages/api/website/[id]/pageviews.js+++ b/pages/api/website/[id]/pageviews.js@@ -27,8 +27,8 @@ export default async (req, res) => {const [pageviews, sessions] = await Promise.all([getPageviewStats(websiteId, {- startDate,- endDate,+ start_at: startDate,+ end_at: endDate,tz,unit,count: '*',@@ -42,8 +42,8 @@ export default async (req, res) => {},}),getPageviewStats(websiteId, {- startDate,- endDate,+ start_at: startDate,+ end_at: endDate,tz,unit,count: 'distinct pageview.',diff --git a/pages/api/website/[id]/stats.js b/pages/api/website/[id]/stats.jsindex d652c0485..a7741af5a 100644--- a/pages/api/website/[id]/stats.js+++ b/pages/api/website/[id]/stats.js@@ -21,21 +21,29 @@ export default async (req, res) => {const prevStartDate = new Date(+start_at - distance);const prevEndDate = new Date(+end_at - distance);- const metrics = await getWebsiteStats(websiteId, startDate, endDate, {- url,- referrer,- os,- browser,- device,- country,+ const metrics = await getWebsiteStats(websiteId, {+ start_at: startDate,+ end_at: endDate,+ filters: {+ url,+ referrer,+ os,+ browser,+ device,+ country,+ },});- const prevPeriod = await getWebsiteStats(websiteId, prevStartDate, prevEndDate, {- url,- referrer,- os,- browser,- device,- country,+ const prevPeriod = await getWebsiteStats(websiteId, {+ start_at: prevStartDate,+ end_at: prevEndDate,+ filters: {+ url,+ referrer,+ os,+ browser,+ device,+ country,+ },});const stats = Object.keys(metrics[0]).reduce((obj, key) => {diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.jsindex 4a828e158..c37f1b398 100644--- a/queries/analytics/event/getEventMetrics.js+++ b/queries/analytics/event/getEventMetrics.js@@ -52,7 +52,8 @@ async function clickhouseQuery(${getDateQuery('created_at', unit, timezone)} t,count(*) yfrom event- where website_id= $1+ where event_name != ''+ and website_id= $1and ${getBetweenDates('created_at', start_at, end_at)}${getFilterQuery('event', filters, params)}group by x, tdiff --git a/queries/analytics/event/getEvents.js b/queries/analytics/event/getEvents.jsindex 41f8da70e..441eed64a 100644--- a/queries/analytics/event/getEvents.js+++ b/queries/analytics/event/getEvents.js@@ -31,12 +31,13 @@ function clickhouseQuery(websites, start_at) {`selectevent_uuid,website_id,- session_id,+ session_uuid,created_at,url,event_namefrom event- where website_id in (${websites.join[',']}- and created_at >= ${getDateFormat(start_at)})`,+ where event_name != ''+ and ${websites && websites.length > 0 ? `website_id in (${websites.join(',')})` : '0 = 0'}+ and created_at >= ${getDateFormat(start_at)}`,);}diff --git a/queries/analytics/pageview/getPageviewMetrics.js b/queries/analytics/pageview/getPageviewMetrics.jsindex 4d0f1455d..bea3502c9 100644--- a/queries/analytics/pageview/getPageviewMetrics.js+++ b/queries/analytics/pageview/getPageviewMetrics.js@@ -43,7 +43,7 @@ async function clickhouseQuery(website_id, { startDate, endDate, column, filters`select ${column} x, count(*) yfrom eventwhere website_id= $1- ${column !== 'event_name' ? `and event_name = ''` : ''}+ ${column !== 'event_name' ? `and event_name = ''` : `and event_name != ''`}and ${getBetweenDates('created_at', startDate, endDate)}${pageviewQuery}${sessionQuery}diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.jsindex 1cf4aba65..4f74cf983 100644--- a/queries/analytics/pageview/getPageviewStats.js+++ b/queries/analytics/pageview/getPageviewStats.js@@ -59,10 +59,10 @@ async function clickhouseQuery(from(select${getDateQuery('created_at', unit, timezone)} t,- count(${count !== '*' ? 'session_uuid' : count}) y+ count(${count !== '*' ? 'distinct session_uuid' : count}) yfrom event- where website_id= $1-+ where event_name = ''+ and website_id= $1and ${getBetweenDates('created_at', start_at, end_at)}${pageviewQuery}${sessionQuery}diff --git a/queries/analytics/pageview/getPageviews.js b/queries/analytics/pageview/getPageviews.jsindex 2bbfff699..bc909b725 100644--- a/queries/analytics/pageview/getPageviews.js+++ b/queries/analytics/pageview/getPageviews.js@@ -33,7 +33,7 @@ async function clickhouseQuery(websites, start_at) {urlfrom eventwhere event_name = ''- and website_id in (${websites.join[',']}- and created_at >= ${clickhouse.getDateFormat(start_at)})`,+ and ${websites && websites.length > 0 ? `website_id in (${websites.join(',')})` : '0 = 0'}+ and created_at >= ${clickhouse.getDateFormat(start_at)}`,);}diff --git a/queries/analytics/session/getSessions.js b/queries/analytics/session/getSessions.jsindex 16dd40472..7c47ce700 100644--- a/queries/analytics/session/getSessions.js+++ b/queries/analytics/session/getSessions.js@@ -44,7 +44,7 @@ async function clickhouseQuery(websites, start_at) {language,countryfrom event- where ${websites && websites.length > 0 ? `(website_id in (${websites.join[',']})` : '0 = 0'}+ where ${websites && websites.length > 0 ? `website_id in (${websites.join(',')})` : '0 = 0'}and created_at >= ${getDateFormat(start_at)}`,);}diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.jsindex 6e2693a1b..0c3d432a5 100644--- a/queries/analytics/stats/getWebsiteStats.js+++ b/queries/analytics/stats/getWebsiteStats.js@@ -9,7 +9,7 @@ export async function getWebsiteStats(...args) {});}-async function relationalQuery(website_id, start_at, end_at, filters = {}) {+async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;const params = [website_id, start_at, end_at];const { pageviewQuery, sessionQuery, joinSession } = parseFilters(@@ -41,7 +41,7 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {);}-async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {+async function clickhouseQuery(website_id, { start_at, end_at, filters = {} }) {const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;const params = [website_id];const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);