remove event_data. (#1804)

queries/analytics/event/getEventData.ts

@@ -1,93 +0,0 @@
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import prisma from 'lib/prisma';
-import cache from 'lib/cache';
-import { WebsiteMetric } from 'lib/types';
-import { EVENT_TYPE } from 'lib/constants';
-
-export async function getEventData(
-  ...args: [
-    websiteId: string,
-    data: {
-      startDate: Date;
-      endDate: Date;
-      eventName: string;
-      columns: any;
-      filters: object;
-    },
-  ]
-): Promise<WebsiteMetric[]> {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  }).then(results => {
-    return Object.keys(results[0]).map(a => {
-      return { x: a, y: results[0][`${a}`] };
-    });
-  });
-}
-
-async function relationalQuery(
-  websiteId: string,
-  data: {
-    startDate: Date;
-    endDate: Date;
-    eventName: string;
-    columns: any;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, eventName, columns, filters } = data;
-  const { toUuid, rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate, eventName];
-
-  return rawQuery(
-    `select
-      ${getEventDataColumnsQuery('event_data', columns)}
-    from website_event
-    where website_id = $1${toUuid()}
-      and created_at between $2 and $3
-      and event_type = ${EVENT_TYPE.customEvent}
-      ${eventName ? `and eventName = $4` : ''}
-      ${
-        Object.keys(filters).length > 0
-          ? `and ${getEventDataFilterQuery('event_data', filters)}`
-          : ''
-      }`,
-    params,
-  );
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  data: {
-    startDate: Date;
-    endDate: Date;
-    eventName: string;
-    columns: any;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, eventName, columns, filters } = data;
-  const { rawQuery, getBetweenDates, getEventDataColumnsQuery, getEventDataFilterQuery } =
-    clickhouse;
-  const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
-
-  return rawQuery(
-    `select
-      ${getEventDataColumnsQuery('event_data', columns)}
-    from event
-    where website_id = {websiteId:UUID}
-      and rev_id = {revId:UInt32}
-      and event_type = ${EVENT_TYPE.customEvent}
-      ${eventName ? `and eventName = ${eventName}` : ''}
-      and ${getBetweenDates('created_at', startDate, endDate)}
-      ${
-        Object.keys(filters).length > 0
-          ? `and ${getEventDataFilterQuery('event_data', filters)}`
-          : ''
-      }`,
-    params,
-  );
-}

queries/analytics/event/saveEvent.ts

@@ -12,7 +12,6 @@ export async function saveEvent(args: {
   referrer?: string;
   pageTitle?: string;
   eventName?: string;
-  eventData?: any;
   hostname?: string;
   browser?: string;
   os?: string;
@@ -37,9 +36,8 @@ async function relationalQuery(data: {
   referrer?: string;
   pageTitle?: string;
   eventName?: string;
-  eventData?: any;
 }) {
-  const { websiteId, id: sessionId, url, eventName, eventData, referrer, pageTitle } = data;
+  const { websiteId, id: sessionId, url, eventName, referrer, pageTitle } = data;
 
   return prisma.client.websiteEvent.create({
     data: {
@@ -51,7 +49,6 @@ async function relationalQuery(data: {
       pageTitle: pageTitle,
       eventType: EVENT_TYPE.customEvent,
       eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
-      eventData,
     },
   });
 }
@@ -63,7 +60,6 @@ async function clickhouseQuery(data) {
     url,
     pageTitle,
     eventName,
-    eventData,
     country,
     subdivision1,
     subdivision2,
@@ -77,7 +73,6 @@ async function clickhouseQuery(data) {
     website_id: websiteId,
     session_id: sessionId,
     event_id: uuid(),
-    rev_id: website?.revId || 0,
     country: country ? country : null,
     subdivision1: subdivision1 ? subdivision1 : null,
     subdivision2: subdivision2 ? subdivision2 : null,
@@ -86,7 +81,7 @@ async function clickhouseQuery(data) {
     page_title: pageTitle,
     event_type: EVENT_TYPE.customEvent,
     event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
-    event_data: eventData ? JSON.stringify(eventData) : null,
+    rev_id: website?.revId || 0,
     created_at: getDateFormat(new Date()),
     ...args,
   };

queries/index.js

@@ -4,7 +4,6 @@ export * from './admin/user';
 export * from './admin/website';
 export * from './analytics/event/getEventMetrics';
 export * from './analytics/event/getEvents';
-export * from './analytics/event/getEventData';
 export * from './analytics/event/saveEvent';
 export * from './analytics/pageview/getPageviewMetrics';
 export * from './analytics/pageview/getPageviews';