Skip to content

The open alternative to Salesforce, designed for AI.

perf(cache): map user workspaces to members in the member cache (#27131)

Félix Malfait8a80dc54d2c3
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
index 9c944853b0f..4e4e0d07bc3 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
@@ -8,7 +8,6 @@ import { ApplicationConnectionAuthFailureService } from 'src/engine/core-modules
import { ApplicationConnectionsListService } from 'src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service';
import { ConnectionProviderGraphqlApiExceptionInterceptor } from 'src/engine/core-modules/application/connection-provider/interceptors/connection-provider-graphql-api-exception.interceptor';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@@ -27,7 +26,6 @@ import { RefreshTokensManagerModule } from 'src/modules/connected-account/refres
TypeOrmModule.forFeature([
ConnectedAccountEntity,
ConnectionProviderEntity,
- UserWorkspaceEntity,
]),
TokenModule,
WorkspaceCacheStorageModule,
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts
index e99883e4965..63012167377 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts
@@ -11,8 +11,6 @@ import { ConnectionProviderEntity } from 'src/engine/core-modules/application/co
import { ConnectionProviderException } from 'src/engine/core-modules/application/connection-provider/connection-provider.exception';
import { type AppConnectionDto } from 'src/engine/core-modules/application/connection-provider/connections/dtos/app-connection.dto';
import { isConnectionHiddenFromRequestUser } from 'src/engine/core-modules/application/connection-provider/connections/utils/is-connection-hidden-from-request-user.util';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { resolveWorkspaceMemberId } from 'src/engine/core-modules/user-workspace/utils/resolve-workspace-member-id.util';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
@@ -53,8 +51,6 @@ export class ApplicationConnectionsListService {
private readonly connectedAccountRepository: Repository<ConnectedAccountEntity>,
@InjectWorkspaceScopedRepository(ConnectionProviderEntity)
private readonly oauthProviderRepository: WorkspaceScopedRepository<ConnectionProviderEntity>,
- @InjectRepository(UserWorkspaceEntity)
- private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
) {}
async list({
@@ -100,18 +96,20 @@ export class ApplicationConnectionsListService {
),
});
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
const refreshed = await Promise.all(
- accounts.map(async (account) =>
+ accounts.map((account) =>
this.refreshAndMap(
account,
workspaceId,
providerById,
- await resolveWorkspaceMemberId({
- userWorkspaceId: account.userWorkspaceId,
- workspaceId,
- userWorkspaceRepository: this.userWorkspaceRepository,
- workspaceCacheService: this.workspaceCacheService,
- }),
+ flatWorkspaceMemberMaps.idByUserWorkspaceId[
+ account.userWorkspaceId
+ ] ?? null,
),
),
);
@@ -156,16 +154,17 @@ export class ApplicationConnectionsListService {
{ where: { id: account.connectionProviderId } },
);
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
const dto = await this.refreshAndMap(
account,
workspaceId,
new Map([[provider.id, provider]]),
- await resolveWorkspaceMemberId({
- userWorkspaceId: account.userWorkspaceId,
- workspaceId,
- userWorkspaceRepository: this.userWorkspaceRepository,
- workspaceCacheService: this.workspaceCacheService,
- }),
+ flatWorkspaceMemberMaps.idByUserWorkspaceId[account.userWorkspaceId] ??
+ null,
);
if (!isDefined(dto)) {
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts
index ea31f476e61..3f3656ec02b 100644
--- a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts
@@ -3,6 +3,7 @@ import { ModuleRef } from '@nestjs/core';
import { TypeOrmModule } from '@nestjs/typeorm';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';
@@ -106,6 +107,7 @@ import { WorkflowModule } from 'src/modules/workflow/workflow.module';
NavigationMenuItemModule,
SdkClientModule,
WorkspaceCleanerModule,
+ WorkspaceCacheModule,
SubscriptionsModule,
EventLogIngestionModule,
AiAgentMonitorModule,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts b/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts
index 93381c8eeb9..9a0b57c24f2 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/record-share.module.ts
@@ -3,9 +3,7 @@
import { RecordSharingResolver } from 'src/engine/core-modules/record-share/resolvers/record-sharing.resolver';
import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { RecordAccessPolicyService } from 'src/engine/core-modules/record-share/services/record-access-policy.service';
import { RecordSharePrincipalService } from 'src/engine/core-modules/record-share/services/record-share-principal.service';
import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
@@ -20,7 +18,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
WorkspaceCacheModule,
RecordShareStorageModule,
RecordPermissionsModule,
- TypeOrmModule.forFeature([UserWorkspaceEntity]),
],
providers: [
ShareWithService,
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts
index c5c6d29b28f..fb30a95d808 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts
@@ -1,12 +1,10 @@
/* @license Enterprise */
import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
import { msg } from '@lingui/core/macro';
import { RecordSharePrincipalType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { In, Repository } from 'typeorm';
import {
RecordShareException,
@@ -15,7 +13,6 @@ import {
import { type RecordShareInput } from 'src/engine/core-modules/record-share/types/record-share-input.type';
import { buildRoleRowAccessPolicySubject } from 'src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util';
import { isRecordGrantBeyondRoleAllowed } from 'src/engine/core-modules/record-share/utils/is-record-grant-beyond-role-allowed.util';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -28,11 +25,7 @@ type RecordSharePrincipal = Pick<
@Injectable()
export class RecordSharePrincipalService {
- constructor(
- private readonly workspaceCacheService: WorkspaceCacheService,
- @InjectRepository(UserWorkspaceEntity)
- private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
- ) {}
+ constructor(private readonly workspaceCacheService: WorkspaceCacheService) {}
// Undefined for everyone, and for a member who left or whose membership is gone
async resolveRoleIds({
@@ -47,52 +40,30 @@ export class RecordSharePrincipalService {
'flatWorkspaceMemberMaps',
'userWorkspaceRoleMap',
]);
- const userIdByWorkspaceMemberId = new Map(
- principals
- .filter(
- (principal) =>
- principal.principalType ===
- RecordSharePrincipalType.WORKSPACE_MEMBER,
- )
- .map((principal) => {
- const flatWorkspaceMember =
- flatWorkspaceMemberMaps.byId[principal.principalId];
-
- return [
- principal.principalId,
- isDefined(flatWorkspaceMember?.deletedAt)
- ? undefined
- : flatWorkspaceMember?.userId,
- ];
- })
- .filter((entry): entry is [string, string] => isDefined(entry[1])),
- );
- // Members are cached without their user workspace, which holds the role
- const userWorkspaces =
- userIdByWorkspaceMemberId.size > 0
- ? await this.userWorkspaceRepository.find({
- select: ['id', 'userId'],
- where: {
- workspaceId,
- userId: In([...userIdByWorkspaceMemberId.values()]),
- },
- })
- : [];
- const roleIdByUserId = new Map(
- userWorkspaces.map((userWorkspace) => [
- userWorkspace.userId,
- userWorkspaceRoleMap[userWorkspace.id],
- ]),
- );
return principals.map((principal) => {
switch (principal.principalType) {
case RecordSharePrincipalType.ROLE:
return principal.principalId;
case RecordSharePrincipalType.WORKSPACE_MEMBER: {
- const userId = userIdByWorkspaceMemberId.get(principal.principalId);
+ const flatWorkspaceMember =
+ flatWorkspaceMemberMaps.byId[principal.principalId];
- return isDefined(userId) ? roleIdByUserId.get(userId) : undefined;
+ if (
+ !isDefined(flatWorkspaceMember) ||
+ isDefined(flatWorkspaceMember.deletedAt)
+ ) {
+ return undefined;
+ }
+
+ const userWorkspaceId =
+ flatWorkspaceMemberMaps.userWorkspaceIdByUserId[
+ flatWorkspaceMember.userId
+ ];
+
+ return isDefined(userWorkspaceId)
+ ? userWorkspaceRoleMap[userWorkspaceId]
+ : undefined;
}
default:
return undefined;
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts
index c2619796181..4f2b642384f 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts
@@ -34,7 +34,6 @@ const build = () => {
{} as never,
{} as never,
{} as never,
- {} as never,
);
const current = {
workspaceId: 'workspace',
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
index 708a3c8ae7c..a857bbf75eb 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts
@@ -29,7 +29,6 @@ import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types
import { buildRequiredToolAuthContext } from 'src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util';
import { withResolvedToolAuthContext } from 'src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -54,8 +53,6 @@ export class ToolExecutorService {
private readonly workspaceCacheService: WorkspaceCacheService,
@InjectRepository(UserEntity)
private readonly userRepository: Repository<UserEntity>,
- @InjectRepository(UserWorkspaceEntity)
- private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
) {}
async dispatch(
@@ -71,7 +68,6 @@ export class ToolExecutorService {
{
context: executionContext,
userRepository: this.userRepository,
- userWorkspaceRepository: this.userWorkspaceRepository,
workspaceCacheService: this.workspaceCacheService,
},
(contextWithAuth) =>
@@ -112,7 +108,6 @@ export class ToolExecutorService {
(await buildRequiredToolAuthContext({
context,
userRepository: this.userRepository,
- userWorkspaceRepository: this.userWorkspaceRepository,
workspaceCacheService: this.workspaceCacheService,
}));
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
index 526c32fe7bd..6b78e7528a4 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tool-provider.module.ts
@@ -18,7 +18,6 @@ import { WorkflowToolProvider } from 'src/engine/core-modules/tool-provider/prov
import { RecordFilesResolverService } from 'src/engine/core-modules/tool-provider/services/record-files-resolver.service';
import { ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';
import { ToolModule } from 'src/engine/core-modules/tool/tool.module';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
@@ -69,7 +68,7 @@ import { ToolRegistryService } from './services/tool-registry.service';
RoleModule,
UserRoleModule,
EmailingModule,
- TypeOrmModule.forFeature([UserEntity, UserWorkspaceEntity, FileEntity]),
+ TypeOrmModule.forFeature([UserEntity, FileEntity]),
],
providers: [
ToolIndexResolver,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-auth-context-dependencies.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-auth-context-dependencies.type.ts
index 8bd1590ea65..aacb2058c6f 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-auth-context-dependencies.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-auth-context-dependencies.type.ts
@@ -1,11 +1,9 @@
import { type Repository } from 'typeorm';
-import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type UserEntity } from 'src/engine/core-modules/user/user.entity';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
export type ToolAuthContextDependencies = {
userRepository: Pick<Repository<UserEntity>, 'findOne'>;
- userWorkspaceRepository: Pick<Repository<UserWorkspaceEntity>, 'findOne'>;
workspaceCacheService: Pick<WorkspaceCacheService, 'getOrRecompute'>;
};
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
index 35f0575af24..f16a2c1e103 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/build-required-tool-auth-context.util.spec.ts
@@ -40,17 +40,11 @@ describe('buildRequiredToolAuthContext', () => {
deletedAt: null,
}),
},
- userWorkspaceRepository: {
- findOne: jest.fn().mockResolvedValue({
- id: userWorkspaceId,
- userId,
- workspaceId,
- }),
- },
workspaceCacheService: {
getOrRecompute: jest.fn().mockResolvedValue({
flatWorkspaceMemberMaps: {
idByUserId: { [userId]: workspaceMemberId },
+ userWorkspaceIdByUserId: { [userId]: userWorkspaceId },
byId: {
[workspaceMemberId]: {
id: workspaceMemberId,
@@ -70,9 +64,12 @@ describe('buildRequiredToolAuthContext', () => {
...dependencies,
});
- expect(dependencies.userWorkspaceRepository.findOne).toHaveBeenCalledWith({
- where: { id: userWorkspaceId, userId, workspaceId },
- });
+ expect(
+ dependencies.workspaceCacheService.getOrRecompute,
+ ).toHaveBeenCalledTimes(1);
+ expect(
+ dependencies.workspaceCacheService.getOrRecompute,
+ ).toHaveBeenCalledWith(workspaceId, ['flatWorkspaceMemberMaps']);
expect(authContext).toMatchObject({
type: 'user',
userWorkspaceId,
@@ -105,7 +102,13 @@ describe('buildRequiredToolAuthContext', () => {
it('should throw when the userWorkspace does not bind this user to this workspace', async () => {
const dependencies = buildDependencies();
- dependencies.userWorkspaceRepository.findOne.mockResolvedValue(null);
+ dependencies.workspaceCacheService.getOrRecompute.mockResolvedValue({
+ flatWorkspaceMemberMaps: {
+ idByUserId: { [userId]: workspaceMemberId },
+ userWorkspaceIdByUserId: { [userId]: 'other-user-workspace-id' },
+ byId: {},
+ },
+ });
await expect(
buildRequiredToolAuthContext({
@@ -133,7 +136,11 @@ describe('buildRequiredToolAuthContext', () => {
const dependencies = buildDependencies();
dependencies.workspaceCacheService.getOrRecompute.mockResolvedValue({
- flatWorkspaceMemberMaps: { idByUserId: {}, byId: {} },
+ flatWorkspaceMemberMaps: {
+ idByUserId: {},
+ userWorkspaceIdByUserId: { [userId]: userWorkspaceId },
+ byId: {},
+ },
});
await expect(
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
index 3e9581b8d1a..0887af01533 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/with-resolved-tool-auth-context.util.spec.ts
@@ -38,17 +38,11 @@ describe('withResolvedToolAuthContext', () => {
deletedAt: null,
}),
},
- userWorkspaceRepository: {
- findOne: jest.fn().mockResolvedValue({
- id: userWorkspaceId,
- userId,
- workspaceId,
- }),
- },
workspaceCacheService: {
getOrRecompute: jest.fn().mockResolvedValue({
flatWorkspaceMemberMaps: {
idByUserId: { [userId]: workspaceMemberId },
+ userWorkspaceIdByUserId: { [userId]: userWorkspaceId },
byId: {
[workspaceMemberId]: {
id: workspaceMemberId,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
index f73eb9ed51c..4a945bd8ecd 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-required-tool-auth-context.util.ts
@@ -14,7 +14,6 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat
export const buildRequiredToolAuthContext = async ({
context,
userRepository,
- userWorkspaceRepository,
workspaceCacheService,
}: {
context: ToolProviderContext;
@@ -26,16 +25,16 @@ export const buildRequiredToolAuthContext = async ({
);
}
- // The identity arrives as separate fields, so verify the userWorkspace binds this user to this workspace, as token auth does.
- const userWorkspace = await userWorkspaceRepository.findOne({
- where: {
- id: context.userWorkspaceId,
- userId: context.userId,
- workspaceId: context.workspaceId,
- },
- });
+ const { flatWorkspaceMemberMaps } =
+ await workspaceCacheService.getOrRecompute(context.workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
- if (!isDefined(userWorkspace)) {
+ // The identity arrives as separate fields, so verify the userWorkspace binds this user to this workspace, as token auth does.
+ if (
+ flatWorkspaceMemberMaps.userWorkspaceIdByUserId[context.userId] !==
+ context.userWorkspaceId
+ ) {
throw new AuthException(
'User workspace not found',
AuthExceptionCode.UNAUTHENTICATED,
@@ -53,11 +52,6 @@ export const buildRequiredToolAuthContext = async ({
);
}
- const { flatWorkspaceMemberMaps } =
- await workspaceCacheService.getOrRecompute(context.workspaceId, [
- 'flatWorkspaceMemberMaps',
- ]);
-
const workspaceMemberId = flatWorkspaceMemberMaps.idByUserId[user.id];
const workspaceMember = isDefined(workspaceMemberId)
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
index 3a660de9feb..9fb6a4471b1 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/with-resolved-tool-auth-context.util.ts
@@ -10,7 +10,6 @@ export const withResolvedToolAuthContext = async <T>(
{
context,
userRepository,
- userWorkspaceRepository,
workspaceCacheService,
}: { context: ToolProviderContext } & ToolAuthContextDependencies,
dispatch: (contextWithAuth: ToolProviderContext) => Promise<T>,
@@ -21,7 +20,6 @@ export const withResolvedToolAuthContext = async <T>(
? await buildRequiredToolAuthContext({
context,
userRepository,
- userWorkspaceRepository,
workspaceCacheService,
})
: undefined);
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
index 8b4dbd6958c..61169b07386 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts
@@ -53,11 +53,9 @@ export class UserWorkspaceAuthContextService {
AuthExceptionCode.UNAUTHENTICATED,
);
}
- const membership = await this.userWorkspaceRepository.findOne({
- where: { workspaceId, userId: member.userId },
- select: { id: true },
- });
- if (!isDefined(membership)) {
+ const userWorkspaceId =
+ flatWorkspaceMemberMaps.userWorkspaceIdByUserId[member.userId];
+ if (!isDefined(userWorkspaceId)) {
throw new AuthException(
'User workspace not found',
AuthExceptionCode.UNAUTHENTICATED,
@@ -65,7 +63,7 @@ export class UserWorkspaceAuthContextService {
}
const authContext = await this.resolve({
workspaceId,
- userWorkspaceId: membership.id,
+ userWorkspaceId,
applicationId,
});
if (authContext.workspaceMemberId !== workspaceMemberId) {
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 3ac91a38dbf..cfe06d72bfc 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -44,6 +44,7 @@ import { RoleValidationService } from 'src/engine/metadata-modules/role-validati
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
import { assert } from 'src/utils/assert';
import { getDomainFromEmailOrThrow } from 'src/utils/get-domain-from-email-or-throw';
@@ -71,6 +72,7 @@ export class UserWorkspaceService {
private readonly coreEntityCacheService: CoreEntityCacheService,
private readonly twentyConfigService: TwentyConfigService,
private readonly workflowRunRecordShareService: WorkflowRunRecordShareService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
) {}
async findById(id: string): Promise<UserWorkspaceEntity | null> {
@@ -244,6 +246,10 @@ export class UserWorkspaceService {
await this.createWorkspaceMember(workspace.id, user);
+ await this.workspaceCacheService.invalidateAndRecompute(workspace.id, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
await this.userRoleService.assignRoleToManyUserWorkspace({
workspaceId: workspace.id,
userWorkspaceIds: [userWorkspace.id],
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/utils/resolve-workspace-member-id.util.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/utils/resolve-workspace-member-id.util.ts
deleted file mode 100644
index 6c4e3b2dea4..00000000000
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/utils/resolve-workspace-member-id.util.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { type Repository } from 'typeorm';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-
-export const resolveWorkspaceMemberId = async ({
- userWorkspaceId,
- workspaceId,
- userWorkspaceRepository,
- workspaceCacheService,
-}: {
- userWorkspaceId: string;
- workspaceId: string;
- userWorkspaceRepository: Repository<UserWorkspaceEntity>;
- workspaceCacheService: WorkspaceCacheService;
-}): Promise<string | null> => {
- const userWorkspace = await userWorkspaceRepository.findOne({
- where: { id: userWorkspaceId, workspaceId },
- });
-
- if (!isDefined(userWorkspace)) {
- return null;
- }
-
- const { flatWorkspaceMemberMaps } =
- await workspaceCacheService.getOrRecompute(workspaceId, [
- 'flatWorkspaceMemberMaps',
- ]);
-
- return flatWorkspaceMemberMaps.idByUserId[userWorkspace.userId] ?? null;
-};
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index b26f889d80f..a841635c8d6 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -51,6 +51,7 @@ import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
// oxlint-disable-next-line twenty/inject-workspace-repository
@@ -71,6 +72,7 @@ export class UserService {
private readonly coreEntityCacheService: CoreEntityCacheService,
private readonly workspaceMemberTranspiler: WorkspaceMemberTranspiler,
private readonly twentyConfigService: TwentyConfigService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
@InjectAgentHistoryRepository('agentChatThread')
private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
) {}
@@ -414,6 +416,10 @@ export class UserService {
workspaceId,
});
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
// After the membership is gone, so a failed removal keeps the history and threads created meanwhile are cleaned.
await this.agentChatThreadRepository.delete(workspaceId, {
workspaceMemberId: workspaceMember.id,
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
index 9991ca9b195..6451b8cbb0f 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/workspace-flat-workspace-member-map-cache.service.ts
@@ -1,52 +1,57 @@
import { Injectable } from '@nestjs/common';
+import { IsNull } from 'typeorm';
+
import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
import { type WorkspaceCacheProviderContext } from 'src/engine/workspace-cache/types/workspace-cache-provider-context.type';
import { FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
+import { buildFlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/utils/build-flat-workspace-member-maps.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
+import { type WorkspaceCacheRowsRequirement } from 'src/engine/workspace-cache/types/workspace-cache-rows-requirement.type';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+const USER_WORKSPACE_ROWS_REQUIREMENT = {
+ userWorkspace: {
+ columns: ['id', 'userId'],
+ where: { deletedAt: IsNull() },
+ },
+} as const satisfies WorkspaceCacheRowsRequirement;
+
@Injectable()
@WorkspaceCache('flatWorkspaceMemberMaps', {
localDataOnly: true,
packingPonderation: 1,
})
export class WorkspaceFlatWorkspaceMemberMapCacheService extends WorkspaceCacheProvider<FlatWorkspaceMemberMaps> {
+ override readonly rowsRequirement = USER_WORKSPACE_ROWS_REQUIREMENT;
+
constructor(protected readonly workspaceOrmManager: WorkspaceOrmManager) {
super();
}
async computeForCache({
workspaceId,
- }: WorkspaceCacheProviderContext): Promise<FlatWorkspaceMemberMaps> {
- const flatWorkspaceMemberMaps =
- await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
- 'workspaceMember',
- { shouldBypassPermissionChecks: true },
- );
-
- const flatWorkspaceMemberMaps: FlatWorkspaceMemberMaps = {
- byId: {},
- idByUserId: {},
- };
- const workspaceMembers = await workspaceMemberRepository.find({
- withDeleted: true,
- });
-
- for (const workspaceMember of workspaceMembers) {
- flatWorkspaceMemberMaps.byId[workspaceMember.id] = workspaceMember;
- flatWorkspaceMemberMaps.idByUserId[workspaceMember.userId] =
- workspaceMember.id;
- }
-
- return flatWorkspaceMemberMaps;
- }, buildSystemAuthContext(workspaceId));
-
- return flatWorkspaceMemberMaps;
+ rows,
+ }: WorkspaceCacheProviderContext<
+ typeof USER_WORKSPACE_ROWS_REQUIREMENT
+ >): Promise<FlatWorkspaceMemberMaps> {
+ const workspaceMembers =
+ await this.workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ this.workspaceOrmManager
+ .getRepository<WorkspaceMemberWorkspaceEntity>('workspaceMember', {
+ shouldBypassPermissionChecks: true,
+ })
+ .find({ withDeleted: true }),
+ buildSystemAuthContext(workspaceId),
+ );
+
+ return buildFlatWorkspaceMemberMaps({
+ workspaceMembers,
+ userWorkspaces: rows.userWorkspace,
+ });
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/user/types/flat-workspace-member-maps.type.ts b/packages/twenty-server/src/engine/core-modules/user/types/flat-workspace-member-maps.type.ts
index fe73451a4be..f5a1e101bc3 100644
--- a/packages/twenty-server/src/engine/core-modules/user/types/flat-workspace-member-maps.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/types/flat-workspace-member-maps.type.ts
@@ -3,4 +3,6 @@ import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/fla
export type FlatWorkspaceMemberMaps = {
byId: Partial<Record<string, FlatWorkspaceMember>>;
idByUserId: Partial<Record<string, string>>;
+ idByUserWorkspaceId: Partial<Record<string, string>>;
+ userWorkspaceIdByUserId: Partial<Record<string, string>>;
};
diff --git a/packages/twenty-server/src/engine/core-modules/user/utils/__tests__/build-flat-workspace-member-maps.util.spec.ts b/packages/twenty-server/src/engine/core-modules/user/utils/__tests__/build-flat-workspace-member-maps.util.spec.ts
new file mode 100644
index 00000000000..7dfb5817631
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/utils/__tests__/build-flat-workspace-member-maps.util.spec.ts
@@ -0,0 +1,129 @@
+import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';
+import { buildFlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/utils/build-flat-workspace-member-maps.util';
+
+const buildWorkspaceMember = ({
+ id,
+ userId,
+ deletedAt = null,
+}: Pick<FlatWorkspaceMember, 'id' | 'userId'> &
+ Partial<Pick<FlatWorkspaceMember, 'deletedAt'>>): FlatWorkspaceMember => ({
+ id,
+ userId,
+ deletedAt,
+ createdAt: '2026-01-01T00:00:00.000Z',
+ updatedAt: '2026-01-01T00:00:00.000Z',
+ position: 0,
+ name: { firstName: 'Jane', lastName: 'Doe' },
+ colorScheme: 'System',
+ uiScale: 'Default',
+ openRecordIn: 'SIDE_PANEL',
+ locale: 'en',
+ avatarUrl: null,
+ userEmail: null,
+ jobTitle: null,
+ calendarStartDay: 0,
+ timeZone: 'system',
+ dateFormat: 'SYSTEM',
+ timeFormat: 'SYSTEM',
+ searchVector: '',
+ numberFormat: 'SYSTEM',
+ assignedTasks: [],
+ accountOwnerForCompanies: [],
+ authoredAttachments: [],
+ messageParticipants: [],
+ blocklist: [],
+ calendarEventParticipants: [],
+ timelineActivities: [],
+ agentMessages: [],
+ agentChatThreads: [],
+ ownedOpportunities: [],
+});
+
+describe('buildFlatWorkspaceMemberMaps', () => {
+ it('should map each user workspace to the member of its user', () => {
+ const memberWithUserWorkspace = buildWorkspaceMember({
+ id: 'member-1',
+ userId: 'user-1',
+ });
+ const memberWithoutUserWorkspace = buildWorkspaceMember({
+ id: 'member-2',
+ userId: 'user-2',
+ });
+
+ expect(
+ buildFlatWorkspaceMemberMaps({
+ workspaceMembers: [memberWithUserWorkspace, memberWithoutUserWorkspace],
+ userWorkspaces: [
+ { id: 'user-workspace-1', userId: 'user-1' },
+ { id: 'user-workspace-3', userId: 'user-3' },
+ ],
+ }),
+ ).toEqual({
+ byId: {
+ 'member-1': memberWithUserWorkspace,
+ 'member-2': memberWithoutUserWorkspace,
+ },
+ idByUserId: { 'user-1': 'member-1', 'user-2': 'member-2' },
+ idByUserWorkspaceId: { 'user-workspace-1': 'member-1' },
+ userWorkspaceIdByUserId: {
+ 'user-1': 'user-workspace-1',
+ 'user-3': 'user-workspace-3',
+ },
+ });
+ });
+
+ it.each(['before', 'after'])(
+ 'should resolve a rejoined user to the live member when the deleted one comes %s it',
+ (deletedMemberPosition) => {
+ const deletedMember = buildWorkspaceMember({
+ id: 'member-deleted',
+ userId: 'user-1',
+ deletedAt: '2026-09-01T00:00:00.000Z',
+ });
+ const liveMember = buildWorkspaceMember({
+ id: 'member-live',
+ userId: 'user-1',
+ });
+
+ const flatWorkspaceMemberMaps = buildFlatWorkspaceMemberMaps({
+ workspaceMembers:
+ deletedMemberPosition === 'before'
+ ? [deletedMember, liveMember]
+ : [liveMember, deletedMember],
+ userWorkspaces: [{ id: 'user-workspace-1', userId: 'user-1' }],
+ });
+
+ expect(flatWorkspaceMemberMaps.byId).toEqual({
+ 'member-deleted': deletedMember,
+ 'member-live': liveMember,
+ });
+ expect(flatWorkspaceMemberMaps.idByUserId).toEqual({
+ 'user-1': 'member-live',
+ });
+ expect(flatWorkspaceMemberMaps.idByUserWorkspaceId).toEqual({
+ 'user-workspace-1': 'member-live',
+ });
+ },
+ );
+
+ it('should not map a user workspace to a member who left', () => {
+ const flatWorkspaceMemberMaps = buildFlatWorkspaceMemberMaps({
+ workspaceMembers: [
+ buildWorkspaceMember({
+ id: 'member-1',
+ userId: 'user-1',
+ deletedAt: '2026-09-01T00:00:00.000Z',
+ }),
+ ],
+ userWorkspaces: [{ id: 'user-workspace-1', userId: 'user-1' }],
+ });
+
+ expect(flatWorkspaceMemberMaps.idByUserId).toEqual({
+ 'user-1': 'member-1',
+ });
+ expect(flatWorkspaceMemberMaps.idByUserWorkspaceId).toEqual({});
+ expect(flatWorkspaceMemberMaps.userWorkspaceIdByUserId).toEqual({
+ 'user-1': 'user-workspace-1',
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/user/utils/build-flat-workspace-member-maps.util.ts b/packages/twenty-server/src/engine/core-modules/user/utils/build-flat-workspace-member-maps.util.ts
new file mode 100644
index 00000000000..dccdd2bece9
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/user/utils/build-flat-workspace-member-maps.util.ts
@@ -0,0 +1,57 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';
+import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
+
+// A user who left and rejoined keeps a soft-deleted member next to the live one
+export const buildFlatWorkspaceMemberMaps = ({
+ workspaceMembers,
+ userWorkspaces,
+}: {
+ workspaceMembers: FlatWorkspaceMember[];
+ userWorkspaces: Pick<UserWorkspaceEntity, 'id' | 'userId'>[];
+}): FlatWorkspaceMemberMaps => {
+ const flatWorkspaceMemberMaps: FlatWorkspaceMemberMaps = {
+ byId: {},
+ idByUserId: {},
+ idByUserWorkspaceId: {},
+ userWorkspaceIdByUserId: {},
+ };
+
+ for (const workspaceMember of workspaceMembers) {
+ const existingWorkspaceMemberId =
+ flatWorkspaceMemberMaps.idByUserId[workspaceMember.userId];
+ const existingWorkspaceMember = isDefined(existingWorkspaceMemberId)
+ ? flatWorkspaceMemberMaps.byId[existingWorkspaceMemberId]
+ : undefined;
+
+ flatWorkspaceMemberMaps.byId[workspaceMember.id] = workspaceMember;
+
+ if (
+ !isDefined(existingWorkspaceMember) ||
+ isDefined(existingWorkspaceMember.deletedAt)
+ ) {
+ flatWorkspaceMemberMaps.idByUserId[workspaceMember.userId] =
+ workspaceMember.id;
+ }
+ }
+
+ for (const userWorkspace of userWorkspaces) {
+ const workspaceMemberId =
+ flatWorkspaceMemberMaps.idByUserId[userWorkspace.userId];
+ const workspaceMember = isDefined(workspaceMemberId)
+ ? flatWorkspaceMemberMaps.byId[workspaceMemberId]
+ : undefined;
+
+ flatWorkspaceMemberMaps.userWorkspaceIdByUserId[userWorkspace.userId] =
+ userWorkspace.id;
+
+ if (isDefined(workspaceMember) && !isDefined(workspaceMember.deletedAt)) {
+ flatWorkspaceMemberMaps.idByUserWorkspaceId[userWorkspace.id] =
+ workspaceMember.id;
+ }
+ }
+
+ return flatWorkspaceMemberMaps;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
index 484f2f46559..5585ca2c779 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-run-record-share.service.ts
@@ -1,5 +1,4 @@
import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
@@ -8,11 +7,10 @@ import {
WorkflowVisibility,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type FindOptionsWhere, In, type Repository } from 'typeorm';
+import { type FindOptionsWhere, In } from 'typeorm';
import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { buildWorkflowRunRecordShares } from 'src/engine/core-modules/workflow/utils/build-workflow-run-record-shares.util';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
@@ -39,8 +37,6 @@ export class WorkflowRunRecordShareService {
constructor(
@InjectWorkspaceScopedRepository(WorkflowEntity)
private readonly coreWorkflowRepository: WorkspaceScopedRepository<WorkflowEntity>,
- @InjectRepository(UserWorkspaceEntity)
- private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly recordShareStorageService: RecordShareStorageService,
@@ -268,28 +264,12 @@ export class WorkflowRunRecordShareService {
workspaceId: string;
userWorkspaceId: string;
}): Promise<string | null> {
- const userWorkspace = await this.userWorkspaceRepository.findOne({
- where: { id: userWorkspaceId, workspaceId },
- select: { id: true, userId: true },
- });
-
- if (!isDefined(userWorkspace)) {
- return null;
- }
-
const { flatWorkspaceMemberMaps } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatWorkspaceMemberMaps',
]);
- const workspaceMemberId =
- flatWorkspaceMemberMaps.idByUserId[userWorkspace.userId];
- const workspaceMember = isDefined(workspaceMemberId)
- ? flatWorkspaceMemberMaps.byId[workspaceMemberId]
- : undefined;
- return isDefined(workspaceMember) && !isDefined(workspaceMember.deletedAt)
- ? workspaceMember.id
- : null;
+ return flatWorkspaceMemberMaps.idByUserWorkspaceId[userWorkspaceId] ?? null;
}
private findRuns({
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts b/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
index b08dca99c83..e495760f6e9 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/workflow-run-record-share.module.ts
@@ -3,7 +3,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
import { RecordShareStorageModule } from 'src/engine/core-modules/record-share/record-share-storage.module';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { WorkflowRunRecordShareService } from 'src/engine/core-modules/workflow/services/workflow-run-record-share.service';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@@ -12,7 +11,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
// Its own module because its callers (run creation, visibility changes, member removal) already depend on each other
@Module({
imports: [
- TypeOrmModule.forFeature([WorkflowEntity, UserWorkspaceEntity]),
+ TypeOrmModule.forFeature([WorkflowEntity]),
CacheLockModule,
RecordShareStorageModule,
WorkspaceCacheModule,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts b/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts
index 8d1193073c5..8a98f3916b1 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/handle-workspace-member-deleted.job.ts
@@ -2,6 +2,7 @@ import { WorkspaceService } from 'src/engine/core-modules/workspace/services/wor
import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
export type HandleWorkspaceMemberDeletedJobData = {
workspaceId: string;
@@ -10,7 +11,10 @@ export type HandleWorkspaceMemberDeletedJobData = {
@Processor(MessageQueue.workspaceQueue)
export class HandleWorkspaceMemberDeletedJob {
- constructor(private readonly workspaceService: WorkspaceService) {}
+ constructor(
+ private readonly workspaceService: WorkspaceService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ ) {}
@Process(HandleWorkspaceMemberDeletedJob.name)
async handle(data: HandleWorkspaceMemberDeletedJobData): Promise<void> {
@@ -20,5 +24,9 @@ export class HandleWorkspaceMemberDeletedJob {
workspaceId,
userId,
);
+
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
}
}
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts
index 4b7cba49bdf..5db29200a08 100644
--- a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts
@@ -1,11 +1,9 @@
import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';
import { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
import { FieldMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/field-metadata-connection-loader.factory';
import { IndexMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/index-metadata-connection-loader.factory';
@@ -16,7 +14,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
@Module({
imports: [
- TypeOrmModule.forFeature([UserWorkspaceEntity]),
ApplicationTranslationCatalogModule,
FieldMetadataModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
index 7c34699262f..8366a3df90b 100644
--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts
@@ -1,18 +1,15 @@
import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
import DataLoader from 'dataloader';
import { type APP_LOCALES } from 'twenty-shared/translations';
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { In, Repository } from 'typeorm';
import { type IndexMetadataInterface } from 'src/engine/metadata-modules/index-metadata/interfaces/index-metadata.interface';
import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';
-import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { FieldMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/field-metadata-connection-loader.factory';
import { IndexMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/index-metadata-connection-loader.factory';
@@ -180,8 +177,6 @@ export class DataloaderService {
private readonly indexMetadataConnectionLoaderFactory: IndexMetadataConnectionLoaderFactory,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly rowLevelPermissionPredicateService: RowLevelPermissionPredicateService,
- @InjectRepository(UserWorkspaceEntity)
- private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
) {}
createLoaders(): IDataloaders {
@@ -966,37 +961,17 @@ export class DataloaderService {
.filter(isDefined);
});
- const allUserWorkspaceIds = [...new Set(userWorkspaceIdsByRoleId.flat())];
-
- const userWorkspaces =
- allUserWorkspaceIds.length > 0
- ? await this.userWorkspaceRepository.find({
- select: { id: true, userId: true },
- where: { id: In(allUserWorkspaceIds), workspaceId },
- })
- : [];
-
- const userIdByUserWorkspaceId = new Map(
- userWorkspaces.map((userWorkspace) => [
- userWorkspace.id,
- userWorkspace.userId,
- ]),
- );
-
return userWorkspaceIdsByRoleId.map((userWorkspaceIds) =>
userWorkspaceIds
.map((userWorkspaceId) => {
- const userId = userIdByUserWorkspaceId.get(userWorkspaceId);
- const workspaceMemberId = isDefined(userId)
- ? flatWorkspaceMemberMaps.idByUserId[userId]
- : undefined;
+ const workspaceMemberId =
+ flatWorkspaceMemberMaps.idByUserWorkspaceId[userWorkspaceId];
return isDefined(workspaceMemberId)
? flatWorkspaceMemberMaps.byId[workspaceMemberId]
: undefined;
})
- .filter(isDefined)
- .filter((workspaceMember) => !isDefined(workspaceMember.deletedAt)),
+ .filter(isDefined),
);
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts
index 6a09bd611cf..c21006eaf4a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts
@@ -5,6 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { In, Not, Repository } from 'typeorm';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -203,37 +204,25 @@ export class UserRoleService {
public async getWorkspaceMembersAssignedToRole(
roleId: string,
workspaceId: string,
- ): Promise<WorkspaceMemberWorkspaceEntity[]> {
- const authContext = buildSystemAuthContext(workspaceId);
-
+ ): Promise<FlatWorkspaceMember[]> {
const userWorkspaceIdsWithRole =
await this.getUserWorkspaceIdsAssignedToRole(roleId, workspaceId);
- const userIds = await this.userWorkspaceRepository
- .find({
- where: {
- id: In(userWorkspaceIdsWithRole),
- },
- })
- .then((userWorkspaces) =>
- userWorkspaces.map((userWorkspace) => userWorkspace.userId),
- );
-
- return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workspaceMemberRepository =
- this.workspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
- 'workspaceMember',
- { shouldBypassPermissionChecks: true },
- );
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatWorkspaceMemberMaps',
+ ]);
- const workspaceMembers = await workspaceMemberRepository.find({
- where: {
- userId: In(userIds),
- },
- });
+ return userWorkspaceIdsWithRole
+ .map((userWorkspaceId) => {
+ const workspaceMemberId =
+ flatWorkspaceMemberMaps.idByUserWorkspaceId[userWorkspaceId];
- return workspaceMembers;
- }, authContext);
+ return isDefined(workspaceMemberId)
+ ? flatWorkspaceMemberMaps.byId[workspaceMemberId]
+ : undefined;
+ })
+ .filter(isDefined);
}
private validateNotSelfAssignmentOrThrow({
diff --git a/packages/twenty-server/src/engine/workspace-cache/constants/all-workspace-cache-entity-by-name.constant.ts b/packages/twenty-server/src/engine/workspace-cache/constants/all-workspace-cache-entity-by-name.constant.ts
index 6bf1df3f6c6..521a29e6048 100644
--- a/packages/twenty-server/src/engine/workspace-cache/constants/all-workspace-cache-entity-by-name.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/constants/all-workspace-cache-entity-by-name.constant.ts
@@ -3,6 +3,7 @@ import { ApplicationEntity } from 'src/engine/core-modules/application/applicati
import { BillingEntitlementEntity } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';
+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { ALL_METADATA_ENTITY_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-entity-by-metadata-name.constant';
import { IndexFieldMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-field-metadata.entity';
@@ -14,4 +15,5 @@ export const ALL_WORKSPACE_CACHE_ENTITY_BY_NAME = {
featureFlag: FeatureFlagEntity,
billingEntitlement: BillingEntitlementEntity,
usageLimit: UsageLimitEntity,
+ userWorkspace: UserWorkspaceEntity,
} as const;
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
index d3b260f4c03..f79fc9d91c0 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
@@ -21,6 +21,7 @@ import {
PermissionsExceptionCode,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
@WorkspaceQueryHook({
@@ -37,6 +38,7 @@ export class WorkspaceMemberDeleteOnePostQueryHook implements WorkspacePostQuery
private readonly recordShareOwnershipTransferService: RecordShareOwnershipTransferService,
@InjectAgentHistoryRepository('agentChatThread')
private readonly agentChatThreadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
+ private readonly workspaceCacheService: WorkspaceCacheService,
) {}
async execute(
@@ -118,6 +120,10 @@ export class WorkspaceMemberDeleteOnePostQueryHook implements WorkspacePostQuery
workspaceId: workspace.id,
});
+ await this.workspaceCacheService.invalidateAndRecompute(workspace.id, [
+ 'flatWorkspaceMemberMaps',
+ ]);
+
// After the membership is gone, so a failed removal keeps the history and racing threads are cleaned too
await this.agentChatThreadRepository.delete(workspace.id, {
workspaceMemberId: workspaceMember.id,
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
index 7bc14b16221..51c97ca5454 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts
@@ -18,6 +18,7 @@ import { WorkspaceMemberDestroyOnePreQueryHook } from 'src/modules/workspace-mem
import { WorkspaceMemberRestoreManyPreQueryHook } from 'src/modules/workspace-member/query-hooks/workspace-member-restore-many.pre-query.hook';
import { WorkspaceMemberRestoreOnePreQueryHook } from 'src/modules/workspace-member/query-hooks/workspace-member-restore-one.pre-query.hook';
import { WorkspaceMemberUpdateManyPreQueryHook } from 'src/modules/workspace-member/query-hooks/workspace-member-update-many.pre-query.hook';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
providers: [
@@ -39,6 +40,7 @@ import { WorkspaceMemberUpdateManyPreQueryHook } from 'src/modules/workspace-mem
ConnectedAccountMetadataModule,
RecordShareOwnershipTransferModule,
AgentHistoryModule,
+ WorkspaceCacheModule,
TypeOrmModule.forFeature([UserWorkspaceEntity]),
],
})
diff --git a/packages/twenty-server/test/integration/graphql/suites/user.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user.integration-spec.ts
index 8af633cef58..0e64aac8912 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user.integration-spec.ts
@@ -92,6 +92,24 @@ describe('deleteUser', () => {
);
});
+ const getRolesWithMembersQuery = {
+ query: `
+ query GetRoles {
+ getRoles { id label workspaceMembers { id } }
+ }
+ `,
+ };
+
+ // Primes the memoized member cache, so a missed invalidation on join would hide the new member
+ await client
+ .post('/metadata')
+ .set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
+ .send(getRolesWithMembersQuery)
+ .expect(200)
+ .expect((res) => {
+ expect(res.body.errors).toBeUndefined();
+ });
+
const testEmail = `test_user_${Date.now()}@example.com`;
const signUpMutation = signUpOperationFactory({
email: testEmail,
@@ -133,6 +151,24 @@ describe('deleteUser', () => {
expect(createdMember).toBeDefined();
const createdWorkspaceMemberId = createdMember.id;
+ const rolesAfterJoinResponse = await client
+ .post('/metadata')
+ .set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)
+ .send(getRolesWithMembersQuery);
+
+ expect(rolesAfterJoinResponse.body.errors).toBeUndefined();
+ expect(
+ (
+ rolesAfterJoinResponse.body.data.getRoles as Array<{
+ workspaceMembers: Array<{ id: string }>;
+ }>
+ ).some((role) =>
+ role.workspaceMembers.some(
+ (workspaceMember) => workspaceMember.id === createdWorkspaceMemberId,
+ ),
+ ),
+ ).toBe(true);
+
const deleteUserFromWorkspaceMutation = {
query: `
mutation DeleteUserFromWorkspace {
@@ -162,14 +198,6 @@ describe('deleteUser', () => {
expect(createdMemberAfterDeletion).toBeNull();
- const getRolesWithMembersQuery = {
- query: `
- query GetRoles {
- getRoles { id label workspaceMembers { id } }
- }
- `,
- };
-
const rolesResponse = await client
.post('/metadata')
.set('Authorization', `Bearer ${APPLE_JANE_ADMIN_ACCESS_TOKEN}`)