From 6de82cfd5e6773610ed2073af11f925f62180d90 Mon Sep 17 00:00:00 2001
From: emma <hi@emma.cafe>
Date: Thu, 4 May 2023 15:10:49 -0400
Subject: [PATCH] attempt adding event data rows to output not trying to join
 yet, just poking around

---
 lib/types.ts                               | 2 ++
 queries/analytics/event/getEventMetrics.ts | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/types.ts b/lib/types.ts
index 37c1ffdc..4a154ed5 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -69,6 +69,7 @@ export interface WebsiteActive {
 export interface WebsiteMetric {
   x: string;
   y: number;
+  d?: unknown;
 }
 
 export interface WebsiteMetricFilter {
@@ -90,6 +91,7 @@ export interface WebsiteEventMetric {
   x: string;
   t: string;
   y: number;
+  d?: unknown;
 }
 
 export interface WebsiteEventDataMetric {
diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.ts
index 32c4c3d0..a630e7ed 100644
--- a/queries/analytics/event/getEventMetrics.ts
+++ b/queries/analytics/event/getEventMetrics.ts
@@ -54,6 +54,7 @@ async function relationalQuery(
   return rawQuery(
     `select
       event_name x,
+      event_data d,
       ${getDateQuery('created_at', unit, timezone)} t,
       count(*) y
     from website_event
@@ -62,8 +63,8 @@ async function relationalQuery(
       and created_at between $3 and $4
       and event_type = ${EVENT_TYPE.customEvent}
       ${filterQuery}
-    group by 1, 2
-    order by 2`,
+    group by 1, 3
+    order by 3`,
     params,
   );
 }
@@ -95,6 +96,7 @@ async function clickhouseQuery(
   return rawQuery(
     `select
       event_name x,
+      event_data d,
       ${getDateQuery('created_at', unit, timezone)} t,
       count(*) y
     from website_event