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

Fixed reports.

Browse source
This commit is contained in:
Mike Cao 2025-02-01 16:20:22 -08:00
parent 3e9cb66db2
commit 530d6fb323
12 changed files with 59 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app/api/reports/revenue/route.ts
View file

@ -2,16 +2,12 @@ import { z } from 'zod';
import { canViewWebsite } from 'lib/auth';
import { unauthorized, json } from 'lib/response';
import { parseRequest } from 'lib/request';
import { reportParms, timezoneParam, unitParam } from 'lib/schema';
import { reportParms, timezoneParam } from 'lib/schema';
import { getRevenue } from 'queries/analytics/reports/getRevenue';
import { getRevenueValues } from 'queries/analytics/reports/getRevenueValues';
export async function GET(request: Request) {
const schema = z.object({
...reportParms,
});
const { auth, query, error } = await parseRequest(request, schema);
const { auth, query, error } = await parseRequest(request);
if (error) {
return error();
@ -33,12 +29,7 @@ export async function GET(request: Request) {
export async function POST(request: Request) {
const schema = z.object({
websiteId: z.string().uuid(),
dateRange: z.object({
startDate: z.date(),
endDate: z.date(),
unit: unitParam,
}),
...reportParms,
timezone: timezoneParam,
});

41
src/app/api/reports/route.ts
View file

@ -1,9 +1,10 @@
import { z } from 'zod';
import { pagingParams } from 'lib/schema';
import { uuid } from 'lib/crypto';
import { pagingParams, reportTypeParam } from 'lib/schema';
import { parseRequest } from 'lib/request';
import { canViewTeam, canViewWebsite } from 'lib/auth';
import { canViewTeam, canViewWebsite, canUpdateWebsite } from 'lib/auth';
import { unauthorized, json } from 'lib/response';
import { getReports } from 'queries/prisma/report';
import { getReports, createReport } from 'queries';
export async function GET(request: Request) {
const schema = z.object({
@ -71,3 +72,37 @@ export async function GET(request: Request) {
return json(data);
}
export async function POST(request: Request) {
const schema = z.object({
websiteId: z.string().uuid(),
name: z.string().max(200),
type: reportTypeParam,
description: z.string().max(500),
parameters: z.object({}).passthrough(),
});
const { auth, body, error } = await parseRequest(request, schema);
if (error) {
return error();
}
const { websiteId, type, name, description, parameters } = body;
if (!(await canUpdateWebsite(auth, websiteId))) {
return unauthorized();
}
const result = await createReport({
id: uuid(),
userId: auth.user.id,
websiteId,
type,
name,
description,
parameters: JSON.stringify(parameters),
} as any);
return json(result);
}

6
src/app/api/teams/[teamId]/route.ts
View file

@ -5,11 +5,7 @@ import { parseRequest } from 'lib/request';
import { deleteTeam, getTeam, updateTeam } from 'queries';
export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
const schema = z.object({
teamId: z.string().uuid(),
});
const { auth, error } = await parseRequest(request, schema);
const { auth, error } = await parseRequest(request);
if (error) {
return error();

2
src/app/api/websites/[websiteId]/events/series/route.ts
View file

@ -25,7 +25,7 @@ export async function GET(
const { websiteId } = await params;
const { timezone } = query;
const { startDate, endDate, unit } = await getRequestDateRange(request);
const { startDate, endDate, unit } = await getRequestDateRange(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();

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

@ -15,7 +15,7 @@ export async function GET(
...filterParams,
});
const { auth, error } = await parseRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return error();
@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const { startDate, endDate } = await getRequestDateRange(request);
const { startDate, endDate } = await getRequestDateRange(query);
const filters = getRequestFilters(request);

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

@ -24,7 +24,7 @@ export async function GET(
const { websiteId } = await params;
const { type, search } = query;
const { startDate, endDate } = await getRequestDateRange(request);
const { startDate, endDate } = await getRequestDateRange(query);
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();