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

Merge Session/Event/Pageview CH

Browse source
This commit is contained in:
Brian Cao 2022-09-12 09:55:34 -07:00
parent d377ef86e7
commit 52e036964b
18 changed files with 237 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,11 +48,16 @@ export default async (req, res) => {
const endDate = new Date(+end_at);
if (sessionColumns.includes(type)) {
let data = await getSessionMetrics(websiteId, startDate, endDate, type, {
os,
browser,
device,
country,
let data = await getSessionMetrics(websiteId, {
startDate,
endDate,
field: type,
filters: {
os,
browser,
device,
country,
},
});
if (type === 'language') {
@ -101,7 +106,13 @@ export default async (req, res) => {
query: type === 'query' && table !== 'event' ? true : undefined,
};
const data = await getPageviewMetrics(websiteId, startDate, endDate, column, table, filters);
const data = await getPageviewMetrics(websiteId, {
startDate,
endDate,
column,
table,
filters,
});
return ok(res, data);
}