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
WebsiteId query param. Fix Prisma filters.
Brian Caob4bd988e4eba
diff --git a/components/metrics/EventDataForm.js b/components/metrics/EventDataForm.jsindex c30377f58..dbcc59179 100644--- a/components/metrics/EventDataForm.js+++ b/components/metrics/EventDataForm.js@@ -211,7 +211,6 @@ export default function EventDataForm({ websiteId, onClose, className }) {<TextField /></FormInput></FormRow>- +<FormButtons className={styles.formButtons}><Button variant="action" type="submit"><FormattedMessage id="label.add-filter" defaultMessage="Add Filter" />diff --git a/lib/prisma.ts b/lib/prisma.tsindex 4f63bf7d7..5136958cf 100644--- a/lib/prisma.ts+++ b/lib/prisma.ts@@ -19,6 +19,18 @@ const POSTGRESQL_DATE_FORMATS = {year: 'YYYY-01-01',};+function toUuid(): string {+ const db = getDatabaseType(process.env.DATABASE_URL);++ if (db === POSTGRESQL) {+ return '::uuid';+ }++ if (db === MYSQL) {+ return '';+ }+}+function getDateQuery(field: string, unit: string, timezone?: string): string {const db = getDatabaseType(process.env.DATABASE_URL);@@ -173,7 +185,7 @@ function parseFilters(event: { eventName },joinSession:os || browser || device || country- ? `inner join session on ${sessionKey} = session.${sessionKey}`+ ? `inner join session on website_event.${sessionKey} = session.${sessionKey}`: '',filterQuery: getFilterQuery(filters, params),};@@ -198,6 +210,7 @@ export default {getFilterQuery,getEventDataColumnsQuery,getEventDataFilterQuery,+ toUuid,parseFilters,rawQuery,};diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.tsindex 71cb11461..3264cb290 100644--- a/pages/api/websites/[id]/pageviews.ts+++ b/pages/api/websites/[id]/pageviews.ts@@ -77,7 +77,7 @@ export default async (endDate,timezone,unit,- count: 'distinct pageview.',+ count: 'distinct website_event.',filters: {url,os,diff --git a/queries/analytics/event/getEventData.ts b/queries/analytics/event/getEventData.tsindex 9d03ae82f..545c51124 100644--- a/queries/analytics/event/getEventData.ts+++ b/queries/analytics/event/getEventData.ts@@ -38,23 +38,23 @@ async function relationalQuery(},) {const { startDate, endDate, eventName, columns, filters } = data;- const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;- const params = [startDate, endDate];+ const { toUuid, rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;+ const params: any = [websiteId, startDate, endDate, eventName];return rawQuery(`select${getEventDataColumnsQuery('event_data', columns)}from website_event- where website_id ='${websiteId}'- and created_at between $1 and $2+ where website_id = $1${toUuid()}+ and created_at between $2 and $3and event_type = ${EVENT_TYPE.customEvent}- ${eventName ? `and eventName = ${eventName}` : ''}+ ${eventName ? `and eventName = $4` : ''}${Object.keys(filters).length > 0? `and ${getEventDataFilterQuery('event_data', filters)}`: ''}`,- params as any,+ params,);}diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.tsindex 0440cb3f2..42bc9fd80 100644--- a/queries/analytics/event/getEventMetrics.ts+++ b/queries/analytics/event/getEventMetrics.ts@@ -45,8 +45,8 @@ async function relationalQuery(};},) {- const { rawQuery, getDateQuery, getFilterQuery } = prisma;- const params = [startDate, endDate];+ const { toUuid, rawQuery, getDateQuery, getFilterQuery } = prisma;+ const params: any = [websiteId, startDate, endDate];return rawQuery(`select@@ -54,8 +54,8 @@ async function relationalQuery(${getDateQuery('created_at', unit, timezone)} t,count(*) yfrom website_event- where website_id='${websiteId}'- and created_at between $1 and $2+ where website_id = $1${toUuid()}+ and created_at between $2 and $3and event_type = ${EVENT_TYPE.customEvent}${getFilterQuery(filters, params)}group by 1, 2diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.tsindex 8b82721cd..33f5300b6 100644--- a/queries/analytics/pageview/getPageviewMetrics.ts+++ b/queries/analytics/pageview/getPageviewMetrics.ts@@ -34,8 +34,9 @@ async function relationalQuery(},) {const { startDate, endDate, column, filters = {}, type } = data;- const { rawQuery, parseFilters } = prisma;+ const { rawQuery, parseFilters, toUuid } = prisma;const params: any = [+ websiteId,startDate,endDate,type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,@@ -46,9 +47,9 @@ async function relationalQuery(`select ${column} x, count(*) yfrom website_event${joinSession}- where website_id='${websiteId}'- and website_event.created_at between $1 and $2- and event_type = $3+ where website_event.website_id = $1${toUuid()}+ and website_event.created_at between $2 and $3+ and event_type = $4${filterQuery}group by 1order by 2 desc`,diff --git a/queries/analytics/pageview/getPageviewStats.ts b/queries/analytics/pageview/getPageviewStats.tsindex b23f782bd..ab487b186 100644--- a/queries/analytics/pageview/getPageviewStats.ts+++ b/queries/analytics/pageview/getPageviewStats.ts@@ -45,8 +45,8 @@ async function relationalQuery(filters = {},sessionKey = 'session_id',} = data;- const { getDateQuery, parseFilters, rawQuery } = prisma;- const params = [startDate, endDate];+ const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma;+ const params: any = [websiteId, startDate, endDate];const { filterQuery, joinSession } = parseFilters(filters, params);return rawQuery(@@ -54,8 +54,8 @@ async function relationalQuery(count(${count !== '*' ? `${count}${sessionKey}` : count}) yfrom website_event${joinSession}- where website.website_id='${websiteId}'- and pageview.created_at between $1 and $2+ where website_event.website_id = $1${toUuid()}+ and website_event.created_at between $2 and $3and event_type = ${EVENT_TYPE.pageView}${filterQuery}group by 1`,@@ -90,7 +90,7 @@ async function clickhouseQuery(${getDateQuery('created_at', unit, timezone)} t,count(${count !== '*' ? 'distinct session_id' : count}) yfrom event- where website_id = $1+ where website_id = $1and rev_id = $2and event_type = ${EVENT_TYPE.pageView}and ${getBetweenDates('created_at', startDate, endDate)}diff --git a/queries/analytics/session/getSessionMetrics.ts b/queries/analytics/session/getSessionMetrics.tsindex cbaf235ec..460f370c0 100644--- a/queries/analytics/session/getSessionMetrics.ts+++ b/queries/analytics/session/getSessionMetrics.ts@@ -20,21 +20,21 @@ async function relationalQuery(data: { startDate: Date; endDate: Date; field: string; filters: object },) {const { startDate, endDate, field, filters = {} } = data;- const { parseFilters, rawQuery } = prisma;- const params = [startDate, endDate];+ const { toUuid, parseFilters, rawQuery } = prisma;+ const params: any = [websiteId, startDate, endDate];const { filterQuery, joinSession } = parseFilters(filters, params);return rawQuery(`select ${field} x, count(*) yfrom session as xwhere x.session_id in (- select pageview.session_id- from pageview+ select website_event.session_id+ from website_eventjoin website- on pageview.website_id = website.website_id+ on website_event.website_id = website.website_id${joinSession}- where website.website_id='${websiteId}'- and pageview.created_at between $1 and $2+ where website.website_id = $1${toUuid()}+ and website_event.created_at between $2 and $3${filterQuery})group by 1diff --git a/queries/analytics/stats/getActiveVisitors.ts b/queries/analytics/stats/getActiveVisitors.tsindex 0b07574d4..6c8a5b4fc 100644--- a/queries/analytics/stats/getActiveVisitors.ts+++ b/queries/analytics/stats/getActiveVisitors.ts@@ -11,16 +11,18 @@ export async function getActiveVisitors(...args: [websiteId: string]) {}async function relationalQuery(websiteId: string) {+ const { toUuid, rawQuery } = prisma;+const date = subMinutes(new Date(), 5);- const params = [date];+ const params: any = [websiteId, date];- return prisma.rawQuery(+ return rawQuery(`select count(distinct session_id) x- from pageview+ from website_eventjoin website- on pageview.website_id = website.website_id- where website.website_id = '${websiteId}'- and pageview.created_at >= $1`,+ on website_event.website_id = website.website_id+ where website.website_id = $1${toUuid()}+ and website_event.created_at >= $2`,params,);}diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/stats/getWebsiteStats.tsindex 779a67b84..5a83cceb3 100644--- a/queries/analytics/stats/getWebsiteStats.ts+++ b/queries/analytics/stats/getWebsiteStats.ts@@ -2,6 +2,7 @@ import prisma from 'lib/prisma';import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import cache from 'lib/cache';+import { EVENT_TYPE } from 'lib/constants';export async function getWebsiteStats(...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }]@@ -17,8 +18,8 @@ async function relationalQuery(data: { startDate: Date; endDate: Date; filters: object },) {const { startDate, endDate, filters = {} } = data;- const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;- const params = [startDate, endDate];+ const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;+ const params: any = [websiteId, startDate, endDate];const { filterQuery, joinSession } = parseFilters(filters, params);return rawQuery(@@ -27,16 +28,16 @@ async function relationalQuery(sum(case when t.c = 1 then 1 else 0 end) as "bounces",sum(t.time) as "totaltime"from (- select pageview.session_id,- ${getDateQuery('pageview.created_at', 'hour')},+ select website_event.session_id,+ ${getDateQuery('website_event.created_at', 'hour')},count(*) c,- ${getTimestampInterval('pageview.created_at')} as "time"- from pageview+ ${getTimestampInterval('website_event.created_at')} as "time"+ from website_eventjoin website- on pageview.website_id = website.website_id+ on website_event.website_id = website.website_id${joinSession}- where website.website_id='${websiteId}'- and pageview.created_at between $1 and $2+ where website.website_id = $1${toUuid()}+ and website_event.created_at between $2 and $3${filterQuery}group by 1, 2) t`,@@ -67,7 +68,7 @@ async function clickhouseQuery(min(created_at) min_time,max(created_at) max_timefrom event- where event_type = 1+ where event_type = ${EVENT_TYPE.pageView}and website_id = $1and rev_id = $2and ${getBetweenDates('created_at', startDate, endDate)}