Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix faulty goal-related queries

Blue Mouse14447016146c
diff --git a/backend/apps/cloud/src/ai/ai.service.ts b/backend/apps/cloud/src/ai/ai.service.ts
index 5414f6c3c..35aa6114e 100644
--- a/backend/apps/cloud/src/ai/ai.service.ts
+++ b/backend/apps/cloud/src/ai/ai.service.ts
@@ -1599,7 +1599,7 @@ Filter modifiers:
uniqExact(psid) as uniqueSessions
FROM events
WHERE pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
`
@@ -1609,7 +1609,6 @@ Filter modifiers:
query,
query_params: {
pid,
- goalType,
goalValue: goal.value || '',
groupFrom: groupFromUTC,
groupTo: groupToUTC,
@@ -1646,7 +1645,7 @@ Filter modifiers:
SELECT count(*) as conversions
FROM events
WHERE pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
`
@@ -1656,7 +1655,6 @@ Filter modifiers:
query,
query_params: {
pid,
- goalType,
goalValue: goal.value || '',
groupFrom: groupFromUTC,
groupTo: groupToUTC,
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index ba4e2dbcb..f712cf999 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -2237,7 +2237,7 @@ export class AnalyticsService {
pid IN {pids:Array(FixedString(12))}
AND type IN ('pageview', 'custom_event', 'error')
AND psid IS NOT NULL
- AND psid != ''
+ AND psid != 0
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
GROUP BY pid
`
@@ -6131,7 +6131,7 @@ export class AnalyticsService {
WHERE pid = {pid:FixedString(12)}
AND type IN ('pageview', 'custom_event', 'error')
AND psid IS NOT NULL
- AND psid != ''
+ AND psid != 0
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
${sessionFiltersQuery}
`
diff --git a/backend/apps/cloud/src/goal/goal.controller.ts b/backend/apps/cloud/src/goal/goal.controller.ts
index ed2807bee..ac4cde6de 100644
--- a/backend/apps/cloud/src/goal/goal.controller.ts
+++ b/backend/apps/cloud/src/goal/goal.controller.ts
@@ -444,7 +444,7 @@ export class GoalController {
FROM events
WHERE
pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
${metaCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
@@ -452,7 +452,6 @@ export class GoalController {
const queryParams = {
pid: goal.project.id,
- goalType,
groupFrom: groupFromUTC,
groupTo: groupToUTC,
...matchParams,
@@ -679,7 +678,7 @@ export class GoalController {
FROM events
WHERE
pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
${metaCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
@@ -690,7 +689,6 @@ export class GoalController {
const queryParams = {
pid: goal.project.id,
- goalType,
groupFrom: groupFromUTC,
groupTo: groupToUTC,
timezone: safeTimezone,
diff --git a/backend/apps/community/src/goal/goal.controller.ts b/backend/apps/community/src/goal/goal.controller.ts
index 37f85f30a..4a022b2e8 100644
--- a/backend/apps/community/src/goal/goal.controller.ts
+++ b/backend/apps/community/src/goal/goal.controller.ts
@@ -362,7 +362,7 @@ export class GoalController {
FROM events
WHERE
pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
${metaCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
@@ -370,7 +370,6 @@ export class GoalController {
const queryParams = {
pid: goal.projectId,
- goalType,
groupFrom: groupFromUTC,
groupTo: groupToUTC,
...matchParams,
@@ -596,7 +595,7 @@ export class GoalController {
FROM events
WHERE
pid = {pid:FixedString(12)}
- AND type = {goalType:String}
+ AND type = '${goalType}'
AND ${matchCondition}
${metaCondition}
AND created BETWEEN {groupFrom:String} AND {groupTo:String}
@@ -607,7 +606,6 @@ export class GoalController {
const queryParams = {
pid: goal.projectId,
- goalType,
groupFrom: groupFromUTC,
groupTo: groupToUTC,
timezone: safeTimezone,