The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Retire EmailingDomain and MessageFolder from the workspace-scoped exemption list (#26563)
Paul Rastoinc315134a2c72
diff --git a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.tsindex 4ee0cfeba08..c3126812f55 100644--- a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts+++ b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts@@ -38,11 +38,7 @@ export const WORKSPACE_SCOPED_EXEMPTIONS = [// 20+ call sites across calendar/messaging modules; staged for a dedicated PR.'CalendarChannelEntity','MessageChannelEntity',- // The domain column is globally unique across workspaces, so duplicate- // preflight checks must query cross-workspace; writes stay on the wrapper.- 'EmailingDomainEntity','UserWorkspaceEntity','ConnectedAccountEntity',- 'MessageFolderEntity','WorkspaceSsoIdentityProviderEntity',] as const;diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/crons/jobs/check-emailing-domain-verification.cron.job.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/crons/jobs/check-emailing-domain-verification.cron.job.tsindex aa6650a0d90..75a583ec26b 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/crons/jobs/check-emailing-domain-verification.cron.job.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/crons/jobs/check-emailing-domain-verification.cron.job.ts@@ -23,6 +23,9 @@ export class CheckEmailingDomainVerificationCronJob {);constructor(+ // Instance-wide sweep: it enumerates domains across all workspaces and+ // dispatches per-workspace work from what it finds.+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository@InjectRepository(EmailingDomainEntity)private readonly emailingDomainRepository: Repository<EmailingDomainEntity>,private readonly emailingDomainService: EmailingDomainService,diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.tsindex 6afdca2a403..dad128f6d31 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts@@ -32,6 +32,7 @@ export class EmailingDomainService {private readonly emailingDomainRepository: WorkspaceScopedRepository<EmailingDomainEntity>,// Domain is globally unique across workspaces, so existence checks need// an unscoped repository+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository@InjectRepository(EmailingDomainEntity)private readonly globalEmailingDomainRepository: Repository<EmailingDomainEntity>,private readonly emailingDomainDriverFactory: EmailingDomainDriverFactory,diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.tsindex 2cb02cc075f..22415d0aa2b 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts@@ -17,6 +17,7 @@ import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';import { MessagingImportManagerModule } from 'src/modules/messaging/message-import-manager/messaging-import-manager.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -40,6 +41,7 @@ import { MessagingImportManagerModule } from 'src/modules/messaging/message-impoApplicationMessageIngestionService,ApplicationMessageIngestionResolver,MessageChannelGraphqlApiExceptionInterceptor,+ provideWorkspaceScopedRepository(MessageFolderEntity),],exports: [MessageChannelMetadataService],})diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.tsindex a0b4e51e39e..b681ab987da 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts@@ -1,11 +1,10 @@import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';-import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';-import { Not, Repository } from 'typeorm';+import { Not } from 'typeorm';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';@@ -38,6 +37,8 @@ import {import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';import { MessagingProcessGroupEmailActionsService } from 'src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+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 {MessageChannelPendingGroupEmailsAction,MessageChannelSyncStage,@@ -54,8 +55,8 @@ export class MessageChannelResolver {private readonly messageChannelMetadataService: MessageChannelMetadataService,private readonly connectedAccountMetadataService: ConnectedAccountMetadataService,private readonly applicationMessageChannelsService: ApplicationMessageChannelsService,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,private readonly messagingProcessGroupEmailActionsService: MessagingProcessGroupEmailActionsService,) {}@@ -174,13 +175,15 @@ export class MessageChannelResolver {messageChannel.syncStage ===MessageChannelSyncStage.MESSAGE_LIST_FETCH_ONGOING;- const foldersWithPendingAction = await this.messageFolderRepository.find({- where: {- messageChannelId: messageChannel.id,- pendingSyncAction: Not(MessageFolderPendingSyncAction.NONE),- workspaceId: workspace.id,+ const foldersWithPendingAction = await this.messageFolderRepository.find(+ workspace.id,+ {+ where: {+ messageChannelId: messageChannel.id,+ pendingSyncAction: Not(MessageFolderPendingSyncAction.NONE),+ },},- });+ );const hasPendingGroupEmailsAction =messageChannel.pendingGroupEmailsAction !==diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.tsindex 784281b9bb0..21b7465bb37 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts@@ -9,6 +9,7 @@ import { MessageFolderGraphqlApiExceptionInterceptor } from 'src/engine/metadataimport { MessageFolderMetadataService } from 'src/engine/metadata-modules/message-folder/message-folder-metadata.service';import { MessageFolderResolver } from 'src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -22,6 +23,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permiMessageFolderMetadataService,MessageFolderResolver,MessageFolderGraphqlApiExceptionInterceptor,+ provideWorkspaceScopedRepository(MessageFolderEntity),],exports: [MessageFolderMetadataService],})diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.service.tsindex 339a3e002f0..8fbe5a16815 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.service.ts@@ -16,18 +16,26 @@ import {MessageFolderExceptionCode,} from 'src/engine/metadata-modules/message-folder/message-folder.exception';import { MessageChannelMetadataService } from 'src/engine/metadata-modules/message-channel/message-channel-metadata.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 { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';@Injectable()export class MessageFolderMetadataService {constructor(+ // The manager is only reachable from the raw repository, and every+ // statement inside the transaction carries workspaceId itself.+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository@InjectRepository(MessageFolderEntity)- private readonly repository: Repository<MessageFolderEntity>,+ private readonly unscopedRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly repository: WorkspaceScopedRepository<MessageFolderEntity>,private readonly messageChannelMetadataService: MessageChannelMetadataService,private readonly connectedAccountMetadataService: ConnectedAccountMetadataService,) {}async findAll(workspaceId: string): Promise<MessageFolderDTO[]> {- return this.repository.find({ where: { workspaceId } });+ return this.repository.find(workspaceId);}async findByUserWorkspaceId({@@ -82,8 +90,8 @@ export class MessageFolderMetadataService {messageChannelId: string;workspaceId: string;}): Promise<MessageFolderDTO[]> {- return this.repository.find({- where: { messageChannelId, workspaceId },+ return this.repository.find(workspaceId, {+ where: { messageChannelId },});}@@ -98,8 +106,8 @@ export class MessageFolderMetadataService {return [];}- return this.repository.find({- where: { messageChannelId: In(messageChannelIds), workspaceId },+ return this.repository.find(workspaceId, {+ where: { messageChannelId: In(messageChannelIds) },});}@@ -110,7 +118,7 @@ export class MessageFolderMetadataService {id: string;workspaceId: string;}): Promise<MessageFolderDTO | null> {- return this.repository.findOne({ where: { id, workspaceId } });+ return this.repository.findOne(workspaceId, { where: { id } });}async verifyOwnership({@@ -122,8 +130,8 @@ export class MessageFolderMetadataService {userWorkspaceId: string;workspaceId: string;}): Promise<MessageFolderEntity> {- const messageFolder = await this.repository.findOne({- where: { id, workspaceId },+ const messageFolder = await this.repository.findOne(workspaceId, {+ where: { id },});if (!messageFolder) {@@ -164,9 +172,10 @@ export class MessageFolderMetadataService {pendingSyncAction: MessageFolderPendingSyncAction;},): Promise<MessageFolderDTO> {- const entity = this.repository.create(data);-- return this.repository.save(entity);+ return this.repository.insertAndReturnOne(+ data.workspaceId,+ data as QueryDeepPartialEntity<MessageFolderEntity>,+ );}async update({@@ -179,11 +188,12 @@ export class MessageFolderMetadataService {data: Partial<MessageFolderEntity>;}): Promise<MessageFolderDTO> {await this.repository.update(- { id, workspaceId },+ workspaceId,+ { id },data as Record<string, unknown>,);- return this.repository.findOneOrFail({ where: { id, workspaceId } });+ return this.repository.findOneOrFail(workspaceId, { where: { id } });}async setSyncStatus({@@ -195,7 +205,7 @@ export class MessageFolderMetadataService {workspaceId: string;data: Partial<MessageFolderEntity>;}): Promise<MessageFolderDTO[]> {- await this.repository.manager.transaction(async (manager) => {+ await this.unscopedRepository.manager.transaction(async (manager) => {if (!data.isSynced) {await manager.update(MessageFolderEntity,@@ -243,7 +253,7 @@ export class MessageFolderMetadataService {}});- return this.repository.find({ where: { id: In(ids), workspaceId } });+ return this.repository.find(workspaceId, { where: { id: In(ids) } });}async delete({@@ -253,11 +263,11 @@ export class MessageFolderMetadataService {id: string;workspaceId: string;}): Promise<MessageFolderDTO> {- const messageFolder = await this.repository.findOneOrFail({- where: { id, workspaceId },+ const messageFolder = await this.repository.findOneOrFail(workspaceId, {+ where: { id },});- await this.repository.delete({ id, workspaceId });+ await this.repository.delete(workspaceId, { id });return messageFolder;}diff --git a/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts b/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.tsindex b3de5292f9d..671ff73f4b2 100644--- a/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts+++ b/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts@@ -22,6 +22,9 @@ const ENQUEUE_BATCH_SIZE = 500;@Processor(MessageQueue.cronQueue)export class ReconcileCampaignStatsCronJob {constructor(+ // Instance-wide sweep: it reads every active workspace to find which ones+ // have a sending domain, so there is no request workspace to scope by.+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository@InjectRepository(EmailingDomainEntity)private readonly emailingDomainRepository: Repository<EmailingDomainEntity>,@InjectMessageQueue(MessageQueue.campaignQueue)diff --git a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.tsindex b24207e2f36..d092fd17ce5 100644--- a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts+++ b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts@@ -9,6 +9,7 @@ import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/services/message-channel-sync-status.service';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -22,7 +23,10 @@ import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/seConnectedAccountModule,MetricsModule,],- providers: [MessageChannelSyncStatusService],+ providers: [+ MessageChannelSyncStatusService,+ provideWorkspaceScopedRepository(MessageFolderEntity),+ ],exports: [MessageChannelSyncStatusService],})export class MessagingCommonModule {}diff --git a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.tsindex fe644045d52..0a71950a677 100644--- a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts+++ b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts@@ -23,6 +23,8 @@ import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-systemimport { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-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';@Injectable()export class MessageChannelSyncStatusService {@@ -34,8 +36,8 @@ export class MessageChannelSyncStatusService {private readonly workspaceOrmManager: WorkspaceOrmManager,@InjectRepository(MessageChannelEntity)private readonly messageChannelRepository: Repository<MessageChannelEntity>,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,@InjectRepository(ConnectedAccountEntity)private readonly connectedAccountRepository: Repository<ConnectedAccountEntity>,@InjectRepository(UserWorkspaceEntity)@@ -131,7 +133,8 @@ export class MessageChannelSyncStatusService {);await this.messageFolderRepository.update(- { messageChannelId: In(messageChannelIds), workspaceId },+ workspaceId,+ { messageChannelId: In(messageChannelIds) },{syncCursor: '',pendingSyncAction: MessageFolderPendingSyncAction.NONE,diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module.tsindex ce9bf2f9dbc..d138598de18 100644--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module.ts+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module.ts@@ -14,6 +14,7 @@ import { SyncMessageFoldersService } from 'src/modules/messaging/message-folder-import { MessagingGmailDriverModule } from 'src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module';import { MessagingIMAPDriverModule } from 'src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module';import { MessagingMicrosoftDriverModule } from 'src/modules/messaging/message-import-manager/drivers/microsoft/messaging-microsoft-driver.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -31,6 +32,7 @@ import { MessagingMicrosoftDriverModule } from 'src/modules/messaging/message-imGmailFoldersErrorHandlerService,ImapGetAllFoldersService,MicrosoftGetAllFoldersService,+ provideWorkspaceScopedRepository(MessageFolderEntity),],exports: [SyncMessageFoldersService],})diff --git a/packages/twenty-server/src/modules/messaging/message-folder-manager/services/sync-message-folders.service.ts b/packages/twenty-server/src/modules/messaging/message-folder-manager/services/sync-message-folders.service.tsindex 9e19c534a90..0ba3b00b303 100644--- a/packages/twenty-server/src/modules/messaging/message-folder-manager/services/sync-message-folders.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-folder-manager/services/sync-message-folders.service.ts@@ -1,12 +1,11 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import {ConnectedAccountProvider,MessageFolderPendingSyncAction,} from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { In, Repository } from 'typeorm';+import { In } from 'typeorm';import {DiscoveredMessageFolder,@@ -25,13 +24,16 @@ import { computeFolderIdsToDelete } from 'src/modules/messaging/message-folder-mimport { computeFoldersToCreate } from 'src/modules/messaging/message-folder-manager/utils/compute-folders-to-create.util';import { computeFoldersToUpdate } from 'src/modules/messaging/message-folder-manager/utils/compute-folders-to-update.util';import { computeUpdatedFolders } from 'src/modules/messaging/message-folder-manager/utils/compute-updated-folders.util';+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 { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';@Injectable()export class SyncMessageFoldersService {constructor(private readonly workspaceOrmManager: WorkspaceOrmManager,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,private readonly gmailGetAllFoldersService: GmailGetAllFoldersService,private readonly microsoftGetAllFoldersService: MicrosoftGetAllFoldersService,private readonly imapGetAllFoldersService: ImapGetAllFoldersService,@@ -142,7 +144,8 @@ export class SyncMessageFoldersService {async () => {if (folderIdsToDelete.length > 0) {await this.messageFolderRepository.update(- { id: In(folderIdsToDelete), workspaceId },+ workspaceId,+ { id: In(folderIdsToDelete) },{pendingSyncAction: MessageFolderPendingSyncAction.FOLDER_DELETION,},@@ -152,7 +155,8 @@ export class SyncMessageFoldersService {if (foldersToUpdate.size > 0) {for (const [id, data] of foldersToUpdate.entries()) {await this.messageFolderRepository.update(- { id, messageChannelId, workspaceId },+ workspaceId,+ { id, messageChannelId },data as Record<string, unknown>,);}@@ -160,16 +164,16 @@ export class SyncMessageFoldersService {if (foldersToCreate.length > 0) {for (const folderToCreate of foldersToCreate) {- await this.messageFolderRepository.save({- ...folderToCreate,+ await this.messageFolderRepository.insert(workspaceId,- });+ folderToCreate as QueryDeepPartialEntity<MessageFolderEntity>,+ );}}const createdFolders =foldersToCreate.length > 0- ? await this.messageFolderRepository.find({+ ? await this.messageFolderRepository.find(workspaceId, {where: {messageChannelId,externalId: In(@@ -177,7 +181,6 @@ export class SyncMessageFoldersService {.map((folder) => folder.externalId).filter(isDefined),),- workspaceId,},}): [];diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.tsindex 2182f745b99..5f56b8cb14c 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts@@ -119,6 +119,7 @@ import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklisMessagingImportFolderMessagesService,MessagingDeleteGroupEmailMessagesService,InboundEmailImportService,+ provideWorkspaceScopedRepository(MessageFolderEntity),],exports: [MessagingMessageListFetchCronCommand,diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.tsindex 5a6eaf10c76..0887d3a5147 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts@@ -8,6 +8,8 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.managerimport { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';import { isSyncCursorNewer } from 'src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util';+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';@Injectable()export class MessagingCursorService {@@ -15,8 +17,8 @@ export class MessagingCursorService {private readonly workspaceOrmManager: WorkspaceOrmManager,@InjectRepository(MessageChannelEntity)private readonly messageChannelRepository: Repository<MessageChannelEntity>,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,) {}public async updateCursor(@@ -46,7 +48,8 @@ export class MessagingCursorService {);} else {await this.messageFolderRepository.update(- { id: folderId, workspaceId },+ workspaceId,+ { id: folderId },{syncCursor: nextSyncCursor,},diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-folder-actions.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-folder-actions.service.tsindex 7956f213dd9..fe3cc54d456 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-folder-actions.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-folder-actions.service.ts@@ -1,8 +1,7 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { isDefined } from 'twenty-shared/utils';-import { In, Repository } from 'typeorm';+import { In } from 'typeorm';import { type MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';@@ -11,6 +10,8 @@ import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-systemimport { MessageFolderPendingSyncAction } from 'twenty-shared/types';import { MessagingDeleteFolderMessagesService } from 'src/modules/messaging/message-import-manager/services/messaging-delete-folder-messages.service';import { MessagingImportFolderMessagesService } from 'src/modules/messaging/message-import-manager/services/messaging-import-folder-messages.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';export type ProcessFolderActionsResult = {messageExternalIdsToImport: string[];@@ -24,8 +25,8 @@ export class MessagingProcessFolderActionsService {constructor(private readonly workspaceOrmManager: WorkspaceOrmManager,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,private readonly messagingDeleteFolderMessagesService: MessagingDeleteFolderMessagesService,private readonly messagingImportFolderMessagesService: MessagingImportFolderMessagesService,) {}@@ -116,7 +117,8 @@ export class MessagingProcessFolderActionsService {async () => {if (processedFolderIds.length > 0) {await this.messageFolderRepository.update(- { id: In(processedFolderIds), workspaceId },+ workspaceId,+ { id: In(processedFolderIds) },{ pendingSyncAction: MessageFolderPendingSyncAction.NONE },);@@ -126,9 +128,8 @@ export class MessagingProcessFolderActionsService {}if (folderIdsToDelete.length > 0) {- await this.messageFolderRepository.delete({+ await this.messageFolderRepository.delete(workspaceId, {id: In(folderIdsToDelete),- workspaceId,});this.logger.log(diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service.tsindex 44a3cde85ac..23a123b6cd9 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service.ts@@ -10,6 +10,8 @@ import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.managerimport { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { MessagingDeleteGroupEmailMessagesService } from 'src/modules/messaging/message-import-manager/services/messaging-delete-group-email-messages.service';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.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';@Injectable()export class MessagingProcessGroupEmailActionsService {@@ -21,8 +23,8 @@ export class MessagingProcessGroupEmailActionsService {private readonly workspaceOrmManager: WorkspaceOrmManager,@InjectRepository(MessageChannelEntity)private readonly messageChannelRepository: Repository<MessageChannelEntity>,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,private readonly messagingDeleteGroupEmailMessagesService: MessagingDeleteGroupEmailMessagesService,) {}@@ -135,7 +137,8 @@ export class MessagingProcessGroupEmailActionsService {);await this.messageFolderRepository.update(- { messageChannelId, workspaceId },+ workspaceId,+ { messageChannelId },{ syncCursor: '' },);}diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/drivers/imap/services/imap-smtp-message-outbound.service.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/drivers/imap/services/imap-smtp-message-outbound.service.tsindex 74173e46533..5f30a85b38a 100644--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/drivers/imap/services/imap-smtp-message-outbound.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/drivers/imap/services/imap-smtp-message-outbound.service.ts@@ -23,6 +23,8 @@ import { extractMessageIdFromBuffer } from 'src/modules/messaging/message-outbouimport { formatMessageFromHeader } from 'src/modules/messaging/message-outbound-manager/utils/format-message-from-header.util';import { getConnectedAccountSendableHandleOrThrow } from 'src/modules/messaging/message-outbound-manager/utils/get-connected-account-sendable-handle-or-throw.util';import { toMailComposerOptions } from 'src/modules/messaging/message-outbound-manager/utils/to-mail-composer-options.util';+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';@Injectable()export class ImapSmtpMessageOutboundService implements MessageOutboundDriver {@@ -34,8 +36,8 @@ export class ImapSmtpMessageOutboundService implements MessageOutboundDriver {private readonly imapFindDraftsFolderService: ImapFindDraftsFolderService,@InjectRepository(MessageChannelEntity)private readonly messageChannelRepository: Repository<MessageChannelEntity>,- @InjectRepository(MessageFolderEntity)- private readonly messageFolderRepository: Repository<MessageFolderEntity>,+ @InjectWorkspaceScopedRepository(MessageFolderEntity)+ private readonly messageFolderRepository: WorkspaceScopedRepository<MessageFolderEntity>,) {}async sendMessage(@@ -85,12 +87,15 @@ export class ImapSmtpMessageOutboundService implements MessageOutboundDriver {let sentFolder: MessageFolderEntity | null = null;if (isDefined(messageChannel)) {- sentFolder = await this.messageFolderRepository.findOne({- where: {- messageChannelId: messageChannel.id,- isSentFolder: true,+ sentFolder = await this.messageFolderRepository.findOne(+ connectedAccount.workspaceId,+ {+ where: {+ messageChannelId: messageChannel.id,+ isSentFolder: true,+ },},- });+ );}const sentFolderPath = getImapFolderPath(diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/messaging-send-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/messaging-send-manager.module.tsindex ee295fa97ae..e5486f3b534 100644--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/messaging-send-manager.module.ts+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/messaging-send-manager.module.ts@@ -48,6 +48,7 @@ import { SentMessagePersistenceService } from 'src/modules/messaging/message-outSendEmailService,SentMessagePersistenceService,provideWorkspaceScopedRepository(EmailingDomainEntity),+ provideWorkspaceScopedRepository(MessageFolderEntity),],exports: [MessagingMessageOutboundService,