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

Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report

Browse source
This commit is contained in:
Francis Cao 2023-08-04 15:27:54 -07:00
commit 1d1b9cf51c
6 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pages/api/event-data/events.ts
View file

@ -21,15 +21,19 @@ export default async (
await useAuth(req, res);
if (req.method === 'GET') {
const { websiteId, startAt, endAt, field, event } = req.query;
const { websiteId, startAt, endAt, eventName } = req.query;
if (!(await canViewWebsite(req.auth, websiteId))) {
return unauthorized(res);
}
const data = await getEventDataEvents(websiteId, new Date(+startAt), new Date(+endAt), {
field,
event,
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
const data = await getEventDataEvents(websiteId, {
startDate,
endDate,
eventName,
});
return ok(res, data);

5
pages/api/event-data/stats.ts
View file

@ -28,7 +28,10 @@ export default async (
return unauthorized(res);
}
const results = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt));
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
const results = await getEventDataFields(websiteId, { startDate, endDate });
const data = results.reduce(
(obj, row) => {