Merge branch 'dev' into fix/delete-cascade

This commit is contained in:
Francis Cao authored and GitHub committed 2026-05-07 13:58:29 -07:00
commit b7084bb90a
112 files changed
+772 -272

No files matched your search

+6 -2
View File
@@ -1,8 +1,11 @@
import type { Prisma } from '@/generated/prisma/client';
import { BOARD_TYPES } from '@/lib/boards';
import prisma from '@/lib/prisma';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters } from '@/lib/types';
const BOARD_SORT_FIELDS = ['name', 'description', 'type', 'createdAt'] as const;
export async function findBoard(criteria: Prisma.BoardFindUniqueArgs) {
return prisma.client.board.findUnique(criteria);
}
@@ -16,7 +19,8 @@ export async function getBoard(boardId: string) {
}
export async function getBoards(criteria: Prisma.BoardFindManyArgs, filters: QueryFilters = {}) {
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, BOARD_SORT_FIELDS);
const { search } = sortFilters;
const { getSearchParameters, pagedQuery } = prisma;
const where: Prisma.BoardWhereInput = {
@@ -24,7 +28,7 @@ export async function getBoards(criteria: Prisma.BoardFindManyArgs, filters: Que
...getSearchParameters(search, [{ name: 'contains' }, { description: 'contains' }]),
};
return pagedQuery('board', { ...criteria, where }, filters);
return pagedQuery('board', { ...criteria, where }, sortFilters);
}
export async function getUserBoards(userId: string, filters?: QueryFilters) {
+6 -2
View File
@@ -1,7 +1,10 @@
import type { Prisma } from '@/generated/prisma/client';
import prisma from '@/lib/prisma';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters } from '@/lib/types';
const LINK_SORT_FIELDS = ['name', 'slug', 'url', 'createdAt'] as const;
export async function findLink(criteria: Prisma.LinkFindUniqueArgs) {
return prisma.client.link.findUnique(criteria);
}
@@ -15,7 +18,8 @@ export async function getLink(linkId: string) {
}
export async function getLinks(criteria: Prisma.LinkFindManyArgs, filters: QueryFilters = {}) {
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, LINK_SORT_FIELDS);
const { search } = sortFilters;
const { getSearchParameters, pagedQuery } = prisma;
const where: Prisma.LinkWhereInput = {
@@ -27,7 +31,7 @@ export async function getLinks(criteria: Prisma.LinkFindManyArgs, filters: Query
]),
};
return pagedQuery('link', { ...criteria, where }, filters);
return pagedQuery('link', { ...criteria, where }, sortFilters);
}
export async function getUserLinks(userId: string, filters?: QueryFilters) {
+6 -2
View File
@@ -1,7 +1,10 @@
import type { Prisma } from '@/generated/prisma/client';
import prisma from '@/lib/prisma';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters } from '@/lib/types';
const PIXEL_SORT_FIELDS = ['name', 'slug', 'createdAt'] as const;
export async function findPixel(criteria: Prisma.PixelFindUniqueArgs) {
return prisma.client.pixel.findUnique(criteria);
}
@@ -15,14 +18,15 @@ export async function getPixel(pixelId: string) {
}
export async function getPixels(criteria: Prisma.PixelFindManyArgs, filters: QueryFilters = {}) {
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, PIXEL_SORT_FIELDS);
const { search } = sortFilters;
const where: Prisma.PixelWhereInput = {
...criteria.where,
...prisma.getSearchParameters(search, [{ name: 'contains' }, { slug: 'contains' }]),
};
return prisma.pagedQuery('pixel', { ...criteria, where }, filters);
return prisma.pagedQuery('pixel', { ...criteria, where }, sortFilters);
}
export async function getUserPixels(userId: string, filters?: QueryFilters) {
+6 -2
View File
@@ -3,10 +3,13 @@ import { ROLES } from '@/lib/constants';
import { uuid } from '@/lib/crypto';
import prisma from '@/lib/prisma';
import redis from '@/lib/redis';
import { sanitizeSortFilters } from '@/lib/sort';
import type { PageResult, QueryFilters } from '@/lib/types';
import TeamFindManyArgs = Prisma.TeamFindManyArgs;
const TEAM_SORT_FIELDS = ['name', 'createdAt'] as const;
export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {
return prisma.client.team.findUnique(criteria);
}
@@ -30,7 +33,8 @@ export async function getTeams(
filters: QueryFilters,
): Promise<PageResult<Team[]>> {
const { getSearchParameters } = prisma;
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, TEAM_SORT_FIELDS);
const { search } = sortFilters;
const where: Prisma.TeamWhereInput = {
...criteria.where,
@@ -43,7 +47,7 @@ export async function getTeams(
...criteria,
where,
},
filters,
sortFilters,
);
}
+9 -6
View File
@@ -3,10 +3,13 @@ import { ROLES } from '@/lib/constants';
import { getRandomChars } from '@/lib/generate';
import prisma from '@/lib/prisma';
import redis from '@/lib/redis';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters, Role } from '@/lib/types';
import UserFindManyArgs = Prisma.UserFindManyArgs;
const USER_SORT_FIELDS = ['username', 'role', 'createdAt'] as const;
export interface GetUserOptions {
includePassword?: boolean;
showDeleted?: boolean;
@@ -47,7 +50,11 @@ export async function getUserByUsername(username: string, options: GetUserOption
}
export async function getUsers(criteria: UserFindManyArgs, filters: QueryFilters = {}) {
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, USER_SORT_FIELDS, {
orderBy: 'createdAt',
sortDescending: true,
});
const { search } = sortFilters;
const where: Prisma.UserWhereInput = {
...criteria.where,
@@ -61,11 +68,7 @@ export async function getUsers(criteria: UserFindManyArgs, filters: QueryFilters
...criteria,
where,
},
{
orderBy: 'createdAt',
sortDescending: true,
...filters,
},
sortFilters,
);
}
+8 -10
View File
@@ -2,8 +2,11 @@ import type { Prisma, Website } from '@/generated/prisma/client';
import { ROLES } from '@/lib/constants';
import prisma from '@/lib/prisma';
import redis from '@/lib/redis';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters } from '@/lib/types';
const WEBSITE_SORT_FIELDS = ['name', 'domain', 'createdAt'] as const;
export async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs) {
return prisma.client.website.findUnique(criteria);
}
@@ -23,7 +26,8 @@ export async function getWebsite(websiteId: string) {
}
export async function getWebsites(criteria: Prisma.WebsiteFindManyArgs, filters: QueryFilters) {
const { search } = filters;
const sortFilters = sanitizeSortFilters(filters, WEBSITE_SORT_FIELDS);
const { search } = sortFilters;
const { getSearchParameters, pagedQuery } = prisma;
const where: Prisma.WebsiteWhereInput = {
@@ -37,7 +41,7 @@ export async function getWebsites(criteria: Prisma.WebsiteFindManyArgs, filters:
deletedAt: null,
};
const websites = await pagedQuery('website', { ...criteria, where }, filters);
const websites = await pagedQuery('website', { ...criteria, where }, sortFilters);
return attachShareIdToWebsites(websites);
}
@@ -62,10 +66,7 @@ export async function getAllUserWebsitesIncludingTeamAccess(userId: string, filt
],
},
},
{
orderBy: 'name',
...filters,
},
sanitizeSortFilters(filters, WEBSITE_SORT_FIELDS, { orderBy: 'name' }),
);
}
@@ -84,10 +85,7 @@ export async function getUserWebsites(userId: string, filters?: QueryFilters) {
},
},
},
{
orderBy: 'name',
...filters,
},
sanitizeSortFilters(filters, WEBSITE_SORT_FIELDS, { orderBy: 'name' }),
);
}