Refactor filter handling for queries.

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { canViewWebsite } from '@/lib/auth';
-import { getRequestFilters, getRequestDateRange, parseRequest } from '@/lib/request';
-import { unitParam, timezoneParam, filterParams } from '@/lib/schema';
+import { getQueryFilters, parseRequest } from '@/lib/request';
+import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getCompareDate } from '@/lib/date';
 import { unauthorized, json } from '@/lib/response';
 import { getPageviewStats, getSessionStats } from '@/queries';
@@ -11,11 +11,7 @@ export async function GET(
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
   const schema = z.object({
-    startAt: z.coerce.number().int(),
-    endAt: z.coerce.number().int(),
-    unit: unitParam,
-    timezone: timezoneParam,
-    compare: z.string().optional(),
+    ...dateRangeParams,
     ...filterParams,
   });
 
@@ -26,32 +22,23 @@ export async function GET(
   }
 
   const { websiteId } = await params;
-  const { timezone, compare } = query;
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
   }
 
-  const { startDate, endDate, unit } = await getRequestDateRange(query);
-
-  const filters = {
-    ...getRequestFilters(query),
-    startDate,
-    endDate,
-    timezone,
-    unit,
-  };
+  const filters = await getQueryFilters({ ...query, websiteId });
 
   const [pageviews, sessions] = await Promise.all([
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
 
-  if (compare) {
+  if (filters.compare) {
     const { startDate: compareStartDate, endDate: compareEndDate } = getCompareDate(
-      compare,
-      startDate,
-      endDate,
+      filters.compare,
+      filters.startDate,
+      filters.endDate,
     );
 
     const [comparePageviews, compareSessions] = await Promise.all([
@@ -70,8 +57,8 @@ export async function GET(
     return json({
       pageviews,
       sessions,
-      startDate,
-      endDate,
+      startDate: filters.startDate,
+      endDate: filters.endDate,
       compare: {
         pageviews: comparePageviews,
         sessions: compareSessions,