fix: custom events funnels and sessions

Author: vachmara

apps/api/src/query/builders/sessions.ts

@@ -136,29 +136,60 @@ export const SessionsBuilders: Record<string, SimpleQueryConfig> = {
       ORDER BY first_visit DESC
       LIMIT {limit:Int32} OFFSET {offset:Int32}
     ),
-    session_events AS (
+    all_events AS (
       SELECT
+        e.id,
         e.session_id,
+        e.time,
+        e.event_name,
+        e.path,
+        CASE 
+          WHEN e.event_name NOT IN ('screen_view', 'page_exit', 'web_vitals', 'link_out') 
+            AND e.properties IS NOT NULL 
+            AND e.properties != '{}' 
+          THEN CAST(e.properties AS String)
+          ELSE NULL
+        END as properties
+      FROM analytics.events e
+      INNER JOIN session_list sl ON e.session_id = sl.session_id
+      WHERE e.client_id = {websiteId:String}
+      
+      UNION ALL
+      
+      SELECT
+        ce.id,
+        ce.session_id,
+        ce.timestamp as time,
+        ce.event_name,
+        '' as path,
+        CASE 
+          WHEN ce.properties IS NOT NULL 
+            AND ce.properties != '{}' 
+          THEN CAST(ce.properties AS String)
+          ELSE NULL
+        END as properties
+      FROM analytics.custom_events ce
+      INNER JOIN session_list sl ON ce.session_id = sl.session_id
+      WHERE ce.client_id = {websiteId:String}
+    ),
+    session_events AS (
+      SELECT
+        session_id,
         groupArray(
           tuple(
-            e.id,
-            e.time,
-            e.event_name,
-            e.path,
-            CASE 
-              WHEN e.event_name NOT IN ('screen_view', 'page_exit', 'web_vitals', 'link_out') 
-                AND e.properties IS NOT NULL 
-                AND e.properties != '{}' 
-              THEN CAST(e.properties AS String)
-              ELSE NULL
-            END
+            id,
+            time,
+            event_name,
+            path,
+            properties
           )
         ) as events
-      FROM analytics.events e
-      INNER JOIN session_list sl ON e.session_id = sl.session_id
-      WHERE e.client_id = {websiteId:String}
-		${combinedWhereClause}
-      GROUP BY e.session_id
+      FROM (
+        SELECT * FROM all_events
+        ORDER BY time ASC
+      )
+      ${combinedWhereClause}
+      GROUP BY session_id
     )
     SELECT
       sl.session_id,
@@ -210,4 +241,4 @@ export const SessionsBuilders: Record<string, SimpleQueryConfig> = {
 		timeField: 'time',
 		customizable: true,
 	} satisfies SimpleQueryConfig,
-};
+};

packages/rpc/src/lib/analytics-utils.ts

@@ -111,17 +111,53 @@ const buildStepQuery = (
 	const whereCondition = buildWhereCondition(step, params);
 	const referrerSelect = includeReferrer ? ', any(referrer) as referrer' : '';
 
+	// For PAGE_VIEW, only query analytics.events
+	if (step.type === 'PAGE_VIEW') {
+		return `
+			SELECT 
+				${stepIndex + 1} as step_number,
+				{${stepNameKey}:String} as step_name,
+				session_id,
+				MIN(time) as first_occurrence${referrerSelect}
+			FROM analytics.events
+			WHERE client_id = {websiteId:String}
+				AND time >= parseDateTimeBestEffort({startDate:String})
+				AND time <= parseDateTimeBestEffort({endDate:String})
+				AND ${whereCondition}${filterConditions}
+			GROUP BY session_id`;
+	}
+
+	// For custom EVENT, query both analytics.events and analytics.custom_events
+	const targetKey = `target_${step.step_number - 1}`;
+	const referrerSelectCustom = includeReferrer ? ", '' as referrer" : '';
+
 	return `
 		SELECT 
 			${stepIndex + 1} as step_number,
 			{${stepNameKey}:String} as step_name,
 			session_id,
-			MIN(time) as first_occurrence${referrerSelect}
-		FROM analytics.events
-		WHERE client_id = {websiteId:String}
-			AND time >= parseDateTimeBestEffort({startDate:String})
-			AND time <= parseDateTimeBestEffort({endDate:String})
-			AND ${whereCondition}${filterConditions}
+			MIN(first_occurrence) as first_occurrence${referrerSelect}
+		FROM (
+			SELECT 
+				session_id,
+				time as first_occurrence${includeReferrer ? ', referrer' : ''}
+			FROM analytics.events
+			WHERE client_id = {websiteId:String}
+				AND time >= parseDateTimeBestEffort({startDate:String})
+				AND time <= parseDateTimeBestEffort({endDate:String})
+				AND event_name = {${targetKey}:String}${filterConditions}
+			
+			UNION ALL
+			
+			SELECT 
+				session_id,
+				timestamp as first_occurrence${referrerSelectCustom}
+			FROM analytics.custom_events
+			WHERE client_id = {websiteId:String}
+				AND timestamp >= parseDateTimeBestEffort({startDate:String})
+				AND timestamp <= parseDateTimeBestEffort({endDate:String})
+				AND event_name = {${targetKey}:String}
+		)
 		GROUP BY session_id`;
 };
 
@@ -857,4 +893,4 @@ export const processFunnelAnalyticsByReferrer = async (
 	const referrer_analytics = aggregateReferrerAnalytics(referrerAnalytics);
 
 	return { referrer_analytics };
-};
+};