watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

update api to new CH columns

Browse source
This commit is contained in:
Francis Cao 2022-10-08 16:12:33 -07:00
parent 36edbe2f4c
commit 96add409b6
19 changed files with 74 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pages/api/collect.js
View file

@ -59,7 +59,7 @@ export default async (req, res) => {
await useSession(req, res);
const {
session: { website_id, session },
session: { website_id, website_uuid, session },
} = req;
const { type, payload } = getJsonBody(req);
@ -73,9 +73,9 @@ export default async (req, res) => {
const event_uuid = uuid();
if (type === 'pageview') {
await savePageView(website_id, { session, url, referrer });
await savePageView(website_id, website_uuid, { session, url, referrer });
} else if (type === 'event') {
await saveEvent(website_id, {
await saveEvent(website_id, website_uuid, {
session,
event_uuid,
url,
@ -87,7 +87,12 @@ export default async (req, res) => {
}
const token = createToken(
{ website_id, session_id: session.session_id, session_uuid: session.session_uuid },
{
website_id,
website_uuid,
session_id: session.session_id,
session_uuid: session.session_uuid,
},
secret(),
);

3
pages/api/websites/[id]/active.js
View file

@ -14,8 +14,9 @@ export default async (req, res) => {
const { id } = req.query;
const websiteId = +id;
const website_uuid = id;
const result = await getActiveVisitors(websiteId);
const result = await getActiveVisitors(websiteId, website_uuid);
return ok(res, result);
}

3
pages/api/websites/[id]/events.js
View file

@ -21,10 +21,11 @@ export default async (req, res) => {
}
const websiteId = +id;
const website_uuid = id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
const events = await getEventMetrics(websiteId, startDate, endDate, tz, unit, {
const events = await getEventMetrics(websiteId, website_uuid, startDate, endDate, tz, unit, {
url,
event_name,
});

3
pages/api/websites/[id]/metrics.js
View file

@ -44,6 +44,7 @@ export default async (req, res) => {
const { id, type, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
const websiteId = +id;
const website_uuid = id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
@ -106,7 +107,7 @@ export default async (req, res) => {
query: type === 'query' && table !== 'event' ? true : undefined,
};
const data = await getPageviewMetrics(websiteId, {
const data = await getPageviewMetrics(websiteId, website_uuid, {
startDate,
endDate,
column,

5
pages/api/websites/[id]/pageviews.js
View file

@ -18,6 +18,7 @@ export default async (req, res) => {
req.query;
const websiteId = +id;
const website_uuid = id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
@ -26,7 +27,7 @@ export default async (req, res) => {
}
const [pageviews, sessions] = await Promise.all([
getPageviewStats(websiteId, {
getPageviewStats(websiteId, website_uuid, {
start_at: startDate,
end_at: endDate,
timezone: tz,
@ -41,7 +42,7 @@ export default async (req, res) => {
country,
},
}),
getPageviewStats(websiteId, {
getPageviewStats(websiteId, website_uuid, {
start_at: startDate,
end_at: endDate,
timezone: tz,

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

@ -14,6 +14,7 @@ export default async (req, res) => {
const { id, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
const websiteId = +id;
const website_uuid = id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
@ -21,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, {
const metrics = await getWebsiteStats(websiteId, website_uuid, {
start_at: startDate,
end_at: endDate,
filters: {
@ -33,7 +34,7 @@ export default async (req, res) => {
country,
},
});
const prevPeriod = await getWebsiteStats(websiteId, {
const prevPeriod = await getWebsiteStats(websiteId, website_uuid, {
start_at: prevStartDate,
end_at: prevEndDate,
filters: {