Merge remote-tracking branch 'origin/dev' into dev

queries/analytics/eventData/getEventData.ts

@@ -1,28 +1,12 @@
+import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import { WebsiteEventDataMetric } from 'lib/types';
 import { loadWebsite } from 'lib/query';
 import { DEFAULT_CREATED_AT } from 'lib/constants';
 
-export interface EventDataCriteria {
-  fields: [{ name: string; type: string; value: string }];
-  filters: [
-    {
-      name: string;
-      type: string;
-      value: [string, string];
-    },
-  ];
-  groups: [
-    {
-      name: string;
-      type: string;
-    },
-  ];
-}
-
 export async function getEventData(
-  ...args: [websiteId: string, startDate: Date, endDate: Date, criteria: EventDataCriteria]
+  ...args: [websiteId: string, startDate: Date, endDate: Date, field?: string]
 ): Promise<WebsiteEventDataMetric[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -30,70 +14,81 @@ export async function getEventData(
   });
 }
 
-async function relationalQuery() {
-  return null;
+async function relationalQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
+  const { toUuid, rawQuery } = prisma;
+  const website = await loadWebsite(websiteId);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
+
+  if (field) {
+    return rawQuery(
+      `select event_key as field,
+              string_value as value,
+              count(*)  as total
+       from event_data
+       where website_id = $1${toUuid()}
+          and event_key = $2
+         and created_at >= $3
+         and created_at between $4 and $5
+       group by event_key, string_value
+       order by 3 desc, 2 desc, 1 asc
+           limit 100
+      `,
+      [websiteId, field, resetDate, startDate, endDate] as any,
+    );
+  }
+
+  return rawQuery(
+    `select
+        event_key as field,
+        count(*) as total
+        from event_data
+        where website_id = $1${toUuid()}
+          and created_at >= $2
+          and created_at between $3 and $4
+        group by event_key
+        order by 2 desc, 1 asc
+        limit 100
+    `,
+    [websiteId, resetDate, startDate, endDate] as any,
+  );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  startDate: Date,
-  endDate: Date,
-  criteria: EventDataCriteria,
-) {
-  const { fields } = criteria;
+async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
   const { rawQuery, getDateFormat, getBetweenDates } = clickhouse;
   const website = await loadWebsite(websiteId);
   const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
 
-  const uniqueFields = fields.reduce((obj, { name, type }) => {
-    if (!obj[name]) {
-      obj[name] = {
-        columns: ['event_key as field', `count(*) as total`, `${type}_value as value`],
-        groups: ['event_key', `${type}_value`],
-      };
-    }
-    return obj;
-  }, {});
-
-  const queries = Object.keys(uniqueFields).reduce((arr, key) => {
-    const field = uniqueFields[key];
-    const params = { websiteId, name: key };
-
-    return arr.concat(
-      rawQuery(
-        `select
-             ${field.columns.join(',')}
+  if (field) {
+    return rawQuery(
+      `select
+        event_key as field,
+        string_value as value,
+        count(*) as total
         from event_data
         where website_id = {websiteId:UUID}
-          and event_key = {name:String}
+          and event_key = {field:String}
           and created_at >= ${getDateFormat(resetDate)}
           and ${getBetweenDates('created_at', startDate, endDate)}
-        group by ${field.groups.join(',')}
-        limit 20
+        group by event_key, string_value
+        order by 3 desc, 2 desc, 1 asc
+        limit 100
     `,
-        params,
-      ),
+      { websiteId, field },
     );
-  }, []);
+  }
 
-  const results = (await Promise.all(queries)).flatMap(n => n);
-
-  const columns = results.reduce((arr, row) => {
-    const keys = Object.keys(row);
-    for (const key of keys) {
-      if (!arr.includes(key)) {
-        arr.push(key);
-      }
-    }
-    return arr;
-  }, []);
-
-  return results.reduce((arr, row) => {
-    return arr.concat(
-      columns.reduce((obj, key) => {
-        obj[key] = row[key];
-        return obj;
-      }, {}),
-    );
-  }, []);
+  return rawQuery(
+    `select
+        event_key as field,
+        count(*) as total
+        from event_data
+        where website_id = {websiteId:UUID}
+          and created_at >= ${getDateFormat(resetDate)}
+          and ${getBetweenDates('created_at', startDate, endDate)}
+        group by event_key
+        order by 2 desc, 1 asc
+        limit 100
+    `,
+    { websiteId },
+  );
 }