clean up session properties / values

src/queries/analytics/events/getEventDataValues.ts

@@ -55,7 +55,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from umami.event_data
+    from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}

src/queries/analytics/sessions/getSessionDataProperties.ts

@@ -41,7 +41,7 @@ async function relationalQuery(
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters & { propertyName?: string },
-): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+): Promise<{ propertyName: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
     columns: { propertyName: 'data_key' },
@@ -65,8 +65,6 @@ async function clickhouseQuery(
     return Object.values(result).map((a: any) => {
       return {
         propertyName: a.propertyName,
-        dataType: Number(a.dataType),
-        propertyValue: a.propertyValue,
         total: Number(a.total),
       };
     });

src/queries/analytics/sessions/getSessionDataValues.ts

@@ -51,7 +51,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from umami.session_data
+    from session_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}

src/queries/index.ts

@@ -22,6 +22,8 @@ export * from './analytics/pageviews/getPageviewStats';
 export * from './analytics/sessions/createSession';
 export * from './analytics/sessions/getWebsiteSession';
 export * from './analytics/sessions/getSessionData';
+export * from './analytics/sessions/getSessionDataProperties';
+export * from './analytics/sessions/getSessionDataValues';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getWebsiteSessions';
 export * from './analytics/sessions/getSessionActivity';