Skip to content

The open alternative to Salesforce, designed for AI.

perf(server): resolve workspace default role from flat entity cache (#26484)

Charles Bochet9a999b97031c
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
index d17b837de6c..e264781e7c5 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -72,7 +72,6 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
-import { fromRoleEntityToRoleDto } from 'src/engine/metadata-modules/role/utils/fromRoleEntityToRoleDto.util';
import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
import { getRequest } from 'src/utils/extract-request';
@@ -210,14 +209,7 @@ export class WorkspaceResolver {
return null;
}
- const defaultRoleEntity = await this.roleService.getRoleById(
- workspace.defaultRoleId,
- workspace.id,
- );
-
- return isDefined(defaultRoleEntity)
- ? fromRoleEntityToRoleDto(defaultRoleEntity)
- : null;
+ return this.roleService.getRoleById(workspace.defaultRoleId, workspace.id);
}
@ResolveField(() => ApplicationDTO, { nullable: true })
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
index 33e56e4abfa..fc1dd0ff8b7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts
@@ -38,7 +38,6 @@ import {
import { type CreateRoleInput } from 'src/engine/metadata-modules/role/dtos/create-role.input';
import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
import { type UpdateRoleInput } from 'src/engine/metadata-modules/role/dtos/update-role.input';
-import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { fromFlatRoleToRoleDto } from 'src/engine/metadata-modules/role/utils/fromFlatRoleToRoleDto.util';
import {
validateRoleDeletionDoesNotLockOutActorOrThrow,
@@ -46,8 +45,6 @@ import {
} from 'src/engine/metadata-modules/role/utils/validate-role-mutation-does-not-lock-out-actor.util';
import { fromFlatRolePermissionFlagToRolePermissionFlagDto } from 'src/engine/metadata-modules/role-permission-flag/utils/from-flat-role-permission-flag-to-role-permission-flag-dto.util';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
-import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
@@ -58,8 +55,6 @@ export class RoleService {
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
- @InjectWorkspaceScopedRepository(RoleEntity)
- private readonly roleRepository: WorkspaceScopedRepository<RoleEntity>,
private readonly userRoleService: UserRoleService,
private readonly applicationService: ApplicationService,
private readonly apiKeyRoleService: ApiKeyRoleService,
@@ -133,20 +128,30 @@ export class RoleService {
public async getRoleById(
id: string,
workspaceId: string,
- ): Promise<RoleEntity | null> {
- return this.roleRepository.findOne(workspaceId, {
- where: {
- id,
- },
- relations: {
- roleTargets: true,
- rolePermissionFlags: {
- permissionFlag: true,
+ ): Promise<RoleDTO | null> {
+ const { flatRoleMaps } =
+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+ {
+ workspaceId,
+ flatMapsKeys: ['flatRoleMaps'],
},
- objectPermissions: true,
- fieldPermissions: true,
- },
+ );
+
+ const flatRole = findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: id,
+ flatEntityMaps: flatRoleMaps,
});
+
+ if (!isDefined(flatRole)) {
+ return null;
+ }
+
+ const [roleDto] = await this.findManyWithRelationsFromCache(
+ [flatRole],
+ workspaceId,
+ );
+
+ return roleDto;
}
public async getRoleByUniversalIdentifier({