watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-20 12:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feat/um 154 add event data rewrite queries (#1739)

Browse source 
* Cherry pick prisma query protection.

* Re-write CH queries to use query params.

* Fix query.

* Fix modal.  Re-add form css.
This commit is contained in:
Brian Cao 2023-01-12 21:17:57 -08:00 • committed by GitHub
parent 4c202741c2
commit 0409a7d261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 257 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

14
queries/analytics/event/getEventMetrics.ts
View file

@ -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(*) y
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 $3
and event_type = ${EVENT_TYPE.customEvent}
${getFilterQuery(filters, params)}
group by 1, 2
@ -85,7 +85,7 @@ async function clickhouseQuery(
) {
const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
const website = await cache.fetchWebsite(websiteId);
const params = [websiteId, website?.revId || 0];
const params = { websiteId, revId: website?.revId || 0 };
return rawQuery(
`select
@ -93,8 +93,8 @@ async function clickhouseQuery(
${getDateQuery('created_at', unit, timezone)} t,
count(*) y
from event
where website_id = $1
and rev_id = $2
where website_id = {websiteId:UUID}
and rev_id = {revId:UInt32}
and event_type = ${EVENT_TYPE.customEvent}
and ${getBetweenDates('created_at', startDate, endDate)}
${getFilterQuery(filters, params)}