fix: track custom events

Author: izadoesdev

apps/api/src/query/builders/custom-events.ts

@@ -11,7 +11,9 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
 			'MAX(time) as last_occurrence',
 			'MIN(time) as first_occurrence',
 			'COUNT(DISTINCT path) as unique_pages',
+			"countIf(properties != '' AND isValidJSON(properties)) as events_with_properties",
 			'ROUND((COUNT(*) / SUM(COUNT(*)) OVER()) * 100, 2) as percentage',
+			"arrayDistinct(groupArray(CASE WHEN isValidJSON(properties) AND properties != '' THEN properties ELSE NULL END)) as all_properties",
 		],
 		where: [
 			"event_name NOT IN ('screen_view', 'page_exit', 'error', 'web_vitals', 'link_out')",
@@ -24,65 +26,4 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
 		allowedFilters: ['event_name', 'path', 'device_type', 'browser_name'],
 		customizable: true,
 	},
-
-	custom_event_details: {
-		table: 'analytics.events',
-		fields: [
-			'event_name',
-			'time',
-			'path',
-			'anonymous_id',
-			'session_id',
-			'country',
-			'region',
-			'device_type',
-			'browser_name',
-			'os_name',
-			'properties',
-		],
-		where: [
-			"event_name NOT IN ('screen_view', 'page_exit', 'error', 'web_vitals', 'link_out')",
-			"event_name != ''",
-		],
-		orderBy: 'time DESC',
-		timeField: 'time',
-		allowedFilters: ['event_name', 'path', 'device_type'],
-		customizable: true,
-	},
-
-	custom_event_trends: {
-		table: 'analytics.events',
-		fields: [
-			'toDate(time) as date',
-			'event_name',
-			'COUNT(*) as events',
-			'COUNT(DISTINCT anonymous_id) as users',
-		],
-		where: [
-			"event_name NOT IN ('screen_view', 'page_exit', 'error', 'web_vitals', 'link_out')",
-			"event_name != ''",
-		],
-		groupBy: ['toDate(time)', 'event_name'],
-		orderBy: 'date ASC, events DESC',
-		timeField: 'time',
-		allowedFilters: ['event_name', 'path', 'device_type'],
-		customizable: true,
-	},
-
-	custom_event_by_page: {
-		table: 'analytics.events',
-		fields: [
-			'path(path) as name',
-			'event_name',
-			'COUNT(*) as events',
-			'COUNT(DISTINCT anonymous_id) as users',
-		],
-		where: ["event_name != ''", "path != ''"],
-		groupBy: ['path(path)', 'event_name'],
-		orderBy: 'events DESC',
-		limit: 50,
-		timeField: 'time',
-		allowedFilters: ['path', 'event_name', 'device_type'],
-		customizable: true,
-	},
 };

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

@@ -5,13 +5,13 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
 	top_pages: {
 		table: Analytics.events,
 		fields: [
-			'path(path) as name',
+			"trimRight(path(path), '/') as name",
 			'COUNT(*) as pageviews',
 			'COUNT(DISTINCT anonymous_id) as visitors',
 			'ROUND((COUNT(*) / SUM(COUNT(*)) OVER()) * 100, 2) as percentage',
 		],
 		where: ["event_name = 'screen_view'", "path != ''"],
-		groupBy: ['path(path)'],
+		groupBy: ["trimRight(path(path), '/')"],
 		orderBy: 'pageviews DESC',
 		limit: 100,
 		timeField: 'time',
@@ -48,7 +48,7 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
                 SELECT 
                     session_id,
                     anonymous_id,
-                    path(path) as entry_page,
+                    trimRight(path(path), '/') as entry_page,
                     time as entry_time,
                     ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY time) as page_rank
                 FROM analytics.events
@@ -118,7 +118,7 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
             ),
             exit_pages AS (
                 SELECT
-                    path(e.path) as path,
+                    trimRight(path(e.path), '/') as path,
                     e.session_id,
                     e.anonymous_id
                 FROM analytics.events e
@@ -152,13 +152,13 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
 	page_performance: {
 		table: Analytics.events,
 		fields: [
-			'path(path) as name',
+			"trimRight(path(path), '/') as name",
 			'COUNT(*) as pageviews',
 			'ROUND(AVG(CASE WHEN time_on_page > 0 THEN time_on_page / 1000 ELSE NULL END), 2) as avg_time_on_page',
 			'COUNT(DISTINCT anonymous_id) as visitors',
 		],
 		where: ["event_name = 'screen_view'", "path != ''"],
-		groupBy: ['path(path)'],
+		groupBy: ["trimRight(path(path), '/')"],
 		orderBy: 'pageviews DESC',
 		limit: 100,
 		timeField: 'time',

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

@@ -23,7 +23,7 @@ export const PerformanceBuilders: Record<string, SimpleQueryConfig> = {
 	slow_pages: {
 		table: Analytics.events,
 		fields: [
-			'path(path) as name',
+			"trimRight(path(path), '/') as name",
 			'COUNT(DISTINCT anonymous_id) as visitors',
 			'AVG(CASE WHEN load_time > 0 THEN load_time ELSE NULL END) as avg_load_time',
 			'AVG(CASE WHEN ttfb > 0 THEN ttfb ELSE NULL END) as avg_ttfb',
@@ -35,7 +35,7 @@ export const PerformanceBuilders: Record<string, SimpleQueryConfig> = {
 			'COUNT(*) as pageviews',
 		],
 		where: ["event_name = 'screen_view'", "path != ''", 'load_time > 0'],
-		groupBy: ['path(path)'],
+		groupBy: ["trimRight(path(path), '/')"],
 		orderBy: 'avg_load_time DESC',
 		limit: 100,
 		timeField: 'time',

apps/api/src/routes/query.ts

@@ -151,10 +151,10 @@ async function executeDynamicQuery(
 	const startDate = queryParams.start_date || queryParams.startDate;
 	const endDate = queryParams.end_date || queryParams.endDate;
 	const websiteId = queryParams.website_id;
-	
-	const websiteDomain = websiteId && !domainCache?.[websiteId]
-		? await getWebsiteDomain(websiteId)
-		: domainCache?.[websiteId] || null;
+
+	const websiteDomain = websiteId
+		? (domainCache?.[websiteId] ?? (await getWebsiteDomain(websiteId)))
+		: null;
 
 	const getTimeUnit = (granularity?: string): 'hour' | 'day' => {
 		if (['hourly', 'hour'].includes(granularity || '')) {

apps/basket/src/routes/basket.ts

@@ -409,7 +409,9 @@ async function insertTrackEvent(
 		error_stack: undefined,
 		error_type: undefined,
 
-		properties: '{}',
+		properties: trackData.properties
+			? JSON.stringify(trackData.properties)
+			: '{}',
 		created_at: now,
 	};