route dashboard queries based on filters selected

src/lib/clickhouse.ts

@@ -3,7 +3,7 @@ import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
 import { PageParams, QueryFilters, QueryOptions } from './types';
-import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
+import { EVENT_COLUMNS, DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
 import { fetchWebsite } from './load';
 import { maxDate } from './date';
 import { filtersToArray } from './params';
@@ -100,6 +100,26 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
   return query.join('\n');
 }
 
+function getSessionFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
+  const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
+    if (column) {
+      if (EVENT_COLUMNS.includes(name)) {
+        arr.push(`and has(${column}, {${name}:String})`);
+
+        if (name === 'referrer') {
+          arr.push('and not has(referrer_domain, {websiteDomain:String})');
+        }
+      } else {
+        arr.push(`and ${mapFilter(column, operator, name)}`);
+      }
+    }
+
+    return arr;
+  }, []);
+
+  return query.join('\n');
+}
+
 function getDateQuery(filters: QueryFilters = {}) {
   const { startDate, endDate } = filters;
 
@@ -139,6 +159,25 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
+async function parseSessionFilters(
+  websiteId: string,
+  filters: QueryFilters = {},
+  options?: QueryOptions,
+) {
+  const website = await fetchWebsite(websiteId);
+
+  return {
+    filterQuery: getSessionFilterQuery(filters, options),
+    dateQuery: getDateQuery(filters),
+    params: {
+      ...getFilterParams(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, new Date(website?.resetAt)),
+      websiteDomain: website.domain,
+    },
+  };
+}
+
 async function pagedQuery(
   query: string,
   queryParams: { [key: string]: any },
@@ -221,6 +260,7 @@ export default {
   getDateFormat,
   getFilterQuery,
   parseFilters,
+  parseSessionFilters,
   pagedQuery,
   findUnique,
   findFirst,

src/lib/constants.ts

@@ -33,16 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = [
-  'url',
-  'entry',
-  'exit',
-  'referrer',
-  'title',
-  'query',
-  'event',
-  'host',
-];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
   'browser',
@@ -58,8 +49,8 @@ export const SESSION_COLUMNS = [
 
 export const FILTER_COLUMNS = {
   url: 'url_path',
-  entry: 'entry_url',
-  exit: 'exit_url',
+  entry: 'url_path',
+  exit: 'url_path',
   referrer: 'referrer_domain',
   host: 'hostname',
   title: 'page_title',