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

clean-up event/event-data endpoints. fix for expanded view for mobile

Browse source
This commit is contained in:
Francis Cao 2025-10-15 11:32:19 -07:00
parent 9df012084d
commit a2b1089e62
8 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,14 +5,16 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
const FUNCTION_NAME = 'getEventData';
export async function getEventData(...args: [eventId: string]): Promise<EventData[]> {
export async function getEventData(
...args: [websiteId: string, eventId: string]
): Promise<EventData[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(eventId: string) {
async function relationalQuery(websiteId: string, eventId: string) {
const { rawQuery } = prisma;
return rawQuery(
@ -29,14 +31,15 @@ async function relationalQuery(eventId: string) {
data_type as dataType,
created_at as createdAt
from event_data
where event_id = {{eventId::uuid}}
website_id = {{websiteId::uuid}}
event_id = {{eventId::uuid}}
`,
{ eventId },
{ websiteId, eventId },
FUNCTION_NAME,
);
}
async function clickhouseQuery(eventId: string): Promise<EventData[]> {
async function clickhouseQuery(websiteId: string, eventId: string): Promise<EventData[]> {
const { rawQuery } = clickhouse;
return rawQuery(
@ -53,9 +56,10 @@ async function clickhouseQuery(eventId: string): Promise<EventData[]> {
data_type as dataType,
created_at as createdAt
from event_data
where event_id = {eventId:UUID}
where website_id = {websiteId:UUID}
and event_id = {eventId:UUID}
`,
{ eventId },
{ websiteId, eventId },
FUNCTION_NAME,
);
}

10
src/queries/sql/events/getEventDataEvents.ts
View file

@ -25,7 +25,10 @@ export async function getEventDataEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { event } = filters;
const { queryParams } = parseFilters(filters);
const { queryParams } = parseFilters({
...filters,
websiteId,
});
if (event) {
return rawQuery(
@ -75,7 +78,10 @@ async function clickhouseQuery(
): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { event } = filters;
const { queryParams } = parseFilters(filters);
const { queryParams } = parseFilters({
...filters,
websiteId,
});
if (event) {
return rawQuery(