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

Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid

Browse source
This commit is contained in:
Brian Cao 2022-10-10 16:20:07 -07:00
commit ec6454aead
65 changed files with 436 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pages/api/websites/[id]/stats.js
View file

@ -1,4 +1,4 @@
import { getWebsiteStats } from 'queries';
import { getWebsiteStats, getWebsiteById } from 'queries';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useCors } from 'lib/middleware';
@ -11,10 +11,10 @@ export default async (req, res) => {
return unauthorized(res);
}
const { id, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
const { website_id, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
const websiteId = +id;
const website_uuid = id;
const websiteId = +website_id;
let websiteUuid = (await getWebsiteById(websiteId)).websiteUuid;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
@ -22,7 +22,7 @@ export default async (req, res) => {
const prevStartDate = new Date(+start_at - distance);
const prevEndDate = new Date(+end_at - distance);
const metrics = await getWebsiteStats(websiteId, website_uuid, {
const metrics = await getWebsiteStats(websiteUuid, {
start_at: startDate,
end_at: endDate,
filters: {
@ -34,7 +34,7 @@ export default async (req, res) => {
country,
},
});
const prevPeriod = await getWebsiteStats(websiteId, website_uuid, {
const prevPeriod = await getWebsiteStats(websiteUuid, {
start_at: prevStartDate,
end_at: prevEndDate,
filters: {