add event_data to goal.

src/queries/analytics/reports/getGoals.ts

@@ -8,7 +8,7 @@ export async function getGoals(
     criteria: {
       startDate: Date;
       endDate: Date;
-      goals: { type: string; value: string; goal: number }[];
+      goals: { type: string; value: string; goal: number; operator?: string }[];
     },
   ]
 ) {
@@ -23,7 +23,7 @@ async function relationalQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
+    goals: { type: string; value: string; goal: number; operator?: string }[];
   },
 ): Promise<any> {
   const { startDate, endDate, goals } = criteria;
@@ -119,7 +119,7 @@ async function clickhouseQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
+    goals: { type: string; value: string; goal: number; operator?: string; property?: string }[];
   },
 ): Promise<{ type: string; value: string; goal: number; result: number }[]> {
   const { startDate, endDate, goals } = criteria;
@@ -127,13 +127,22 @@ async function clickhouseQuery(
 
   const urls = goals.filter(a => a.type === 'url');
   const events = goals.filter(a => a.type === 'event');
+  const eventData = goals.filter(a => a.type === 'event-data');
 
   const hasUrl = urls.length > 0;
   const hasEvent = events.length > 0;
+  const hasEventData = eventData.length > 0;
 
   function getParameters(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlParam = urls.reduce((acc, cv, i) => {
       acc[`${cv.type}${i}`] = cv.value;
@@ -145,41 +154,77 @@ async function clickhouseQuery(
       return acc;
     }, {});
 
+    const eventDataParam = eventData.reduce((acc, cv, i) => {
+      acc[`eventData${i}`] = cv.value;
+      acc[`property${i}`] = cv.property;
+      return acc;
+    }, {});
+
     return {
       urls: { ...urlParam, startDate, endDate, websiteId },
       events: { ...eventParam, startDate, endDate, websiteId },
+      eventData: { ...eventDataParam, startDate, endDate, websiteId },
     };
   }
 
   function getColumns(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlColumns = urls
       .map((a, i) => `countIf(url_path = {url${i}:String}) AS URL${i},`)
       .join('\n')
       .slice(0, -1);
     const eventColumns = events
-      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i}`)
+      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventDataColumns = eventData
+      .map(
+        (a, i) =>
+          `${a.operator === 'average' ? 'avg' : a.operator}If(${
+            a.operator !== 'count' ? 'number_value, ' : ''
+          }event_name = {eventData${i}:String} AND data_key = {property${i}:String}) AS EVENT_DATA${i},`,
+      )
       .join('\n')
       .slice(0, -1);
 
-    return { url: urlColumns, events: eventColumns };
+    return { url: urlColumns, events: eventColumns, eventData: eventDataColumns };
   }
 
   function getWhere(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlWhere = urls.map((a, i) => `{url${i}:String}`).join(',');
     const eventWhere = events.map((a, i) => `{event${i}:String}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{eventData${i}:String}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{property${i}:String}`).join(',');
 
-    return { urls: `and url_path in (${urlWhere})`, events: `and event_name in (${eventWhere})` };
+    return {
+      urls: `and url_path in (${urlWhere})`,
+      events: `and event_name in (${eventWhere})`,
+      eventData: `and event_name in (${eventDataNameWhere}) and data_key in (${eventDataKeyWhere})`,
+    };
   }
 
-  const parameters = getParameters(urls, events);
-  const columns = getColumns(urls, events);
-  const where = getWhere(urls, events);
+  const parameters = getParameters(urls, events, eventData);
+  const columns = getColumns(urls, events, eventData);
+  const where = getWhere(urls, events, eventData);
 
   const urlResults = hasUrl
     ? await rawQuery<any>(
@@ -221,5 +266,25 @@ async function clickhouseQuery(
       })
     : [];
 
-  return [...urlResults, ...eventResults];
+  const eventDataResults = hasEventData
+    ? await rawQuery<any>(
+        `
+  select
+    ${columns.eventData}
+  from event_data
+  where website_id = {websiteId:UUID}
+    ${where.eventData}
+    and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+  `,
+        parameters.eventData,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...eventData[i], goal: Number(eventData[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  return [...urlResults, ...eventResults, ...eventDataResults];
 }