Updated zod validation on date range.

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

@@ -1,7 +1,6 @@
-import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams } from '@/lib/schema';
+import { filterParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getWebsiteEventStats } from '@/queries/sql/events/getWebsiteEventStats';
 
@@ -9,8 +8,7 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
-    ...dateRangeParams,
+  const schema = withDateRange({
     ...filterParams,
   });
 

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

@@ -1,9 +1,8 @@
 import JSZip from 'jszip';
 import Papa from 'papaparse';
-import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { dateRangeParams, pagingParams } from '@/lib/schema';
+import { pagingParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries/sql';
 
@@ -11,8 +10,7 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
-    ...dateRangeParams,
+  const schema = withDateRange({
     ...pagingParams,
   });
 

src/app/api/websites/[websiteId]/metrics/expanded/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { EVENT_COLUMNS, EVENT_TYPE, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
+import { filterParams, searchParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import {
   getChannelExpandedMetrics,
@@ -15,11 +15,10 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
+  const schema = withDateRange({
     type: z.string(),
     limit: z.coerce.number().optional(),
     offset: z.coerce.number().optional(),
-    ...dateRangeParams,
     ...searchParams,
     ...filterParams,
   });

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

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { EVENT_COLUMNS, EVENT_TYPE, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
+import { filterParams, searchParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import {
   getChannelMetrics,
@@ -15,11 +15,10 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
+  const schema = withDateRange({
     type: z.string(),
     limit: z.coerce.number().optional(),
     offset: z.coerce.number().optional(),
-    ...dateRangeParams,
     ...searchParams,
     ...filterParams,
   });

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

@@ -1,8 +1,7 @@
-import { z } from 'zod';
 import { getCompareDate } from '@/lib/date';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams } from '@/lib/schema';
+import { filterParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getPageviewStats, getSessionStats } from '@/queries/sql';
 
@@ -10,8 +9,7 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
-    ...dateRangeParams,
+  const schema = withDateRange({
     ...filterParams,
   });
 

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

@@ -1,7 +1,6 @@
-import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';
+import { filterParams, pagingParams, searchParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getWebsiteSessions } from '@/queries/sql';
 
@@ -9,8 +8,7 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
-    ...dateRangeParams,
+  const schema = withDateRange({
     ...filterParams,
     ...pagingParams,
     ...searchParams,

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

@@ -1,8 +1,7 @@
-import { z } from 'zod';
 import { getCompareDate } from '@/lib/date';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { dateRangeParams, filterParams } from '@/lib/schema';
+import { filterParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getWebsiteStats } from '@/queries/sql';
 
@@ -10,8 +9,7 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
-    ...dateRangeParams,
+  const schema = withDateRange({
     ...filterParams,
   });
 

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

@@ -1,8 +1,7 @@
-import { z } from 'zod';
 import { EVENT_COLUMNS, FILTER_COLUMNS, SEGMENT_TYPES, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';
-import { dateRangeParams, fieldsParam, searchParams } from '@/lib/schema';
+import { fieldsParam, searchParams, withDateRange } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getWebsiteSegments } from '@/queries/prisma';
 import { getValues } from '@/queries/sql';
@@ -11,9 +10,8 @@ export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
 ) {
-  const schema = z.object({
+  const schema = withDateRange({
     type: fieldsParam,
-    ...dateRangeParams,
     ...searchParams,
   });