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.

clean up funnel migration and report errors

Francis Caof3125c2add28
diff --git a/prisma/migrations/14_add_link_and_pixel/migration.sql b/prisma/migrations/14_add_link_and_pixel/migration.sql
index 14feaa66a..29d9e300a 100644
--- a/prisma/migrations/14_add_link_and_pixel/migration.sql
+++ b/prisma/migrations/14_add_link_and_pixel/migration.sql
@@ -72,8 +72,29 @@ CREATE INDEX "pixel_team_id_idx" ON "pixel"("team_id");
-- CreateIndex
CREATE INDEX "pixel_created_at_idx" ON "pixel"("created_at");
--- DataMigration
-UPDATE "report" SET parameters = parameters - 'websiteId' - 'dateRange' WHERE type = 'funnel';
+-- DataMigration Funnel
+DELETE FROM "report" WHERE type = 'funnel' and jsonb_array_length(parameters->'steps') = 1;
+UPDATE "report" SET parameters = parameters - 'websiteId' - 'dateRange' - 'urls' WHERE type = 'funnel';
+
+UPDATE "report"
+SET parameters = jsonb_set(
+ parameters,
+ '{steps}',
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN step->>'type' = 'url'
+ THEN jsonb_set(step, '{type}', '"path"')
+ ELSE step
+ END
+ )
+ FROM jsonb_array_elements(parameters->'steps') step
+ )
+)
+WHERE type = 'funnel'
+ and parameters @> '{"steps":[{"type":"url"}]}';
+
+-- DataMigration Goals
UPDATE "report" SET type = 'goal' WHERE type = 'goals';
INSERT INTO "report" (report_id, user_id, website_id, type, name, description, parameters, created_at, updated_at)
@@ -92,7 +113,7 @@ SELECT gen_random_uuid(),
updated_at
FROM "report"
CROSS JOIN LATERAL jsonb_array_elements(parameters -> 'goals') elem
-WHERE elem ->> 'type' IN ('event', 'url')
- and type = 'goal';
+WHERE type = 'goal'
+ and elem ->> 'type' IN ('event', 'url');
-DELETE FROM "report" WHERE parameters ? 'goals' and type = 'goal';
\ No newline at end of file
+DELETE FROM "report" WHERE type = 'goal' and parameters ? 'goals';
\ No newline at end of file
diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.ts
index abc0dab31..a56439dbc 100644
--- a/src/queries/sql/reports/getFunnel.ts
+++ b/src/queries/sql/reports/getFunnel.ts
@@ -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 }[],
diff --git a/src/queries/sql/reports/getGoal.ts b/src/queries/sql/reports/getGoal.ts
index b00e362ec..81ec80abe 100644
--- a/src/queries/sql/reports/getGoal.ts
+++ b/src/queries/sql/reports/getGoal.ts
@@ -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}
`,
diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts
index f5c652aa8..d73d90c23 100644
--- a/src/queries/sql/reports/getRevenue.ts
+++ b/src/queries/sql/reports/getRevenue.ts
@@ -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