Merged dev

src/app/(main)/reports/event-data/EventDataParameters.tsx

@@ -75,8 +75,8 @@ export function EventDataParameters() {
           {(close: () => void) => {
             return (
               <FieldAddForm
-                fields={data.map(({ eventKey, eventDataType }) => ({
-                  name: eventKey,
+                fields={data.map(({ dataKey, eventDataType }) => ({
+                  name: dataKey,
                   type: DATA_TYPES[eventDataType],
                 }))}
                 group={group}

src/queries/analytics/eventData/getEventDataEvents.ts

@@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       `
       select
         website_event.event_name as "eventName",
-        event_data.event_key as "fieldName",
+        event_data.data_key as "fieldName",
         event_data.data_type as "dataType",
         event_data.string_value as "fieldValue",
         count(*) as "total"
@@ -32,7 +32,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       where event_data.website_id = {{websiteId::uuid}}
         and event_data.created_at between {{startDate}} and {{endDate}}
         and website_event.event_name = {{event}}
-      group by website_event.event_name, event_data.event_key, event_data.data_type, event_data.string_value
+      group by website_event.event_name, event_data.data_key, event_data.data_type, event_data.string_value
       order by 1 asc, 2 asc, 3 asc, 4 desc
       `,
       params,
@@ -43,7 +43,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select
       website_event.event_name as "eventName",
-      event_data.event_key as "fieldName",
+      event_data.data_key as "fieldName",
       event_data.data_type as "dataType",
       count(*) as "total"
     from event_data
@@ -51,7 +51,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       on website_event.event_id = event_data.website_event_id
     where event_data.website_id = {{websiteId::uuid}}
       and event_data.created_at between {{startDate}} and {{endDate}}
-    group by website_event.event_name, event_data.event_key, event_data.data_type
+    group by website_event.event_name, event_data.data_key, event_data.data_type
     order by 1 asc, 2 asc
     limit 500
     `,
@@ -72,7 +72,7 @@ async function clickhouseQuery(
       `
       select
         event_name as eventName,
-        event_key as fieldName,
+        data_key as fieldName,
         data_type as dataType,
         string_value as fieldValue,
         count(*) as total
@@ -80,7 +80,7 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_name = {event:String}
-      group by event_key, data_type, string_value, event_name
+      group by data_key, data_type, string_value, event_name
       order by 1 asc, 2 asc, 3 asc, 4 desc
       limit 500
       `,
@@ -102,13 +102,13 @@ async function clickhouseQuery(
     `
     select
       event_name as eventName,
-      event_key as fieldName,
+      data_key as fieldName,
       data_type as dataType,
       count(*) as total
     from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    group by event_key, data_type, event_name
+    group by data_key, data_type, event_name
     order by 1 asc, 2 asc
     limit 500
     `,

src/queries/analytics/eventData/getEventDataFields.ts

@@ -15,13 +15,13 @@ export async function getEventDataFields(
 async function relationalQuery(websiteId: string, filters: QueryFilters & { field?: string }) {
   const { rawQuery, parseFilters } = prisma;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
-    columns: { field: 'event_key' },
+    columns: { field: 'data_key' },
   });
 
   return rawQuery(
     `
     select
-      event_key as "fieldName",
+      data_key as "fieldName",
       data_type as "dataType",
       string_value as "fieldValue",
       count(*) as "total"
@@ -29,7 +29,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters & { fiel
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by event_key, data_type, string_value
+    group by data_key, data_type, string_value
     order by 3 desc, 2 desc, 1 asc
     limit 500
     `,
@@ -43,13 +43,13 @@ async function clickhouseQuery(
 ): Promise<{ fieldName: string; dataType: number; fieldValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
-    columns: { field: 'event_key' },
+    columns: { field: 'data_key' },
   });
 
   return rawQuery(
     `
     select
-      event_key as fieldName,
+      data_key as fieldName,
       data_type as dataType,
       string_value as fieldValue,
       count(*) as total
@@ -57,7 +57,7 @@ async function clickhouseQuery(
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     ${filterQuery}
-    group by event_key, data_type, string_value
+    group by data_key, data_type, string_value
     order by 3 desc, 2 desc, 1 asc
     limit 500
     `,

src/queries/analytics/eventData/getEventDataStats.ts

@@ -24,18 +24,18 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select 
       count(distinct t.website_event_id) as "events",
-      count(distinct t.event_key) as "fields",
+      count(distinct t.data_key) as "fields",
       sum(t.total) as "records"
     from (
       select
         website_event_id,
-        event_key,
+        data_key,
         count(*) as "total"
       from event_data
       where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}
       ${filterQuery}
-      group by website_event_id, event_key
+      group by website_event_id, data_key
       ) as t
     `,
     params,
@@ -53,18 +53,18 @@ async function clickhouseQuery(
     `
     select 
       count(distinct t.event_id) as "events",
-      count(distinct t.event_key) as "fields",
+      count(distinct t.data_key) as "fields",
       sum(t.total) as "records"
     from (
       select
         event_id,
-        event_key,
+        data_key,
         count(*) as "total"
       from event_data
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       ${filterQuery}
-      group by event_id, event_key
+      group by event_id, data_key
       ) as t
     `,
     params,

src/queries/analytics/eventData/saveEventData.ts

@@ -36,7 +36,7 @@ async function relationalQuery(data: {
     id: uuid(),
     websiteEventId: eventId,
     websiteId,
-    eventKey: a.key,
+    dataKey: a.key,
     stringValue: getStringValue(a.value, a.dataType),
     numberValue: a.dataType === DATA_TYPE.number ? a.value : null,
     dateValue: a.dataType === DATA_TYPE.date ? new Date(a.value) : null,