Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-10 04:22:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify deleted query

Browse Source
This commit is contained in:
Mythie
2024-08-21 13:12:03 +10:00
parent d33bbe71e7
commit d2b99303f9
3 changed files with 19 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
packages/lib/server-only/document/find-documents.ts
View File

@ -26,115 +26,6 @@ export type FindDocumentsOptions = {
senderIds?: number[];
};
const getDeletedFilter = (
status: ExtendedDocumentStatus,
user: User,
team?: (Team & { teamEmail: TeamEmail | null }) | null,
) => {
if (status === ExtendedDocumentStatus.BIN) {
return {
OR: [
{
userId: user.id,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
{
Recipient: {
some: {
email: user.email,
documentDeletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
},
},
...(team
? [
{
teamId: team.id,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
...(team.teamEmail
? [
{
User: {
email: team.teamEmail.email,
},
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
{
Recipient: {
some: {
email: team.teamEmail.email,
documentDeletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
},
},
]
: []),
]
: []),
],
};
}
return {
AND: {
OR: [
{
userId: user.id,
deletedAt: null,
},
{
Recipient: {
some: {
email: user.email,
documentDeletedAt: null,
},
},
},
...(team
? team.teamEmail
? [
{
teamId: team.id,
deletedAt: null,
},
{
User: {
email: team.teamEmail.email,
},
deletedAt: null,
},
{
Recipient: {
some: {
email: team.teamEmail.email,
documentDeletedAt: null,
},
},
},
]
: [
{
teamId: team.id,
deletedAt: null,
},
]
: []),
],
},
};
};
export const findDocuments = async ({
userId,
teamId,
@ -190,12 +81,9 @@ export const findDocuments = async ({
};
}
const deletedFilter = getDeletedFilter(status, user, team);
const whereClause: Prisma.DocumentWhereInput = {
...termFilters,
...filters,
...deletedFilter,
};
if (period) {
@ -356,7 +244,6 @@ const findDocumentsFilter = (status: ExtendedDocumentStatus, user: User) => {
{
userId: user.id,
teamId: null,
status: ExtendedDocumentStatus.COMPLETED,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
@ -554,19 +441,17 @@ const findTeamDocumentsFilter = (
return filter;
})
.with(ExtendedDocumentStatus.BIN, () => {
const filter: Prisma.DocumentWhereInput = {
OR: [
{
teamId: team.id,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
const filters: Prisma.DocumentWhereInput[] = [
{
teamId: team.id,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
],
};
},
];
if (teamEmail && filter.OR) {
filter.OR.push(
if (teamEmail) {
filters.push(
{
User: {
email: teamEmail,
@ -588,7 +473,9 @@ const findTeamDocumentsFilter = (
);
}
return filter;
return {
OR: filters,
};
})
.exhaustive();

12
packages/lib/server-only/document/get-stats.ts
View File

@ -197,9 +197,7 @@ type GetTeamCountsOption = {
};
const getTeamCounts = async (options: GetTeamCountsOption) => {
const { createdAt, teamId, teamEmail } = options;
const senderIds = options.senderIds ?? [];
const { createdAt, teamId, teamEmail, senderIds = [] } = options;
const userIdWhereClause: Prisma.DocumentWhereInput['userId'] =
senderIds.length > 0
@ -298,9 +296,13 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
_all: true,
},
where: {
userId: userIdWhereClause,
createdAt,
OR: [
{
teamId,
deletedAt: {
gte: DateTime.now().minus({ days: 30 }).startOf('day').toJSDate(),
},
},
{
status: ExtendedDocumentStatus.PENDING,
Recipient: {

2
packages/trpc/server/document-router/router.ts
View File

@ -205,8 +205,6 @@ export const documentRouter = router({
requestMetadata: extractNextApiRequestMetadata(ctx.req),
});
console.log(restoredDocument);
return restoredDocument;
} catch (err) {
console.error(err);