roll back id adds
This commit is contained in:
@@ -14,9 +14,8 @@ export default async (req, res) => {
|
||||
const { id } = req.query;
|
||||
|
||||
const websiteId = +id;
|
||||
const website_uuid = id;
|
||||
|
||||
const result = await getActiveVisitors(websiteId, website_uuid);
|
||||
const result = await getActiveVisitors(websiteId);
|
||||
|
||||
return ok(res, result);
|
||||
}
|
||||
|
||||
@@ -21,11 +21,10 @@ 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, website_uuid, startDate, endDate, tz, unit, {
|
||||
const events = await getEventMetrics(websiteId, startDate, endDate, tz, unit, {
|
||||
url,
|
||||
eventName: event_name,
|
||||
});
|
||||
|
||||
@@ -44,7 +44,6 @@ 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);
|
||||
|
||||
@@ -107,7 +106,7 @@ export default async (req, res) => {
|
||||
query: type === 'query' && table !== 'event' ? true : undefined,
|
||||
};
|
||||
|
||||
const data = await getPageviewMetrics(websiteId, website_uuid, {
|
||||
const data = await getPageviewMetrics(websiteId, {
|
||||
startDate,
|
||||
endDate,
|
||||
column,
|
||||
|
||||
@@ -18,7 +18,6 @@ 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);
|
||||
|
||||
@@ -27,7 +26,7 @@ export default async (req, res) => {
|
||||
}
|
||||
|
||||
const [pageviews, sessions] = await Promise.all([
|
||||
getPageviewStats(websiteId, website_uuid, {
|
||||
getPageviewStats(websiteId, {
|
||||
start_at: startDate,
|
||||
end_at: endDate,
|
||||
timezone: tz,
|
||||
@@ -42,7 +41,7 @@ export default async (req, res) => {
|
||||
country,
|
||||
},
|
||||
}),
|
||||
getPageviewStats(websiteId, website_uuid, {
|
||||
getPageviewStats(websiteId, {
|
||||
start_at: startDate,
|
||||
end_at: endDate,
|
||||
timezone: tz,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getWebsiteStats, getWebsiteById } from 'queries';
|
||||
import { getWebsiteStats } from 'queries';
|
||||
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
|
||||
import { allowQuery } from 'lib/auth';
|
||||
import { useCors } from 'lib/middleware';
|
||||
@@ -14,7 +14,6 @@ export default async (req, res) => {
|
||||
const { website_id, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
|
||||
|
||||
const websiteId = +website_id;
|
||||
let websiteUuid = (await getWebsiteById(websiteId)).websiteUuid;
|
||||
const startDate = new Date(+start_at);
|
||||
const endDate = new Date(+end_at);
|
||||
|
||||
@@ -22,7 +21,7 @@ export default async (req, res) => {
|
||||
const prevStartDate = new Date(+start_at - distance);
|
||||
const prevEndDate = new Date(+end_at - distance);
|
||||
|
||||
const metrics = await getWebsiteStats(websiteUuid, {
|
||||
const metrics = await getWebsiteStats(websiteId, {
|
||||
start_at: startDate,
|
||||
end_at: endDate,
|
||||
filters: {
|
||||
@@ -34,7 +33,7 @@ export default async (req, res) => {
|
||||
country,
|
||||
},
|
||||
});
|
||||
const prevPeriod = await getWebsiteStats(websiteUuid, {
|
||||
const prevPeriod = await getWebsiteStats(websiteId, {
|
||||
start_at: prevStartDate,
|
||||
end_at: prevEndDate,
|
||||
filters: {
|
||||
|
||||
Reference in New Issue
Block a user