From 9e60641c4fedb18f3af75c5cdf0f362fcee04a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Malfait?= Date: Wed, 27 May 2026 19:34:58 +0200 Subject: [PATCH] refactor(twenty-orm): migrate WorkspaceFlatRoleTargetByAgentIdService to wrapper --- ...space-flat-role-target-by-agent-id.service.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-agent/services/workspace-flat-role-target-by-agent-id.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-agent/services/workspace-flat-role-target-by-agent-id.service.ts index 530aa23f2ae..20b5d2f19c1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-agent/services/workspace-flat-role-target-by-agent-id.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-agent/services/workspace-flat-role-target-by-agent-id.service.ts @@ -11,6 +11,8 @@ import { FlatRoleTargetByAgentIdMaps } from 'src/engine/metadata-modules/flat-ag import { fromRoleTargetEntityToFlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/utils/from-role-target-entity-to-flat-role-target.util'; import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity'; import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity'; +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 { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator'; import { createIdToUniversalIdentifierMap } from 'src/engine/workspace-cache/utils/create-id-to-universal-identifier-map.util'; @@ -18,12 +20,12 @@ import { createIdToUniversalIdentifierMap } from 'src/engine/workspace-cache/uti @WorkspaceCache('flatRoleTargetByAgentIdMaps') export class WorkspaceFlatRoleTargetByAgentIdService extends WorkspaceCacheProvider { constructor( - @InjectRepository(RoleTargetEntity) - private readonly roleTargetRepository: Repository, + @InjectWorkspaceScopedRepository(RoleTargetEntity) + private readonly roleTargetRepository: WorkspaceScopedRepository, @InjectRepository(ApplicationEntity) private readonly applicationRepository: Repository, - @InjectRepository(RoleEntity) - private readonly roleRepository: Repository, + @InjectWorkspaceScopedRepository(RoleEntity) + private readonly roleRepository: WorkspaceScopedRepository, ) { super(); } @@ -32,9 +34,8 @@ export class WorkspaceFlatRoleTargetByAgentIdService extends WorkspaceCacheProvi workspaceId: string, ): Promise { const [roleTargetEntities, applications, roles] = await Promise.all([ - this.roleTargetRepository.find({ + this.roleTargetRepository.find(workspaceId, { where: { - workspaceId, agentId: Not(IsNull()), }, withDeleted: true, @@ -44,8 +45,7 @@ export class WorkspaceFlatRoleTargetByAgentIdService extends WorkspaceCacheProvi select: ['id', 'universalIdentifier'], withDeleted: true, }), - this.roleRepository.find({ - where: { workspaceId }, + this.roleRepository.find(workspaceId, { select: ['id', 'universalIdentifier'], withDeleted: true, }),