m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-30 13:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao 2022-11-10 04:47:24 -08:00
commit cd9036adaf
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
queries/admin/user/deleteUser.js
View File

@ -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({

8
queries/admin/website/deleteWebsite.js
View File

@ -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({

21
queries/admin/website/resetWebsite.js
View File

@ -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;
});
}

3
queries/analytics/pageview/getPageviewStats.js
View File

@ -66,7 +66,8 @@ async function clickhouseQuery(
count(${count !== '*' ? 'distinct session_id' : count}) y
from event
where event_name = ''
and website_id= $1
and website_id = $1
and rev_id = $2
and ${getBetweenDates('created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}

10
queries/analytics/pageview/getPageviews.js
View File

@ -33,11 +33,11 @@ async function clickhouseQuery(websites, start_at) {
url
from event
where 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)}`,
);
}

5
queries/analytics/stats/getWebsiteStats.js
View File

@ -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 event
where event_name = ''
and website_id = $1
and rev_id = $2
and ${getBetweenDates('created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}