m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix filter params

Browse Source
This commit is contained in:
Francis Cao 2023-07-31 11:42:47 -07:00
parent 95d824542f
commit 7e112b8469
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/prisma.ts
View File

@ -70,7 +70,7 @@ function getFilterQuery(filters = {}, params = []): string {
if (filter !== undefined) { if (filter !== undefined) {
const column = FILTER_COLUMNS[key] || key; const column = FILTER_COLUMNS[key] || key;
arr.push(`and ${column}=$${params.length + 1}`); arr.push(`and ${column}={{${key}}}`);
params.push(decodeURIComponent(filter)); params.push(decodeURIComponent(filter));
} }

2
queries/analytics/events/getEventMetrics.ts
View File

@ -47,11 +47,11 @@ async function relationalQuery(websiteId: string, criteria: GetEventMetricsCrite
order by 2 order by 2
`, `,
{ {
...filters,
websiteId, websiteId,
startDate: maxDate(startDate, website.resetAt), startDate: maxDate(startDate, website.resetAt),
endDate, endDate,
eventType: EVENT_TYPE.customEvent, eventType: EVENT_TYPE.customEvent,
...filters,
}, },
); );
} }

1
queries/analytics/pageviews/getPageviewMetrics.ts
View File

@ -39,6 +39,7 @@ async function relationalQuery(
startDate: maxDate(startDate, website.resetAt), startDate: maxDate(startDate, website.resetAt),
endDate, endDate,
eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView, eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
...filters,
}; };
let excludeDomain = ''; let excludeDomain = '';

2
queries/analytics/pageviews/getPageviewStats.ts
View File

@ -52,11 +52,11 @@ async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteri
group by 1 group by 1
`, `,
{ {
...filters,
websiteId, websiteId,
startDate: maxDate(startDate, website.resetAt), startDate: maxDate(startDate, website.resetAt),
endDate, endDate,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
...filters,
}, },
); );
} }

7
queries/analytics/sessions/getSessionMetrics.ts
View File

@ -42,7 +42,12 @@ async function relationalQuery(
group by 1 group by 1
order by 2 desc order by 2 desc
limit 100`, limit 100`,
{ ...filters, websiteId, startDate: maxDate(startDate, website.resetAt), endDate }, {
websiteId,
startDate: maxDate(startDate, website.resetAt),
endDate,
...filters,
},
); );
} }

2
queries/analytics/stats/getWebsiteStats.ts
View File

@ -51,11 +51,11 @@ async function relationalQuery(
) as t ) as t
`, `,
{ {
...filters,
websiteId, websiteId,
startDate: maxDate(startDate, website.resetAt), startDate: maxDate(startDate, website.resetAt),
endDate, endDate,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
...filters,
}, },
); );
} }