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

umami-software · Oct 17, 2023 · 4c57c32 · 4c57c32
2 parents a43422d + e3df177
commit 4c57c32
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/queries/analytics/events/getEventUsage.ts b/src/queries/analytics/events/getEventUsage.ts
@@ -8,7 +8,11 @@ export function getEventUsage(...args: [websiteIds: string[], startDate: Date, e
   });
 }
 
-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) };
+    });
+  });
 }