watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 06:07:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed properties queries.

Browse source
This commit is contained in:
Mike Cao 2025-07-15 01:31:08 -07:00
parent 465a03f987
commit 5e6799a715
38 changed files with 139 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/queries/sql/events/getEventDataProperties.ts
View file

@ -17,9 +17,12 @@ async function relationalQuery(
filters: QueryFilters & { propertyName?: string },
) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
const { filterQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
return rawQuery(
`
@ -48,9 +51,12 @@ async function clickhouseQuery(
filters: QueryFilters & { propertyName?: string },
): Promise<{ eventName: string; propertyName: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
const { filterQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
return rawQuery(
`

9
src/queries/sql/events/getWebsiteEvents.ts
View file

@ -36,6 +36,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
referrer_path as "referrerPath",
referrer_query as "referrerQuery",
referrer_domain as "referrerDomain",
country as country,
city as city,
device as device,
os as os,
browser as browser,
page_title as "pageTitle",
event_type as "eventType",
event_name as "eventName"
@ -77,12 +82,14 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
referrer_query as referrerQuery,
referrer_domain as referrerDomain,
country as country,
city as city,
device as device,
os as os,
browser as browser,
page_title as pageTitle,
event_type as eventType,
event_name as eventName
event_name as eventName,
event_id IN (SELECT event_id FROM event_data) AS hasData
from website_event
${cohortQuery}
where website_id = {websiteId:UUID}

18
src/queries/sql/sessions/getSessionDataProperties.ts
View file

@ -17,9 +17,12 @@ async function relationalQuery(
filters: QueryFilters & { propertyName?: string },
) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
const { filterQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
return rawQuery(
`
@ -46,9 +49,12 @@ async function clickhouseQuery(
filters: QueryFilters & { propertyName?: string },
): Promise<{ propertyName: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
const { filterQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
return rawQuery(
`