ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add type to metrics.

pull/1740/head
Brian Cao 2023-01-12 21:48:21 -08:00
parent 7c7bb654d9
commit 8de369df96
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/api/websites/[id]/metrics.ts
View File

@ -144,8 +144,8 @@ export default async (
startDate, startDate,
endDate, endDate,
column, column,
table,
filters, filters,
type,
}); });
return ok(res, data); return ok(res, data);

16
queries/analytics/pageview/getPageviewMetrics.ts
View File

@ -12,8 +12,8 @@ export async function getPageviewMetrics(
startDate: Date; startDate: Date;
endDate: Date; endDate: Date;
column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum; column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
table: string;
filters: object; filters: object;
type: string;
}, },
] ]
) { ) {
@ -30,16 +30,17 @@ async function relationalQuery(
endDate: Date; endDate: Date;
column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum; column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
filters: object; filters: object;
type: string;
}, },
) { ) {
const { startDate, endDate, column, filters = {} } = data; const { startDate, endDate, column, filters = {}, type } = data;
const { rawQuery, parseFilters, toUuid } = prisma; const { rawQuery, parseFilters, toUuid } = prisma;
const params: any = { const params: any = [
websiteId, websiteId,
startDate, startDate,
endDate, endDate,
type: EVENT_TYPE.pageView, type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
}; ];
const { filterQuery, joinSession } = parseFilters(filters, params); const { filterQuery, joinSession } = parseFilters(filters, params);
return rawQuery( return rawQuery(
@ -63,15 +64,16 @@ async function clickhouseQuery(
endDate: Date; endDate: Date;
column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum; column: Prisma.WebsiteEventScalarFieldEnum | Prisma.SessionScalarFieldEnum;
filters: object; filters: object;
type: string;
}, },
) { ) {
const { startDate, endDate, column, filters = {} } = data; const { startDate, endDate, column, filters = {}, type } = data;
const { rawQuery, parseFilters, getBetweenDates } = clickhouse; const { rawQuery, parseFilters, getBetweenDates } = clickhouse;
const website = await cache.fetchWebsite(websiteId); const website = await cache.fetchWebsite(websiteId);
const params = { const params = {
websiteId, websiteId,
revId: website?.revId || 0, revId: website?.revId || 0,
eventType: EVENT_TYPE.pageView, eventType: type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
}; };
const { filterQuery } = parseFilters(filters, params); const { filterQuery } = parseFilters(filters, params);