Merge Session/Event/Pageview CH

pages/api/website/[id]/metrics.js

@@ -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);
     }

pages/api/website/[id]/pageviews.js

@@ -26,20 +26,34 @@ export default async (req, res) => {
     }
 
     const [pageviews, sessions] = await Promise.all([
-      getPageviewStats(websiteId, startDate, endDate, tz, unit, '*', {
-        url,
-        referrer,
-        os,
-        browser,
-        device,
-        country,
+      getPageviewStats(websiteId, {
+        startDate,
+        endDate,
+        tz,
+        unit,
+        count: '*',
+        filters: {
+          url,
+          referrer,
+          os,
+          browser,
+          device,
+          country,
+        },
       }),
-      getPageviewStats(websiteId, startDate, endDate, tz, unit, 'distinct pageview.', {
-        url,
-        os,
-        browser,
-        device,
-        country,
+      getPageviewStats(websiteId, {
+        startDate,
+        endDate,
+        tz,
+        unit,
+        count: 'distinct pageview.',
+        filters: {
+          url,
+          os,
+          browser,
+          device,
+          country,
+        },
       }),
     ]);