Fixed properties queries.

src/app/api/realtime/[websiteId]/route.ts

@@ -21,12 +21,14 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters({
-    ...query,
+  const filters = await getQueryFilters(
+    {
+      ...query,
+      startAt: subMinutes(startOfMinute(new Date()), REALTIME_RANGE).getTime(),
+      endAt: Date.now(),
+    },
     websiteId,
-    startAt: subMinutes(startOfMinute(new Date()), REALTIME_RANGE).getTime(),
-    endAt: Date.now(),
-  });
+  );
 
   const data = await getRealtimeData(websiteId, filters);
 

src/app/api/reports/attribution/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
 

src/app/api/reports/breakdown/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
 

src/app/api/reports/funnel/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
 

src/app/api/reports/goal/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getGoal(websiteId, parameters as GoalParameters, filters);
 

src/app/api/reports/journey/route.ts

@@ -1,6 +1,6 @@
 import { canViewWebsite } from '@/lib/auth';
 import { unauthorized, json } from '@/lib/response';
-import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
+import { getQueryFilters, parseRequest } from '@/lib/request';
 import { getJourney } from '@/queries';
 import { reportResultSchema } from '@/lib/schema';
 
@@ -17,7 +17,7 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const queryFilters = await setWebsiteDate(websiteId, await getQueryFilters(filters));
+  const queryFilters = await getQueryFilters(filters, websiteId);
 
   const data = await getJourney(websiteId, parameters, queryFilters);
 

src/app/api/reports/retention/route.ts

@@ -17,7 +17,7 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
   const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = await getRetention(websiteId, parameters as RetentionParameters, filters);

src/app/api/reports/revenue/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
 

src/app/api/reports/utm/route.ts

@@ -18,7 +18,7 @@ export async function POST(request: Request) {
   }
 
   const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getUTM(websiteId, parameters as UTMParameters, filters);
 

src/app/api/websites/[websiteId]/event-data/events/route.ts

@@ -26,7 +26,7 @@ export async function GET(
   }
 
   const { event } = query;
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataEvents(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -25,7 +25,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataFields(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -27,7 +27,7 @@ export async function GET(
   }
 
   const { propertyName } = query;
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataProperties(websiteId, { ...filters, propertyName });
 

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -26,7 +26,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -28,7 +28,7 @@ export async function GET(
   }
 
   const { eventName, propertyName } = query;
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataValues(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -21,13 +21,14 @@ export async function GET(
   }
 
   const { websiteId } = await params;
-  const { propertyName } = query;
-  const filters = await getQueryFilters(query);
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
   }
 
+  const { propertyName } = query;
+  const filters = await getQueryFilters(query, websiteId);
+
   const data = await getSessionDataProperties(websiteId, { ...filters, propertyName });
 
   return json(data);

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -1,5 +1,5 @@
 import { canViewWebsite } from '@/lib/auth';
-import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
+import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
 import { getSessionDataValues } from '@/queries';
 import { z } from 'zod';
@@ -20,14 +20,15 @@ export async function GET(
     return error();
   }
 
-  const { propertyName } = query;
   const { websiteId } = await params;
-  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
   }
 
+  const { propertyName } = query;
+  const filters = await getQueryFilters(query, websiteId);
+
   const data = await getSessionDataValues(websiteId, {
     ...filters,
     propertyName,

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -25,7 +25,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getSessionActivity(websiteId, sessionId, filters);
 

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
+import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/lib/auth';
 import { dateRangeParams, filterParams, pagingParams } from '@/lib/schema';
@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteSessions(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
+import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/lib/auth';
 import { filterParams } from '@/lib/schema';
@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await setWebsiteDate(websiteId, await getQueryFilters(query));
+  const filters = await getQueryFilters(query, websiteId);
 
   const metrics = await getWebsiteSessionStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -28,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteSessionsWeekly(websiteId, filters);
 

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

@@ -39,7 +39,7 @@ export async function GET(
   if (FILTER_GROUPS[type]) {
     values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
   } else {
-    const filters = await getQueryFilters(query);
+    const filters = await getQueryFilters(query, websiteId);
     values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
   }