Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts:
#	pages/api/account/index.js

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

@@ -0,0 +1,122 @@
+import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'queries';
+import { ok, methodNotAllowed, unauthorized, badRequest } from 'next-basics';
+import { allowQuery } from 'lib/auth';
+import { useCors } from 'lib/middleware';
+import { FILTER_IGNORED } from 'lib/constants';
+
+const sessionColumns = ['browser', 'os', 'device', 'screen', 'country', 'language'];
+const pageviewColumns = ['url', 'referrer', 'query'];
+
+function getTable(type) {
+  if (type === 'event') {
+    return 'event';
+  }
+
+  if (sessionColumns.includes(type)) {
+    return 'session';
+  }
+
+  if (pageviewColumns.includes(type)) {
+    return 'pageview';
+  }
+
+  throw new Error('Invalid type');
+}
+
+function getColumn(type) {
+  if (type === 'event') {
+    return 'event_name';
+  }
+  if (type === 'query') {
+    return 'url';
+  }
+  return type;
+}
+
+export default async (req, res) => {
+  if (req.method === 'GET') {
+    await useCors(req, res);
+
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
+    const { id, type, start_at, end_at, url, referrer, os, browser, device, country } = req.query;
+
+    const websiteId = +id;
+    const startDate = new Date(+start_at);
+    const endDate = new Date(+end_at);
+
+    if (sessionColumns.includes(type)) {
+      let data = await getSessionMetrics(websiteId, {
+        startDate,
+        endDate,
+        field: type,
+        filters: {
+          os,
+          browser,
+          device,
+          country,
+        },
+      });
+
+      if (type === 'language') {
+        let combined = {};
+
+        for (let { x, y } of data) {
+          x = String(x).toLowerCase().split('-')[0];
+
+          if (!combined[x]) {
+            combined[x] = { x, y };
+          } else {
+            combined[x].y += y;
+          }
+        }
+
+        data = Object.values(combined);
+      }
+
+      return ok(res, data);
+    }
+
+    if (pageviewColumns.includes(type) || type === 'event') {
+      let domain;
+
+      if (type === 'referrer') {
+        const website = await getWebsiteById(websiteId);
+
+        if (!website) {
+          return badRequest(res);
+        }
+
+        domain = website.domain;
+      }
+
+      const column = getColumn(type);
+      const table = getTable(type);
+      const filters = {
+        domain,
+        url: type !== 'url' && table !== 'event' ? url : undefined,
+        referrer: type !== 'referrer' && table !== 'event' ? referrer : FILTER_IGNORED,
+        os: type !== 'os' ? os : undefined,
+        browser: type !== 'browser' ? browser : undefined,
+        device: type !== 'device' ? device : undefined,
+        country: type !== 'country' ? country : undefined,
+        event_url: type !== 'url' && table === 'event' ? url : undefined,
+        query: type === 'query' && table !== 'event' ? true : undefined,
+      };
+
+      const data = await getPageviewMetrics(websiteId, {
+        startDate,
+        endDate,
+        column,
+        table,
+        filters,
+      });
+
+      return ok(res, data);
+    }
+  }
+
+  return methodNotAllowed(res);
+};