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

add event name to properties table

Browse source
This commit is contained in:
Francis Cao 2024-08-14 12:29:47 -07:00
parent 04de691893
commit aaf9adacc6
5 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/queries/analytics/events/getEventDataProperties.ts
View file

@ -24,14 +24,15 @@ async function relationalQuery(
return rawQuery(
`
select
event_name as "eventName",
data_key as "propertyName",
count(*) as "total"
from event_data
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by data_key
order by 2 desc
group by event_name, data_key
order by 3 desc
limit 500
`,
params,
@ -41,7 +42,7 @@ async function relationalQuery(
async function clickhouseQuery(
websiteId: string,
filters: QueryFilters & { propertyName?: string },
): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
): Promise<{ eventName: string; propertyName: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, filters, {
columns: { propertyName: 'data_key' },
@ -50,23 +51,23 @@ async function clickhouseQuery(
return rawQuery(
`
select
event_name as eventName,
data_key as propertyName,
count(*) as total
from event_data
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
group by data_key
order by 2 desc
group by event_name, data_key
order by 1, 3 desc
limit 500
`,
params,
).then(result => {
return Object.values(result).map((a: any) => {
return {
eventName: a.eventName,
propertyName: a.propertyName,
dataType: Number(a.dataType),
propertyValue: a.propertyValue,
total: Number(a.total),
};
});

13
src/queries/analytics/events/getEventDataValues.ts
View file

@ -4,7 +4,10 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import { QueryFilters, WebsiteEventData } from 'lib/types';
export async function getEventDataValues(
...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
...args: [
websiteId: string,
filters: QueryFilters & { eventName?: string; propertyName?: string },
]
): Promise<WebsiteEventData[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@ -14,7 +17,7 @@ export async function getEventDataValues(
async function relationalQuery(
websiteId: string,
filters: QueryFilters & { propertyName?: string },
filters: QueryFilters & { eventName?: string; propertyName?: string },
) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, params } = await parseFilters(websiteId, filters);
@ -28,6 +31,7 @@ async function relationalQuery(
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
and data_key = {{propertyName}}
and event_key = {{eventName}}
${filterQuery}
group by string_value
order by 2 desc
@ -39,7 +43,7 @@ async function relationalQuery(
async function clickhouseQuery(
websiteId: string,
filters: QueryFilters & { propertyName?: string },
filters: QueryFilters & { eventName?: string; propertyName?: string },
): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, filters);
@ -55,8 +59,9 @@ async function clickhouseQuery(
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and data_key = {propertyName:String}
and event_name = {eventName:String}
${filterQuery}
group by value
group by event_name, value
order by 2 desc
limit 500;
`,