Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fixed resetAt lookup. Added teams GET.

Mike Caod0aa266dce42
diff --git a/src/app/api/teams/route.ts b/src/app/api/teams/route.ts
index 0d2be6249..2b9985ba4 100644
--- a/src/app/api/teams/route.ts
+++ b/src/app/api/teams/route.ts
@@ -3,8 +3,27 @@ import { getRandomChars } from '@/lib/generate';
import { unauthorized, json } from '@/lib/response';
import { canCreateTeam } from '@/permissions';
import { uuid } from '@/lib/crypto';
-import { parseRequest } from '@/lib/request';
-import { createTeam } from '@/queries/prisma';
+import { getQueryFilters, parseRequest } from '@/lib/request';
+import { createTeam, getUserTeams } from '@/queries/prisma';
+import { pagingParams } from '@/lib/schema';
+
+export async function GET(request: Request) {
+ const schema = z.object({
+ ...pagingParams,
+ });
+
+ const { auth, query, error } = await parseRequest(request, schema);
+
+ if (error) {
+ return error();
+ }
+
+ const filters = await getQueryFilters(query);
+
+ const teams = await getUserTeams(auth.user.id, filters);
+
+ return json(teams);
+}
export async function POST(request: Request) {
const schema = z.object({
diff --git a/src/lib/request.ts b/src/lib/request.ts
index da247e20b..b48953b51 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -1,6 +1,6 @@
import { checkAuth } from '@/lib/auth';
import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from '@/lib/constants';
-import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/date';
+import { getAllowedUnits, getMinimumUnit, parseDateRange } from '@/lib/date';
import { fetchWebsite } from '@/lib/load';
import { filtersArrayToObject } from '@/lib/params';
import { badRequest, unauthorized } from '@/lib/response';
@@ -83,8 +83,8 @@ export function getRequestFilters(query: Record<string, any>) {
export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
const website = await fetchWebsite(websiteId);
- if (website) {
- data.startDate = maxDate(data.startDate, new Date(website?.resetAt));
+ if (website?.resetAt) {
+ data.startDate = new Date(website.resetAt);
}
return data;