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

Refactor of team websites.

Browse source
This commit is contained in:
Mike Cao 2024-01-18 16:46:40 -08:00
parent 2552e1d495
commit dc3818baaa
22 changed files with 61 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/queries/admin/report.ts
View file

@ -29,7 +29,7 @@ export async function getReports(
params: ReportSearchFilter,
options?: { include?: Prisma.ReportInclude },
): Promise<FilterResult<Report[]>> {
const { query, userId, websiteId, includeTeams } = params;
const { query, userId, websiteId } = params;
const mode = prisma.getQueryMode();
@ -42,23 +42,6 @@ export async function getReports(
{
userId,
},
{
...(includeTeams && {
website: {
teamWebsite: {
some: {
team: {
teamUser: {
some: {
userId,
},
},
},
},
},
},
}),
},
],
},
{

61
src/queries/admin/website.ts
View file

@ -1,6 +1,5 @@
import { Prisma, Website } from '@prisma/client';
import cache from 'lib/cache';
import { ROLES } from 'lib/constants';
import prisma from 'lib/prisma';
import { FilterResult, WebsiteSearchFilter } from 'lib/types';
@ -22,49 +21,16 @@ export async function getWebsites(
filters: WebsiteSearchFilter,
options?: { include?: Prisma.WebsiteInclude },
): Promise<FilterResult<Website[]>> {
const { userId, teamId, includeTeams, onlyTeams, query } = filters;
const { userId, teamId, query } = filters;
const mode = prisma.getQueryMode();
const where: Prisma.WebsiteWhereInput = {
...(teamId && {
teamWebsite: {
some: {
teamId,
},
},
}),
AND: [
{
OR: [
{
...(userId &&
!onlyTeams && {
userId,
}),
},
{
...((includeTeams || onlyTeams) && {
AND: [
{
teamWebsite: {
some: {
team: {
teamUser: {
some: {
userId,
},
},
},
},
},
},
{
userId: {
not: userId,
},
},
],
}),
...(userId && { userId }),
...(teamId && { teamId }),
},
],
},
@ -110,15 +76,6 @@ export async function getWebsitesByUserId(
{ userId, ...filters },
{
include: {
teamWebsite: {
include: {
team: {
select: {
name: true,
},
},
},
},
user: {
select: {
username: true,
@ -138,21 +95,9 @@ export async function getWebsitesByTeamId(
{
teamId,
...filters,
includeTeams: true,
},
{
include: {
teamWebsite: {
include: {
team: {
include: {
teamUser: {
where: { role: ROLES.teamOwner },
},
},
},
},
},
user: {
select: {
id: true,