watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 23:27:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Refactor filter handling for queries.

Browse source
This commit is contained in:
Mike Cao 2025-07-02 01:44:12 -07:00
parent 5b300f1ff5
commit ee6c68d27c
107 changed files with 731 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/queries/prisma/website.ts
View file

@ -1,7 +1,7 @@
import { Prisma, Website } from '@/generated/prisma/client';
import redis from '@/lib/redis';
import prisma from '@/lib/prisma';
import { PageResult, PageParams } from '@/lib/types';
import { PageResult, QueryFilters } from '@/lib/types';
import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
import { ROLES } from '@/lib/constants';
@ -28,9 +28,9 @@ export async function getSharedWebsite(shareId: string) {
export async function getWebsites(
criteria: WebsiteFindManyArgs,
pageParams: PageParams,
filters: QueryFilters,
): Promise<PageResult<Website[]>> {
const { search } = pageParams;
const { search } = filters;
const where: Prisma.WebsiteWhereInput = {
...criteria.where,
@ -43,7 +43,7 @@ export async function getWebsites(
deletedAt: null,
};
return prisma.pagedQuery('website', { ...criteria, where }, pageParams);
return prisma.pagedQuery('website', { ...criteria, where }, filters);
}
export async function getAllWebsites(userId: string) {
@ -90,7 +90,7 @@ export async function getAllUserWebsitesIncludingTeamOwner(userId: string) {
export async function getUserWebsites(
userId: string,
filters?: PageParams,
filters?: QueryFilters,
): Promise<PageResult<Website[]>> {
return getWebsites(
{
@ -115,7 +115,7 @@ export async function getUserWebsites(
export async function getTeamWebsites(
teamId: string,
filters?: PageParams,
filters?: QueryFilters,
): Promise<PageResult<Website[]>> {
return getWebsites(
{