implement filtering and cohorts to all relevant queries

src/queries/sql/pageviews/getPageviewExpandedMetrics.ts

@@ -76,12 +76,11 @@ async function relationalQuery(
     select ${column} x,
       count(distinct website_event.session_id) as y
     from website_event
-    ${joinSessionQuery}
     ${cohortQuery}
+    ${joinSessionQuery}
     ${entryExitQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
       ${excludeDomain}
       ${filterQuery}
     group by 1

src/queries/sql/pageviews/getPageviewMetrics.ts

@@ -73,12 +73,11 @@ async function relationalQuery(
     select ${column} x,
       count(distinct website_event.session_id) as y
     from website_event
-    ${joinSessionQuery}
     ${cohortQuery}
+    ${joinSessionQuery}
     ${entryExitQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
       ${excludeDomain}
       ${filterQuery}
     group by 1

src/queries/sql/pageviews/getPageviewStats.ts

@@ -26,11 +26,10 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(*) y
     from website_event
-      ${joinSessionQuery}
-      ${cohortQuery}
+    ${cohortQuery}
+    ${joinSessionQuery}  
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
       ${filterQuery}
     group by 1
     order by 1