From 2613a88c632df2d51d3f35f9402ccce1a783be81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Wed, 24 Jul 2024 00:41:53 +0200
Subject: [PATCH] fix

---
 packages/db/src/clickhouse-client.ts      |  5 ++-
 packages/db/src/services/chart.service.ts | 50 +++++++++++++++--------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/packages/db/src/clickhouse-client.ts b/packages/db/src/clickhouse-client.ts
index edae6867..210bea52 100644
--- a/packages/db/src/clickhouse-client.ts
+++ b/packages/db/src/clickhouse-client.ts
@@ -110,8 +110,11 @@ export async function chQuery<T extends Record<string, any>>(
   return (await chQueryWithMeta<T>(query)).data;
 }
 
-export function formatClickhouseDate(_date: Date | string) {
+export function formatClickhouseDate(_date: Date | string, skipTime = false) {
   const date = typeof _date === 'string' ? new Date(_date) : _date;
+  if (skipTime) {
+    return date.toISOString().split('T')[0];
+  }
   return date.toISOString().replace('T', ' ').replace(/Z+$/, '');
 }
 
diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.ts
index 630ada49..38f2efca 100644
--- a/packages/db/src/services/chart.service.ts
+++ b/packages/db/src/services/chart.service.ts
@@ -9,6 +9,19 @@ import type {
 import { formatClickhouseDate, TABLE_NAMES } from '../clickhouse-client';
 import { createSqlBuilder } from '../sql-builder';
 
+function getPropertyKey(property: string) {
+  if (property.startsWith('properties.')) {
+    if (property.includes('*')) {
+      return `arrayMap(x -> trim(x), mapValues(mapExtractKeyLike(properties, ${escape(
+        property.replace(/^properties\./, '').replace('.*.', '.%.')
+      )})))`;
+    }
+    return `properties['${property.replace(/^properties\./, '')}']`;
+  }
+
+  return property;
+}
+
 export function getChartSql({
   event,
   breakdowns,
@@ -55,18 +68,28 @@ export function getChartSql({
 
   if (startDate) {
     sb.where.startDate = `created_at >= '${formatClickhouseDate(startDate)}'`;
+    // if (interval === 'minute' || interval === 'hour') {
+    //   sb.where.startDate = `created_at >= '${formatClickhouseDate(startDate)}'`;
+    // } else {
+    //   sb.where.startDate = `toDate(created_at) >= '${formatClickhouseDate(startDate, true)}'`;
+    // }
   }
 
   if (endDate) {
     sb.where.endDate = `created_at <= '${formatClickhouseDate(endDate)}'`;
+    // if (interval === 'minute' || interval === 'hour') {
+    //   sb.where.endDate = `created_at <= '${formatClickhouseDate(endDate)}'`;
+    // } else {
+    //   sb.where.endDate = `toDate(created_at) <= '${formatClickhouseDate(endDate, true)}'`;
+    // }
   }
 
   if (breakdowns.length > 0 && limit) {
-    sb.where.bar = `(${breakdowns.map((b) => b.name).join(',')}) IN (
-      SELECT ${breakdowns.map((b) => b.name).join(',')}
+    sb.where.bar = `(${breakdowns.map((b) => getPropertyKey(b.name)).join(',')}) IN (
+      SELECT ${breakdowns.map((b) => getPropertyKey(b.name)).join(',')}
       FROM ${TABLE_NAMES.events}
       ${getWhere()}
-      GROUP BY ${breakdowns.map((b) => b.name).join(',')}
+      GROUP BY ${breakdowns.map((b) => getPropertyKey(b.name)).join(',')}
       ORDER BY count(*) DESC
       LIMIT ${limit}
     )`;
@@ -74,14 +97,7 @@ export function getChartSql({
 
   breakdowns.forEach((breakdown, index) => {
     const key = `label_${index}`;
-    const value = breakdown.name.startsWith('properties.')
-      ? `arrayMap(x -> trim(x), mapValues(mapExtractKeyLike(properties, ${escape(
-          breakdown.name.replace(/^properties\./, '').replace('.*.', '.%.')
-        )})))`
-      : escape(breakdown.name);
-    sb.select[key] = breakdown.name.startsWith('properties.')
-      ? `arrayElement(${value}, 1) as ${key}`
-      : `${breakdown.name} as ${key}`;
+    sb.select[key] = `${getPropertyKey(breakdown.name)} as ${key}`;
     sb.groupBy[key] = `${key}`;
   });
 
@@ -142,9 +158,7 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
         .replace(/^properties\./, '')
         .replace('.*.', '.%.');
       const isWildcard = propertyKey.includes('%');
-      const whereFrom = `arrayMap(x -> trim(x), mapValues(mapExtractKeyLike(properties, ${escape(
-        name.replace(/^properties\./, '').replace('.*.', '.%.')
-      )})))`;
+      const whereFrom = getPropertyKey(name);
 
       switch (operator) {
         case 'is': {
@@ -153,7 +167,7 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
               .map((val) => `x = ${escape(String(val).trim())}`)
               .join(' OR ')}, ${whereFrom})`;
           } else {
-            where[id] = `properties['${propertyKey}'] IN (${value
+            where[id] = `${whereFrom} IN (${value
               .map((val) => escape(String(val).trim()))
               .join(', ')})`;
           }
@@ -165,7 +179,7 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
               .map((val) => `x != ${escape(String(val).trim())}`)
               .join(' OR ')}, ${whereFrom})`;
           } else {
-            where[id] = `properties['${propertyKey}'] NOT IN (${value
+            where[id] = `${whereFrom} NOT IN (${value
               .map((val) => escape(String(val).trim()))
               .join(', ')})`;
           }
@@ -180,7 +194,7 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
             where[id] = value
               .map(
                 (val) =>
-                  `properties['${propertyKey}'] LIKE ${escape(`%${String(val).trim()}%`)}`
+                  `${whereFrom} LIKE ${escape(`%${String(val).trim()}%`)}`
               )
               .join(' OR ');
           }
@@ -195,7 +209,7 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) {
             where[id] = value
               .map(
                 (val) =>
-                  `properties['${propertyKey}'] NOT LIKE ${escape(`%${String(val).trim()}%`)}`
+                  `${whereFrom} NOT LIKE ${escape(`%${String(val).trim()}%`)}`
               )
               .join(' OR ');
           }