watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clean up events/event-data endpoints
Some checks are pending
Create docker images (cloud) / Build, push, and deploy (push) Waiting to run
Details
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source
This commit is contained in:
Francis Cao 2025-10-15 16:44:14 -07:00
parent a7a7293d73
commit f23d5694ec
10 changed files with 59 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,12 +27,10 @@ export async function GET(
return unauthorized();
}
const { event } = query;
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataEvents(websiteId, {
...filters,
event,
});
return json(data);

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

@ -3,6 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/permissions';
import { getEventDataFields } from '@/queries/sql';
import { filterParams } from '@/lib/schema';
export async function GET(
request: Request,
@ -11,6 +12,7 @@ export async function GET(
const schema = z.object({
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
...filterParams,
});
const { auth, query, error } = await parseRequest(request, schema);

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

@ -1,17 +1,17 @@
import { z } from 'zod';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { json, unauthorized } from '@/lib/response';
import { filterParams } from '@/lib/schema';
import { canViewWebsite } from '@/permissions';
import { getEventDataProperties } from '@/queries/sql';
import { dateRangeParams, filterParams } from '@/lib/schema';
import { z } from 'zod';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
propertyName: z.string().optional(),
...dateRangeParams,
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
...filterParams,
});
@ -27,10 +27,9 @@ export async function GET(
return unauthorized();
}
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataProperties(websiteId, { ...filters, propertyName });
const data = await getEventDataProperties(websiteId, filters);
return json(data);
}

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

@ -3,6 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/permissions';
import { getEventDataStats } from '@/queries/sql';
import { filterParams } from '@/lib/schema';
export async function GET(
request: Request,
@ -11,7 +12,7 @@ export async function GET(
const schema = z.object({
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
propertyName: z.string().optional(),
...filterParams,
});
const { auth, query, error } = await parseRequest(request, schema);

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

@ -3,16 +3,17 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/permissions';
import { getEventDataValues } from '@/queries/sql';
import { dateRangeParams, filterParams } from '@/lib/schema';
import { filterParams } from '@/lib/schema';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string }> },
) {
const schema = z.object({
eventName: z.string().optional(),
propertyName: z.string().optional(),
...dateRangeParams,
startAt: z.coerce.number().int(),
endAt: z.coerce.number().int(),
event: z.string(),
propertyName: z.string(),
...filterParams,
});
@ -28,12 +29,11 @@ export async function GET(
return unauthorized();
}
const { eventName, propertyName } = query;
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataValues(websiteId, {
...filters,
eventName,
propertyName,
});