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

Refactor part 2: Electric Boogaloo. Standardize way of passing filter parameters.

Browse source
This commit is contained in:
Mike Cao 2025-07-04 01:23:11 -07:00
parent f26f1b0581
commit cdf391d5c2
90 changed files with 867 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/app/api/reports/attribution/route.ts
View file

@ -1,8 +1,8 @@
import { canViewWebsite } from '@/lib/auth';
import { parseRequest } from '@/lib/request';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
import { reportResultSchema } from '@/lib/schema';
import { getAttribution } from '@/queries/sql/reports/getAttribution';
import { AttributionParameters, getAttribution } from '@/queries/sql/reports/getAttribution';
export async function POST(request: Request) {
const { auth, body, error } = await parseRequest(request, reportResultSchema);
@ -11,26 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
parameters: { model, type, step, currency },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getAttribution(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
model,
type,
step,
currency,
});
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
return json(data);
}

20
src/app/api/reports/breakdown/route.ts
View file

@ -1,7 +1,7 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { getBreakdown } from '@/queries';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { BreakdownParameters, getBreakdown } from '@/queries';
import { reportResultSchema } from '@/lib/schema';
export async function POST(request: Request) {
@ -11,22 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
parameters: { fields },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getBreakdown(websiteId, fields, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
});
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
return json(data);
}

22
src/app/api/reports/funnel/route.ts
View file

@ -1,7 +1,7 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { getFunnel } from '@/queries';
import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
import { FunnelParameters, getFunnel } from '@/queries';
import { reportResultSchema } from '@/lib/schema';
export async function POST(request: Request) {
@ -11,24 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
parameters: { steps, window },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getFunnel(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
steps,
windowMinutes: +window,
});
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
return json(data);
}

23
src/app/api/reports/goal/route.ts
View file

@ -1,7 +1,7 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { getGoal } from '@/queries/sql/reports/getGoal';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { getGoal, GoalParameters } from '@/queries/sql/reports/getGoal';
import { reportResultSchema } from '@/lib/schema';
export async function POST(request: Request) {
@ -11,27 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
parameters: { type, value, property, operator },
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const filters = await getQueryFilters(body.filters);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getGoal(websiteId, {
startDate: new Date(startDate),
endDate: new Date(endDate),
type,
value,
property,
operator,
filters,
});
const data = await getGoal(websiteId, parameters as GoalParameters, filters);
return json(data);
}

20
src/app/api/reports/journey/route.ts
View file

@ -1,6 +1,6 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { getJourney } from '@/queries';
import { reportResultSchema } from '@/lib/schema';
@ -11,25 +11,15 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
parameters: { steps, startStep, endStep },
...filters
} = body;
const { websiteId, parameters, filters } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getJourney(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
steps,
startStep,
endStep,
});
const queryFilters = await setWebsiteDate(websiteId, getQueryFilters(filters));
const data = await getJourney(websiteId, parameters, queryFilters);
return json(data);
}

20
src/app/api/reports/retention/route.ts
View file

@ -1,7 +1,7 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { getRetention } from '@/queries';
import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
import { getRetention, RetentionParameters } from '@/queries';
import { reportResultSchema } from '@/lib/schema';
export async function POST(request: Request) {
@ -11,22 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate, timezone },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getRetention(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
timezone,
});
const filters = getQueryFilters(body.filters);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const data = await getRetention(websiteId, parameters as RetentionParameters, filters);
return json(data);
}

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

@ -1,8 +1,8 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
import { reportResultSchema } from '@/lib/schema';
import { getRevenue } from '@/queries/sql/reports/getRevenue';
import { getRevenue, RevenuParameters } from '@/queries/sql/reports/getRevenue';
export async function POST(request: Request) {
const { auth, body, error } = await parseRequest(request, reportResultSchema);
@ -11,24 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate, unit },
parameters: { currency },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getRevenue(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
unit,
currency,
});
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
return json(data);
}

19
src/app/api/reports/utm/route.ts
View file

@ -1,7 +1,7 @@
import { canViewWebsite } from '@/lib/auth';
import { unauthorized, json } from '@/lib/response';
import { parseRequest } from '@/lib/request';
import { getUTM } from '@/queries';
import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
import { getUTM, UTMParameters } from '@/queries';
import { reportResultSchema } from '@/lib/schema';
export async function POST(request: Request) {
@ -11,21 +11,16 @@ export async function POST(request: Request) {
return error();
}
const {
websiteId,
dateRange: { startDate, endDate },
...filters
} = body;
const { websiteId } = body;
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}
const data = await getUTM(websiteId, {
...filters,
startDate: new Date(startDate),
endDate: new Date(endDate),
});
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = getQueryFilters(body.filters);
const data = await getUTM(websiteId, parameters as UTMParameters, filters);
return json(data);
}