watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-16 10:35:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use getRequestDateRange in all routes.

Browse source
This commit is contained in:
Mike Cao 2025-06-25 22:53:07 -07:00
parent b0023feee9
commit 5171bdaf47
21 changed files with 72 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import { z } from 'zod';
import { parseRequest } from '@/lib/request';
import { parseRequest, getRequestDateRange } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth';
import { getSessionActivity } from '@/queries';
@ -20,15 +20,12 @@ export async function GET(
}
const { websiteId, sessionId } = await params;
const { startAt, endAt } = query;
const { startDate, endDate } = await getRequestDateRange(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
const data = await getSessionActivity(websiteId, sessionId, startDate, endDate);
return json(data);

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

@ -1,5 +1,5 @@
import { z } from 'zod';
import { parseRequest } from '@/lib/request';
import { getRequestDateRange, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth';
import { pagingParams } from '@/lib/schema';
@ -21,16 +21,13 @@ export async function GET(
return error();
}
const { startDate, endDate } = await getRequestDateRange(query);
const { websiteId } = await params;
const { startAt, endAt } = query;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
const data = await getWebsiteSessions(websiteId, { startDate, endDate }, query);
return json(data);

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

@ -1,5 +1,5 @@
import { z } from 'zod';
import { parseRequest } from '@/lib/request';
import { getRequestDateRange, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth';
import { pagingParams, timezoneParam } from '@/lib/schema';
@ -23,15 +23,13 @@ export async function GET(
}
const { websiteId } = await params;
const { startAt, endAt, timezone } = query;
const { timezone } = query;
const { startDate, endDate } = await getRequestDateRange(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate, timezone });
return json(data);