watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clean up funnel migration and report errors

Browse source
This commit is contained in:
Francis Cao 2025-09-10 16:38:51 -07:00
parent 1825524e95
commit f3125c2add
4 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/queries/sql/reports/getFunnel.ts
View file

@ -32,14 +32,13 @@ async function relationalQuery(
): Promise<FunnelResult[]> {
const { startDate, endDate, window, steps } = parameters;
const { rawQuery, getAddIntervalQuery, parseFilters } = prisma;
const { levelOneQuery, levelQuery, sumQuery, params } = getFunnelQuery(steps, window);
const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
startDate,
endDate,
});
const { levelOneQuery, levelQuery, sumQuery, params } = getFunnelQuery(steps, window);
function getFunnelQuery(
steps: { type: string; value: string }[],

6
src/queries/sql/reports/getGoal.ts
View file

@ -48,15 +48,15 @@ async function relationalQuery(
from website_event
${cohortQuery}
${joinSessionQuery}
where website_id = {websiteId:UUID}
where website_id = {{websiteId::uuid}}
${dateQuery}
${filterQuery}
) as total
from website_event
${cohortQuery}
${joinSessionQuery}
where website_id = {websiteId:UUID}
and ${column} = {value:String}
where website_id = {{websiteId::uuid}}
and ${column} = {{value}}
${dateQuery}
${filterQuery}
`,

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

@ -75,7 +75,7 @@ async function relationalQuery(
`
select
session.country as name,
sum(r.revenue) value
sum(revenue) value
from revenue
join website_event
on website_event.website_id = revenue.website_id