sinvo/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-09-11 07:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(favorites): move favorite filtering into the repository query (#2475)

Browse Source 
* refactor(favorites): move favorite filtering into the repository query

* perf: resolve cleanup targets by primary key
This commit is contained in:
Philip Okugbe
2026-09-05 14:40:10 +01:00
committed by GitHub
parent ac7935eff9
commit 6ff8c7cdfe
4 changed files with 83 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/core/favorite/favorite.controller.ts
+2 -2
View File
@@ -48,9 +48,9 @@ export class FavoriteController {
await this.favoriteService.addFavorite(user.id, workspace.id, {
type: dto.type,
pageId: dto.pageId,
pageId: dto.type === 'page' ? dto.pageId : undefined,
spaceId: dto.type === 'space' ? resolved.spaceId : undefined,
templateId: dto.templateId,
templateId: dto.type === 'template' ? dto.templateId : undefined,
});
}
apps/server/src/core/favorite/services/favorite.service.ts
+5 -24
View File
@@ -6,14 +6,12 @@ import {
import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
import { InsertableFavorite } from '@docmost/db/types/entity.types';
import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
@Injectable()
export class FavoriteService {
constructor(
private readonly favoriteRepo: FavoriteRepo,
private readonly pagePermissionRepo: PagePermissionRepo,
private readonly spaceMemberRepo: SpaceMemberRepo,
) {}
async getFavoriteIds(
@@ -43,12 +41,6 @@ export class FavoriteService {
result.items = result.items.filter((id) => accessibleSet.has(id));
}
if (type === FavoriteType.SPACE) {
const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(userId);
const spaceSet = new Set(userSpaceIds);
result.items = result.items.filter((id) => spaceSet.has(id));
}
return result;
}
@@ -111,9 +103,6 @@ export class FavoriteService {
return result;
}
const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(userId);
const spaceSet = new Set(userSpaceIds);
const pageFavorites = result.items.filter(
(f) => f.type === FavoriteType.PAGE && f.pageId,
);
@@ -129,19 +118,11 @@ export class FavoriteService {
accessiblePageSet = new Set(accessibleIds);
}
result.items = result.items.filter((f) => {
if (f.type === FavoriteType.PAGE) {
return f.pageId && accessiblePageSet?.has(f.pageId);
}
if (f.type === FavoriteType.SPACE) {
return f.spaceId && spaceSet.has(f.spaceId);
}
if (f.type === FavoriteType.TEMPLATE) {
const templateSpaceId = (f as any).template?.spaceId;
return !templateSpaceId || spaceSet.has(templateSpaceId);
}
return true;
});
result.items = result.items.filter(
(f) =>
f.type !== FavoriteType.PAGE ||
(f.pageId && accessiblePageSet?.has(f.pageId)),
);
return result;
}