m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-01 20:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Mike Cao 2023-07-28 18:30:02 -07:00
parent 200e9b8bfa
commit 0cc289b3cd
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/prisma.ts
View File

@ -103,6 +103,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
if (db !== POSTGRESQL && db !== MYSQL) {
return Promise.reject(new Error('Unknown database.'));
}
const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {
const [, name, type] = args;
params.push(data[name]);

22
queries/analytics/reports/getFunnel.ts
View File

@ -78,15 +78,18 @@ async function relationalQuery(
}
return rawQuery(
`WITH level1 AS (
`
WITH level1 AS (
select distinct session_id, created_at
from website_event
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
and url_path = {{0}})
and url_path = {{0}}
)
${levelQuery}
${sumQuery}
ORDER BY level;`,
ORDER BY level;
`,
{
websiteId,
startDate,
@ -97,7 +100,7 @@ async function relationalQuery(
return urls.map((a, i) => ({
x: a,
y: results[i]?.count || 0,
z: (1 - (Number(results[i]?.count) * 1.0) / Number(results[i - 1]?.count)) * 100 || 0, // drop off
z: (1 - Number(results[i]?.count) / Number(results[i - 1]?.count)) * 100 || 0, // drop off
}));
});
}
@ -175,15 +178,18 @@ async function clickhouseQuery(
where url_path in (${urlFilterQuery})
and website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
), level1 AS (
),
level1 AS (
select *
from level0
where url_path = {url0:String})
where url_path = {url0:String}
)
${levelQuery}
select *
from (
${sumQuery}
) ORDER BY level;`,
) ORDER BY level;
`,
{
websiteId,
startDate,
@ -194,7 +200,7 @@ async function clickhouseQuery(
return urls.map((a, i) => ({
x: a,
y: results[i]?.count || 0,
z: (1 - (Number(results[i]?.count) * 1.0) / Number(results[i - 1]?.count)) * 100 || 0, // drop off
z: (1 - Number(results[i]?.count) / Number(results[i - 1]?.count)) * 100 || 0, // drop off
}));
});
}