Merge remote-tracking branch 'origin/dev' into dev

DrMxrcy · Oct 20, 2023 · 0901a00 · 0901a00
2 parents f175534 + 4153db4
commit 0901a00
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.ts
@@ -8,7 +8,11 @@ export function getEventDataUsage(...args: [websiteIds: string[], startDate: Dat
   });
 }
 
-function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+function clickhouseQuery(
+  websiteIds: string[],
+  startDate: Date,
+  endDate: Date,
+): Promise<{ websiteId: string; count: number }[]> {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -26,5 +30,9 @@ function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
       startDate,
       endDate,
     },
-  );
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { websiteId: a.websiteId, count: Number(a.count) };
+    });
+  });
 }