watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-15 18:15:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updated Clickhouse number handling. Removed number formatting.

Browse source
This commit is contained in:
Mike Cao 2024-08-20 14:53:53 -07:00
parent caa9da9166
commit 04e0b33622
15 changed files with 23 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/queries/analytics/reports/getRevenue.ts
View file

@ -143,17 +143,7 @@ async function clickhouseQuery(
order by time
`,
{ websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
).then(result => {
return Object.values(result).map((a: any) => {
return {
time: a.time,
sum: Number(a.sum),
avg: Number(a.avg),
count: Number(a.count),
uniqueCount: Number(!a.avg ? 0 : a.uniqueCount),
};
});
});
).then(result => result?.[0]);
const totalRes = await rawQuery<{
sum: number;
@ -174,16 +164,7 @@ async function clickhouseQuery(
and data_key in ({revenueProperty:String}, {userProperty:String})
`,
{ websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
).then(results => {
const result = results[0];
return {
sum: Number(result.sum),
avg: Number(result.avg),
count: Number(result.count),
uniqueCount: Number(!result.avg ? 0 : result.uniqueCount),
};
});
);
return { chart: chartRes, total: totalRes };
}