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

Merge pull request #1376 from umami-software/brian/um-24-event-data

Browse source 
Brian/um 24 event data
This commit is contained in:
Mike Cao 2022-08-01 23:50:08 -05:00 • committed by GitHub
commit df1c203c38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 229 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pages/api/collect.js
View file

@ -65,7 +65,7 @@ export default async (req, res) => {
const { type, payload } = getJsonBody(req);
let { url, referrer, event_type, event_value } = payload;
let { url, referrer, event_name, event_data } = payload;
if (process.env.REMOVE_TRAILING_SLASH) {
url = removeTrailingSlash(url);
@ -74,7 +74,7 @@ export default async (req, res) => {
if (type === 'pageview') {
await savePageView(website_id, { session_id, session_uuid, url, referrer });
} else if (type === 'event') {
await saveEvent(website_id, { session_id, session_uuid, url, event_type, event_value });
await saveEvent(website_id, { session_id, session_uuid, url, event_name, event_data });
} else {
return badRequest(res);
}

4
pages/api/website/[id]/events.js
View file

@ -14,7 +14,7 @@ export default async (req, res) => {
return unauthorized(res);
}
const { id, start_at, end_at, unit, tz, url, event_type } = req.query;
const { id, start_at, end_at, unit, tz, url, event_name } = req.query;
if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
return badRequest(res);
@ -26,7 +26,7 @@ export default async (req, res) => {
const events = await getEventMetrics(websiteId, startDate, endDate, tz, unit, {
url,
event_type,
event_name,
});
return ok(res, events);

2
pages/api/website/[id]/metrics.js
View file

@ -22,7 +22,7 @@ function getTable(type) {
function getColumn(type) {
if (type === 'event') {
return `concat(event_type, '\t', event_value)`;
return `event_name`;
}
return type;
}