diff --git a/server/models/Document.ts b/server/models/Document.ts index fc8d822363..851f25089e 100644 --- a/server/models/Document.ts +++ b/server/models/Document.ts @@ -634,21 +634,17 @@ class Document extends ArchivableModel< static withMembershipScope( userId: string, - scopeOrOptions?: string[] | FindOptions, - opts?: FindOptions + options?: FindOptions & { includeDrafts?: boolean } ) { - const scopes = Array.isArray(scopeOrOptions) ? scopeOrOptions : []; - const options = Array.isArray(scopeOrOptions) ? opts : scopeOrOptions; - return this.scope([ - "defaultScope", + options?.includeDrafts ? "withDrafts" : "defaultScope", + "withoutState", { method: ["withViews", userId], }, { method: ["withMembership", userId, options?.paranoid], }, - ...scopes, ]); } diff --git a/server/models/helpers/SearchHelper.ts b/server/models/helpers/SearchHelper.ts index 4cd62b1639..c63fd4bdc9 100644 --- a/server/models/helpers/SearchHelper.ts +++ b/server/models/helpers/SearchHelper.ts @@ -182,7 +182,9 @@ export default class SearchHelper { }, ]; - return Document.withMembershipScope(user.id, ["withDrafts"]).findAll({ + return Document.withMembershipScope(user.id, { + includeDrafts: true, + }).findAll({ where, subQuery: false, order: [["updatedAt", "DESC"]], @@ -262,7 +264,7 @@ export default class SearchHelper { // Final query to get associated document data const [documents, count] = await Promise.all([ - Document.withMembershipScope(user.id, ["withDrafts"]).findAll({ + Document.withMembershipScope(user.id, { includeDrafts: true }).findAll({ where: { teamId: user.teamId, id: map(results, "id"), diff --git a/server/routes/api/documents/documents.ts b/server/routes/api/documents/documents.ts index fbeae76463..8e626ed7a5 100644 --- a/server/routes/api/documents/documents.ts +++ b/server/routes/api/documents/documents.ts @@ -535,9 +535,9 @@ router.post( delete where.updatedAt; } - const documents = await Document.withMembershipScope(user.id, [ - "withDrafts", - ]).findAll({ + const documents = await Document.withMembershipScope(user.id, { + includeDrafts: true, + }).findAll({ where, order: [[sort, direction]], offset: ctx.state.pagination.offset, diff --git a/server/routes/api/groupMemberships/groupMemberships.ts b/server/routes/api/groupMemberships/groupMemberships.ts index 891c234634..72092b562d 100644 --- a/server/routes/api/groupMemberships/groupMemberships.ts +++ b/server/routes/api/groupMemberships/groupMemberships.ts @@ -58,9 +58,9 @@ router.post( const documentIds = memberships .map((p) => p.documentId) .filter(Boolean) as string[]; - const documents = await Document.withMembershipScope(userId, [ - "withDrafts", - ]).findAll({ + const documents = await Document.withMembershipScope(userId, { + includeDrafts: true, + }).findAll({ where: { id: documentIds, },