watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-05 13:17:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove tables result set from getRevenue. Fix min/max date for revenuechart

Browse source
This commit is contained in:
Francis Cao 2025-09-30 12:03:15 -07:00
parent 1b54ba3e6e
commit bf99068bd7
3 changed files with 26 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/queries/sql/reports/getRevenue.ts
View file

@ -14,12 +14,6 @@ export interface RevenueResult {
chart: { x: string; t: string; y: number }[];
country: { name: string; value: number }[];
total: { sum: number; count: number; average: number; unique_count: number };
table: {
currency: string;
sum: number;
count: number;
unique_count: number;
}[];
}
export async function getRevenue(
@ -121,32 +115,7 @@ async function relationalQuery(
total.average = total.count > 0 ? total.sum / total.count : 0;
const table = await rawQuery(
`
select
revenue.currency,
sum(revenue.revenue) as sum,
count(distinct revenue.event_id) as count,
count(distinct revenue.session_id) as unique_count
from revenue
join website_event
on website_event.website_id = revenue.website_id
and website_event.session_id = revenue.session_id
and website_event.event_id = revenue.event_id
and website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}}
${cohortQuery}
${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by revenue.currency
order by sum desc
`,
queryParams,
);
return { chart, country, table, total };
return { chart, country, total };
}
async function clickhouseQuery(
@ -250,36 +219,5 @@ async function clickhouseQuery(
total.average = total.count > 0 ? total.sum / total.count : 0;
const table = await rawQuery<
{
currency: string;
sum: number;
count: number;
unique_count: number;
}[]
>(
`
select
website_revenue.currency,
sum(website_revenue.revenue) as sum,
uniqExact(website_revenue.event_id) as count,
uniqExact(website_revenue.session_id) as unique_count
from website_revenue
join website_event
on website_event.website_id = website_revenue.website_id
and website_event.session_id = website_revenue.session_id
and website_event.event_id = website_revenue.event_id
and website_event.website_id = {websiteId:UUID}
and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
group by website_revenue.currency
order by sum desc
`,
queryParams,
);
return { chart, country, table, total };
return { chart, country, total };
}