@@ -85,15 +85,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
8585 e.session_id,
8686 e.anonymous_id,
8787 e.event_name,
88- toTimeZone(e.time, {timezone:String}) as normalized_time,
89- sa.session_referrer as referrer,
90- sa.session_utm_source as utm_source,
91- sa.session_utm_medium as utm_medium,
92- sa.session_utm_campaign as utm_campaign,
93- sa.session_country as country,
94- sa.session_device_type as device_type,
95- sa.session_browser_name as browser_name,
96- sa.session_os_name as os_name
88+ toTimeZone(e.time, {timezone:String}) as normalized_time
9789 FROM analytics.events e
9890 ${ helpers . sessionAttributionJoin ( 'e' ) }
9991 WHERE
@@ -318,15 +310,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
318310 e.session_id,
319311 e.anonymous_id,
320312 e.event_name,
321- toTimeZone(e.time, {timezone:String}) as normalized_time,
322- sa.session_referrer as referrer,
323- sa.session_utm_source as utm_source,
324- sa.session_utm_medium as utm_medium,
325- sa.session_utm_campaign as utm_campaign,
326- sa.session_country as country,
327- sa.session_device_type as device_type,
328- sa.session_browser_name as browser_name,
329- sa.session_os_name as os_name
313+ toTimeZone(e.time, {timezone:String}) as normalized_time
330314 FROM analytics.events e
331315 ${ helpers . sessionAttributionJoin ( 'e' ) }
332316 WHERE
@@ -356,12 +340,6 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
356340 sql : `
357341 WITH ${ sessionAttributionCTE }
358342 ${ baseEventsQuery }
359- hour_range AS (
360- SELECT arrayJoin(arrayMap(
361- h -> toStartOfHour(toTimeZone(toDateTime(concat({startDate:String}, ' 00:00:00')) + (h * 3600), {timezone:String})),
362- range(toUInt32(dateDiff('hour', toDateTime(concat({startDate:String}, ' 00:00:00')), toDateTime(concat({endDate:String}, ' 23:59:59'))) + 1))
363- )) AS datetime
364- ),
365343 session_details AS (
366344 SELECT
367345 session_id,
@@ -389,9 +367,9 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
389367 GROUP BY event_hour
390368 )
391369 SELECT
392- formatDateTime(hr.datetime , '%Y-%m-%d %H:00:00') as date,
393- COALESCE( hem.pageviews, 0) as pageviews,
394- COALESCE( hem.unique_visitors, 0) as visitors,
370+ formatDateTime(hem.event_hour , '%Y-%m-%d %H:00:00') as date,
371+ hem.pageviews as pageviews,
372+ hem.unique_visitors as visitors,
395373 COALESCE(hsm.sessions, 0) as sessions,
396374 ROUND(CASE
397375 WHEN COALESCE(hsm.sessions, 0) > 0
@@ -401,13 +379,12 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
401379 ROUND(COALESCE(hsm.median_session_duration, 0), 2) as avg_session_duration,
402380 ROUND(CASE
403381 WHEN COALESCE(hsm.sessions, 0) > 0
404- THEN COALESCE( hem.pageviews, 0) / COALESCE(hsm.sessions, 0)
382+ THEN hem.pageviews / COALESCE(hsm.sessions, 0)
405383 ELSE 0
406384 END, 2) as pages_per_session
407- FROM hour_range hr
408- LEFT JOIN hourly_session_metrics hsm ON hr.datetime = hsm.event_hour
409- LEFT JOIN hourly_event_metrics hem ON hr.datetime = hem.event_hour
410- ORDER BY hr.datetime ASC
385+ FROM hourly_event_metrics hem
386+ LEFT JOIN hourly_session_metrics hsm ON hem.event_hour = hsm.event_hour
387+ ORDER BY hem.event_hour ASC
411388 ` ,
412389 params : {
413390 websiteId,
@@ -431,15 +408,7 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
431408 e.session_id,
432409 e.anonymous_id,
433410 e.event_name,
434- toTimeZone(e.time, {timezone:String}) as normalized_time,
435- sa.session_referrer as referrer,
436- sa.session_utm_source as utm_source,
437- sa.session_utm_medium as utm_medium,
438- sa.session_utm_campaign as utm_campaign,
439- sa.session_country as country,
440- sa.session_device_type as device_type,
441- sa.session_browser_name as browser_name,
442- sa.session_os_name as os_name
411+ toTimeZone(e.time, {timezone:String}) as normalized_time
443412 FROM analytics.events e
444413 ${ helpers . sessionAttributionJoin ( 'e' ) }
445414 WHERE
@@ -469,12 +438,6 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
469438 sql : `
470439 WITH ${ sessionAttributionCTE }
471440 ${ baseEventsQuery }
472- date_range AS (
473- SELECT arrayJoin(arrayMap(
474- d -> toDate({startDate:String}) + d,
475- range(toUInt32(dateDiff('day', toDate({startDate:String}), toDate({endDate:String})) + 1))
476- )) AS date
477- ),
478441 session_details AS (
479442 SELECT
480443 session_id,
@@ -502,9 +465,9 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
502465 GROUP BY event_date
503466 )
504467 SELECT
505- dr. date,
506- COALESCE( dem.pageviews, 0) as pageviews,
507- COALESCE( dem.unique_visitors, 0) as visitors,
468+ dem.event_date as date,
469+ dem.pageviews as pageviews,
470+ dem.unique_visitors as visitors,
508471 COALESCE(dsm.sessions, 0) as sessions,
509472 ROUND(CASE
510473 WHEN COALESCE(dsm.sessions, 0) > 0
@@ -514,13 +477,12 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
514477 ROUND(COALESCE(dsm.median_session_duration, 0), 2) as avg_session_duration,
515478 ROUND(CASE
516479 WHEN COALESCE(dsm.sessions, 0) > 0
517- THEN COALESCE( dem.pageviews, 0) / COALESCE(dsm.sessions, 0)
480+ THEN dem.pageviews / COALESCE(dsm.sessions, 0)
518481 ELSE 0
519482 END, 2) as pages_per_session
520- FROM date_range dr
521- LEFT JOIN daily_session_metrics dsm ON dr.date = dsm.session_start_date
522- LEFT JOIN daily_event_metrics dem ON dr.date = dem.event_date
523- ORDER BY dr.date ASC
483+ FROM daily_event_metrics dem
484+ LEFT JOIN daily_session_metrics dsm ON dem.event_date = dsm.session_start_date
485+ ORDER BY dem.event_date ASC
524486 ` ,
525487 params : {
526488 websiteId,
0 commit comments