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

add event data

Browse source
This commit is contained in:
Brian Cao 2022-10-21 16:42:44 -07:00
parent 67394194af
commit 75778fdfc7
22 changed files with 446 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

52
queries/analytics/event/getEventData.js
View file

@ -9,16 +9,12 @@ export async function getEventData(...args) {
});
}
async function relationalQuery(
websiteId,
{ startDate, endDate, timezone = 'utc', unit = 'day', event_name, columns, filters },
) {
const { rawQuery, getDateQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
async function relationalQuery(websiteId, { startDate, endDate, event_name, columns, filters }) {
const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
const params = [startDate, endDate];
return rawQuery(
`select
${getDateQuery('event.created_at', unit, timezone)} t,
${getEventDataColumnsQuery('event_data.event_data', columns)}
from event
join website
@ -28,38 +24,40 @@ async function relationalQuery(
where website_uuid='${websiteId}'
and event.created_at between $1 and $2
${event_name ? `and event_name = ${event_name}` : ''}
${filters ? `and ${getEventDataFilterQuery('event_data.event_data', filters)}` : ''}
group by 1
order by 2`,
${
Object.keys(filters).length > 0
? `and ${getEventDataFilterQuery('event_data.event_data', filters)}`
: ''
}`,
params,
);
).then(results => {
return Object.keys(results[0]).map(a => {
return { x: a, y: results[0][`${a}`] };
});
});
}
async function clickhouseQuery(
websiteId,
{ startDate, endDate, timezone = 'UTC', unit = 'day', event_name, columns, filters },
) {
const {
rawQuery,
getDateQuery,
getBetweenDates,
getEventDataColumnsQuery,
getEventDataFilterQuery,
} = clickhouse;
async function clickhouseQuery(websiteId, { startDate, endDate, event_name, columns, filters }) {
const { rawQuery, getBetweenDates, getEventDataColumnsQuery, getEventDataFilterQuery } =
clickhouse;
const params = [websiteId];
return rawQuery(
`select
event_name x,
${getDateQuery('created_at', unit, timezone)} t,
${getEventDataColumnsQuery('event_data', columns)}
from event
where website_id= $1
${event_name ? `and event_name = ${event_name}` : ''}
and ${getBetweenDates('created_at', startDate, endDate)}
${filters ? `and ${getEventDataFilterQuery('event_data', filters)}` : ''}
group by x, t
order by t`,
${
Object.keys(filters).length > 0
? `and ${getEventDataFilterQuery('event_data', filters)}`
: ''
}`,
params,
);
).then(results => {
return Object.keys(results[0]).map(a => {
return { x: a, y: results[0][`${a}`] };
});
});
}

4
queries/analytics/event/getEventMetrics.js
View file

@ -18,7 +18,7 @@ async function relationalQuery(
filters = {},
) {
const { rawQuery, getDateQuery, getFilterQuery } = prisma;
const params = [websiteId, start_at, end_at];
const params = [start_at, end_at];
return rawQuery(
`select
@ -29,7 +29,7 @@ async function relationalQuery(
join website
on event.website_id = website.website_id
where website_uuid='${websiteId}'
and event.created_at between $2 and $3
and event.created_at between $1 and $2
${getFilterQuery('event', filters, params)}
group by 1, 2
order by 2`,

4
queries/analytics/pageview/getPageviewMetrics.js
View file

@ -11,7 +11,7 @@ export async function getPageviewMetrics(...args) {
async function relationalQuery(websiteId, { startDate, endDate, column, table, filters = {} }) {
const { rawQuery, parseFilters } = prisma;
const params = [websiteId, startDate, endDate];
const params = [startDate, endDate];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table,
column,
@ -25,7 +25,7 @@ async function relationalQuery(websiteId, { startDate, endDate, column, table, f
${` join website on ${table}.website_id = website.website_id`}
${joinSession}
where website.website_uuid='${websiteId}'
and ${table}.created_at between $2 and $3
and ${table}.created_at between $1 and $2
${pageviewQuery}
${joinSession && sessionQuery}
${eventQuery}

4
queries/analytics/pageview/getPageviewParams.js
View file

@ -10,7 +10,7 @@ export async function getPageviewParams(...args) {
async function relationalQuery(websiteId, start_at, end_at, column, table, filters = {}) {
const { parseFilters, rawQuery } = prisma;
const params = [websiteId, start_at, end_at];
const params = [start_at, end_at];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table,
column,
@ -25,7 +25,7 @@ async function relationalQuery(websiteId, start_at, end_at, column, table, filte
${` join website on ${table}.website_id = website.website_id`}
${joinSession}
where website.website_uuid='${websiteId}'
and ${table}.created_at between $2 and $3
and ${table}.created_at between $1 and $2
and ${table}.url like '%?%'
${pageviewQuery}
${joinSession && sessionQuery}

4
queries/analytics/pageview/getPageviewStats.js
View file

@ -22,7 +22,7 @@ async function relationalQuery(
},
) {
const { getDateQuery, parseFilters, rawQuery } = prisma;
const params = [websiteId, start_at, end_at];
const params = [start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@ -38,7 +38,7 @@ async function relationalQuery(
on pageview.website_id = website.website_id
${joinSession}
where website.website_uuid='${websiteId}'
and pageview.created_at between $2 and $3
and pageview.created_at between $1 and $2
${pageviewQuery}
${sessionQuery}
group by 1`,

4
queries/analytics/session/getSessionMetrics.js
View file

@ -11,7 +11,7 @@ export async function getSessionMetrics(...args) {
async function relationalQuery(websiteId, { startDate, endDate, field, filters = {} }) {
const { parseFilters, rawQuery } = prisma;
const params = [websiteId, startDate, endDate];
const params = [startDate, endDate];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(null, filters, params);
return rawQuery(
@ -24,7 +24,7 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
on pageview.website_id = website.website_id
${joinSession}
where website.website_uuid='${websiteId}'
and pageview.created_at between $2 and $3
and pageview.created_at between $1 and $2
${pageviewQuery}
${sessionQuery}
)

4
queries/analytics/stats/getActiveVisitors.js
View file

@ -12,7 +12,7 @@ export async function getActiveVisitors(...args) {
async function relationalQuery(websiteId) {
const date = subMinutes(new Date(), 5);
const params = [websiteId, date];
const params = [date];
return prisma.rawQuery(
`select count(distinct session_id) x
@ -20,7 +20,7 @@ async function relationalQuery(websiteId) {
join website
on pageview.website_id = website.website_id
where website.website_uuid = '${websiteId}'
and pageview.created_at >= $2`,
and pageview.created_at >= $1`,
params,
);
}

4
queries/analytics/stats/getWebsiteStats.js
View file

@ -11,7 +11,7 @@ export async function getWebsiteStats(...args) {
async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params = [websiteId, start_at, end_at];
const params = [start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@ -34,7 +34,7 @@ async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
on pageview.website_id = website.website_id
${joinSession}
where website.website_uuid='${websiteId}'
and pageview.created_at between $2 and $3
and pageview.created_at between $1 and $2
${pageviewQuery}
${sessionQuery}
group by 1, 2