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
Add Reset / Delete functionality.
Brian Cao30743feb0e42
diff --git a/queries/admin/user/deleteUser.js b/queries/admin/user/deleteUser.jsindex ed4cf51bc..5970d2a5e 100644--- a/queries/admin/user/deleteUser.js+++ b/queries/admin/user/deleteUser.js@@ -16,13 +16,7 @@ export async function deleteUser(userId) {return client.$transaction([- client.pageview.deleteMany({- where: { websiteId: { in: websiteIds } },- }),- client.eventData.deleteMany({- where: { event: { websiteId: { in: websiteIds } } },- }),- client.event.deleteMany({+ client.websiteEvent.deleteMany({where: { websiteId: { in: websiteIds } },}),client.session.deleteMany({diff --git a/queries/admin/website/deleteWebsite.js b/queries/admin/website/deleteWebsite.jsindex 8ab4f2bce..685cee8a5 100644--- a/queries/admin/website/deleteWebsite.js+++ b/queries/admin/website/deleteWebsite.js@@ -5,13 +5,7 @@ export async function deleteWebsite(id) {const { client, transaction } = prisma;return transaction([- client.pageview.deleteMany({- where: { websiteId: id },- }),- client.eventData.deleteMany({- where: { event: { websiteId: id } },- }),- client.event.deleteMany({+ client.websiteEvent.deleteMany({where: { websiteId: id },}),client.session.deleteMany({diff --git a/queries/admin/website/resetWebsite.js b/queries/admin/website/resetWebsite.jsindex 7da3183ae..f4d685cb9 100644--- a/queries/admin/website/resetWebsite.js+++ b/queries/admin/website/resetWebsite.js@@ -1,20 +1,25 @@import prisma from 'lib/prisma';+import { getWebsite } from 'queries';+import cache from 'lib/cache';export async function resetWebsite(id) {const { client, transaction } = prisma;+ const { revId } = await getWebsite({ id });+return transaction([- client.pageview.deleteMany({- where: { websiteId: id },- }),- client.eventData.deleteMany({- where: { event: { websiteId: id } },- }),- client.event.deleteMany({+ client.websiteEvent.deleteMany({where: { websiteId: id },}),client.session.deleteMany({where: { websiteId: id },}),- ]);+ client.website.update({ where: { id }, data: { revId: revId + 1 } }),+ ]).then(async data => {+ if (cache.enabled) {+ await cache.storeWebsite(data[2]);+ }++ return data;+ });}diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.jsindex bfc5d403e..c711d448a 100644--- a/queries/analytics/pageview/getPageviewStats.js+++ b/queries/analytics/pageview/getPageviewStats.js@@ -66,7 +66,8 @@ async function clickhouseQuery(count(${count !== '*' ? 'distinct session_id' : count}) yfrom eventwhere event_name = ''- and website_id= $1+ and website_id = $1+ and rev_id = $2and ${getBetweenDates('created_at', start_at, end_at)}${pageviewQuery}${sessionQuery}diff --git a/queries/analytics/pageview/getPageviews.js b/queries/analytics/pageview/getPageviews.jsindex 6dbb4b30e..2bf41b0b2 100644--- a/queries/analytics/pageview/getPageviews.js+++ b/queries/analytics/pageview/getPageviews.js@@ -33,11 +33,11 @@ async function clickhouseQuery(websites, start_at) {urlfrom eventwhere event_name = ''- and ${- websites && websites.length > 0- ? `website_id in (${getCommaSeparatedStringFormat(websites)})`- : '0 = 0'- }+ and ${+ websites && websites.length > 0+ ? `website_id in (${getCommaSeparatedStringFormat(websites)})`+ : '0 = 0'+ }and created_at >= ${clickhouse.getDateFormat(start_at)}`,);}diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.jsindex c6e37cd45..002d8a9c1 100644--- a/queries/analytics/stats/getWebsiteStats.js+++ b/queries/analytics/stats/getWebsiteStats.js@@ -1,6 +1,7 @@import prisma from 'lib/prisma';import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';+import cache from 'lib/cache';export async function getWebsiteStats(...args) {return runQuery({@@ -45,7 +46,8 @@ async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;- const params = [websiteId];+ const website = await cache.fetchWebsite(websiteId);+ const params = [websiteId, website?.revId || 0];const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);return rawQuery(@@ -63,6 +65,7 @@ async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {from eventwhere event_name = ''and website_id = $1+ and rev_id = $2and ${getBetweenDates('created_at', start_at, end_at)}${pageviewQuery}${sessionQuery}