Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Better fix, usage.

Brian Cao4153db48d205
diff --git a/src/pages/api/users/[id]/usage.ts b/src/pages/api/users/[id]/usage.ts
index 93dd0553e..7cb40d610 100644
--- a/src/pages/api/users/[id]/usage.ts
+++ b/src/pages/api/users/[id]/usage.ts
@@ -66,8 +66,8 @@ export default async (
const usage = websiteUsage.reduce(
(acc, cv) => {
- acc.websiteEventUsage += Number(cv.websiteEventUsage);
- acc.eventDataUsage += Number(cv.eventDataUsage);
+ acc.websiteEventUsage += cv.websiteEventUsage;
+ acc.eventDataUsage += cv.eventDataUsage;
return acc;
},
diff --git a/src/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.ts
index 78bf7c916..7866a6008 100644
--- 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) };
+ });
+ });
}