Add eventData back.

lib/clickhouse.ts

@@ -3,6 +3,7 @@ import dateFormat from 'dateformat';
 import debug from 'debug';
 import { FILTER_IGNORED } from 'lib/constants';
 import { CLICKHOUSE } from 'lib/db';
+import { getEventDataType } from './eventData';
 
 export const CLICKHOUSE_DATE_FORMATS = {
   minute: '%Y-%m-%d %H:%M:00',
@@ -64,6 +65,45 @@ function getBetweenDates(field, startAt, endAt) {
   return `${field} between ${getDateFormat(startAt)} and ${getDateFormat(endAt)}`;
 }
 
+function getEventDataFilterQuery(
+  filters: {
+    eventKey?: string;
+    eventValue?: string | number | boolean | Date;
+  }[] = [],
+  params: any,
+) {
+  const query = filters.reduce((ac, cv, i) => {
+    const type = getEventDataType(cv.eventValue);
+
+    let value = cv.eventValue;
+
+    ac.push(`and (event_key = {eventKey${i}:String}`);
+
+    switch (type) {
+      case 'number':
+        ac.push(`and event_numeric_value = {eventValue${i}:UInt64})`);
+        break;
+      case 'string':
+        ac.push(`and event_string_value = {eventValue${i}:String})`);
+        break;
+      case 'boolean':
+        ac.push(`and event_string_value = {eventValue${i}:String})`);
+        value = cv ? 'true' : 'false';
+        break;
+      case 'date':
+        ac.push(`and event_date_value = {eventValue${i}:DateTime('UTC')})`);
+        break;
+    }
+
+    params[`eventKey${i}`] = cv.eventKey;
+    params[`eventValue${i}`] = value;
+
+    return ac;
+  }, []);
+
+  return query.join('\n');
+}
+
 function getFilterQuery(filters = {}, params = {}) {
   const query = Object.keys(filters).reduce((arr, key) => {
     const filter = filters[key];
@@ -189,6 +229,7 @@ export default {
   getDateFormat,
   getBetweenDates,
   getFilterQuery,
+  getEventDataFilterQuery,
   parseFilters,
   findUnique,
   findFirst,

lib/eventData.ts

@@ -25,8 +25,18 @@ export function flattenJSON(
   ).keyValues;
 }
 
+export function getEventDataType(value: any): string {
+  let type: string = typeof value;
+
+  if ((type === 'string' && isValid(value)) || isValid(parseISO(value))) {
+    type = 'date';
+  }
+
+  return type;
+}
+
 function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
-  const type = isValid(value) || isValid(parseISO(value)) ? 'date' : typeof value;
+  const type = getEventDataType(value);
 
   let eventDataType = null;
 

lib/prisma.ts

@@ -2,6 +2,7 @@ import prisma from '@umami/prisma-client';
 import moment from 'moment-timezone';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
 import { FILTER_IGNORED } from 'lib/constants';
+import { getEventDataType } from './eventData';
 
 const MYSQL_DATE_FORMATS = {
   minute: '%Y-%m-%d %H:%i:00',
@@ -64,6 +65,46 @@ function getTimestampInterval(field: string): string {
   }
 }
 
+function getEventDataFilterQuery(
+  filters: {
+    eventKey?: string;
+    eventValue?: string | number | boolean | Date;
+  }[],
+  params: any[],
+) {
+  const query = filters.reduce((ac, cv, i) => {
+    const type = getEventDataType(cv);
+
+    let value = cv.eventValue;
+
+    switch (type) {
+      case 'number':
+        ac.push(`and event_numeric_value = {${cv.eventKey}${i}:UInt64}`);
+        params.push(cv.eventValue);
+        break;
+      case 'string':
+        ac.push(`and event_string_value = {${cv.eventKey}${i}:String}`);
+        params.push(decodeURIComponent(cv.eventValue as string));
+        break;
+      case 'boolean':
+        ac.push(`and event_string_value = {${cv.eventKey}${i}:String}`);
+        params.push(decodeURIComponent(cv.eventValue as string));
+        value = cv ? 'true' : 'false';
+        break;
+      case 'date':
+        ac.push(`and event_date_value = {${cv.eventKey}${i}:DateTime('UTC')}`);
+        params.push(cv.eventValue);
+        break;
+    }
+
+    params[`${cv.eventKey}${i}`] = value;
+
+    return ac;
+  }, []);
+
+  return query.join('\n');
+}
+
 function getFilterQuery(filters = {}, params = []): string {
   const query = Object.keys(filters).reduce((arr, key) => {
     const filter = filters[key];
@@ -173,6 +214,7 @@ export default {
   getDateQuery,
   getTimestampInterval,
   getFilterQuery,
+  getEventDataFilterQuery,
   toUuid,
   parseFilters,
   rawQuery,

lib/types.ts

@@ -75,6 +75,13 @@ export interface WebsiteEventMetric {
   y: number;
 }
 
+export interface WebsiteEventDataMetric {
+  x: string;
+  t: string;
+  eventName?: string;
+  urlPath?: string;
+}
+
 export interface WebsitePageviews {
   pageviews: {
     t: string;