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

Add sql param logic.

Browse source
This commit is contained in:
Brian Cao 2023-01-16 12:58:51 -08:00
parent cc46cfdcbf
commit d93c2f9dd7
9 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
queries/analytics/stats/getActiveVisitors.js
View file

@ -11,16 +11,17 @@ export async function getActiveVisitors(...args) {
}
async function relationalQuery(websiteId) {
const { rawQuery, toUuid } = prisma;
const date = subMinutes(new Date(), 5);
const params = [date];
const params = [websiteId, date];
return prisma.rawQuery(
return rawQuery(
`select count(distinct session_id) x
from pageview
join website
on pageview.website_id = website.website_id
where website.website_uuid = '${websiteId}'
and pageview.created_at >= $1`,
where website.website_uuid = $1${toUuid()}
and pageview.created_at >= $2`,
params,
);
}

8
queries/analytics/stats/getWebsiteStats.js
View file

@ -10,8 +10,8 @@ export async function getWebsiteStats(...args) {
}
async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params = [start_at, end_at];
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery, toUuid } = prisma;
const params = [websiteId, start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@ -33,8 +33,8 @@ async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
join website
on pageview.website_id = website.website_id
${joinSession}
where website.website_uuid='${websiteId}'
and pageview.created_at between $1 and $2
where website.website_uuid = $1${toUuid()}
and pageview.created_at between $2 and $3
${pageviewQuery}
${sessionQuery}
group by 1, 2