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
update dashboard queries to use mv
Francis Caobfd5c5f150d2
diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.tsindex 3dac217b2..b37c38f74 100644--- a/src/pages/api/websites/[websiteId]/metrics.ts+++ b/src/pages/api/websites/[websiteId]/metrics.ts@@ -64,7 +64,7 @@ export default async (await useAuth(req, res);await useValidate(schema, req, res);- const { websiteId, type, limit, offset, search } = req.query;+ const { websiteId, type, limit, offset, search, unit } = req.query;if (req.method === 'GET') {if (!(await canViewWebsite(req.auth, websiteId))) {@@ -89,7 +89,7 @@ export default async (}if (SESSION_COLUMNS.includes(type)) {- const data = await getSessionMetrics(websiteId, type, filters, limit, offset);+ const data = await getSessionMetrics(websiteId, type, filters, limit, offset, unit as string);if (type === 'language') {const combined = {};@@ -111,7 +111,14 @@ export default async (}if (EVENT_COLUMNS.includes(type)) {- const data = await getPageviewMetrics(websiteId, type, filters, limit, offset);+ const data = await getPageviewMetrics(+ websiteId,+ type,+ filters,+ limit,+ offset,+ unit as string,+ );return ok(res, data);}diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.tsindex 67ccb04aa..25c264b78 100644--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts@@ -1,3 +1,4 @@+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */import clickhouse from 'lib/clickhouse';import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';@@ -5,7 +6,14 @@ import prisma from 'lib/prisma';import { QueryFilters } from 'lib/types';export async function getPageviewMetrics(- ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]+ ...args: [+ websiteId: string,+ type: string,+ filters: QueryFilters,+ limit?: number,+ offset?: number,+ unit?: string,+ ]) {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -19,6 +27,7 @@ async function relationalQuery(filters: QueryFilters,limit: number = 500,offset: number = 0,+ unit: string,) {const column = FILTER_COLUMNS[type] || type;const { rawQuery, parseFilters } = prisma;@@ -79,6 +88,7 @@ async function clickhouseQuery(filters: QueryFilters,limit: number = 500,offset: number = 0,+ unit: string,): Promise<{ x: string; y: number }[]> {const column = FILTER_COLUMNS[type] || type;const { rawQuery, parseFilters } = clickhouse;@@ -108,10 +118,12 @@ async function clickhouseQuery(and x.target_created_at = website_event.created_at`;}+ const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';+return rawQuery(`- select ${column} x, count(*) y- from website_event+ select ${column} x, countMerge(views) y+ from ${table} website_event${entryExitQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.tsindex a37a15662..f6942e6a2 100644--- a/src/queries/analytics/pageviews/getPageviewStats.ts+++ b/src/queries/analytics/pageviews/getPageviewStats.ts@@ -46,6 +46,7 @@ async function clickhouseQuery(...filters,eventType: EVENT_TYPE.pageView,});+ const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';return rawQuery(`@@ -55,8 +56,8 @@ async function clickhouseQuery(from (select${getDateQuery('created_at', unit, timezone)} as t,- count(*) as y- from website_event+ countMerge(views) as y+ from ${table} website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and event_type = {eventType:UInt32}diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.tsindex e522a7eff..58b5198ce 100644--- a/src/queries/analytics/sessions/getSessionMetrics.ts+++ b/src/queries/analytics/sessions/getSessionMetrics.ts@@ -1,3 +1,4 @@+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */import prisma from 'lib/prisma';import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';@@ -5,7 +6,14 @@ import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';import { QueryFilters } from 'lib/types';export async function getSessionMetrics(- ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]+ ...args: [+ websiteId: string,+ type: string,+ filters: QueryFilters,+ limit?: number,+ offset?: number,+ unit?: string,+ ]) {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -19,6 +27,7 @@ async function relationalQuery(filters: QueryFilters,limit: number = 500,offset: number = 0,+ unit: string,) {const column = FILTER_COLUMNS[type] || type;const { parseFilters, rawQuery } = prisma;@@ -62,6 +71,7 @@ async function clickhouseQuery(filters: QueryFilters,limit: number = 500,offset: number = 0,+ unit: string,): Promise<{ x: string; y: number }[]> {const column = FILTER_COLUMNS[type] || type;const { parseFilters, rawQuery } = clickhouse;@@ -70,6 +80,7 @@ async function clickhouseQuery(eventType: EVENT_TYPE.pageView,});const includeCountry = column === 'city' || column === 'subdivision1';+ const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';return rawQuery(`@@ -77,7 +88,7 @@ async function clickhouseQuery(${column} x,uniq(session_id) y${includeCountry ? ', country' : ''}- from website_event+ from ${table} website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and event_type = {eventType:UInt32}diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.tsindex e3af7ba6d..dc6d635d1 100644--- a/src/queries/analytics/sessions/getSessionStats.ts+++ b/src/queries/analytics/sessions/getSessionStats.ts@@ -46,6 +46,7 @@ async function clickhouseQuery(...filters,eventType: EVENT_TYPE.pageView,});+ const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';return rawQuery(`@@ -55,8 +56,8 @@ async function clickhouseQuery(from (select${getDateQuery('created_at', unit, timezone)} as t,- count(distinct session_id) as y- from website_event+ uniq(session_id) as y+ from ${table} website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and event_type = {eventType:UInt32}