The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move ObjectMetadata and FieldMetadata onto the workspace-scoped repository (#26479)
Paul Rastoin06fd4fe9fe62
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 5db390bbb58..4ee0cfeba08 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,13 +38,6 @@ export const WORKSPACE_SCOPED_EXEMPTIONS = [// 20+ call sites across calendar/messaging modules; staged for a dedicated PR.'CalendarChannelEntity','MessageChannelEntity',- // The owning services `extends TypeOrmQueryService<E>` and pass the raw- // repo to `super(...)`; the superclass type doesn't accept the wrapper.- 'FieldMetadataEntity',- 'ObjectMetadataEntity',- // Only injection lives in a frozen historical upgrade-version-command- // directory that CI's mutation-guard refuses to let us edit.- 'DataSourceEntity',// The domain column is globally unique across workspaces, so duplicate// preflight checks must query cross-workspace; writes stay on the wrapper.'EmailingDomainEntity',diff --git a/packages/twenty-server/.oxlintrc.json b/packages/twenty-server/.oxlintrc.jsonindex b90194d527d..78d8f3caf70 100644--- a/packages/twenty-server/.oxlintrc.json+++ b/packages/twenty-server/.oxlintrc.json@@ -153,6 +153,24 @@}]}+ },+ {+ "files": [+ "src/database/commands/upgrade-version-command/1-21/**",+ "src/database/commands/upgrade-version-command/2-8/**",+ "src/database/commands/upgrade-version-command/2-10/**",+ "src/database/commands/upgrade-version-command/2-19/**",+ "src/database/commands/upgrade-version-command/2-21/**",+ "src/database/commands/upgrade-version-command/2-23/**",+ "src/database/commands/upgrade-version-command/2-25/**",+ "src/database/commands/upgrade-version-command/2-33/**",+ "src/database/commands/upgrade-version-command/2-34/**",+ "src/database/commands/upgrade-version-command/2-39/**",+ "src/database/commands/upgrade-version-command/2-41/**"+ ],+ "rules": {+ "twenty/prefer-workspace-scoped-repository": "off"+ }}]}diff --git a/packages/twenty-server/src/database/commands/workspace-export/workspace-export.module.ts b/packages/twenty-server/src/database/commands/workspace-export/workspace-export.module.tsindex eda25e34a4f..5bcaa386f65 100644--- a/packages/twenty-server/src/database/commands/workspace-export/workspace-export.module.ts+++ b/packages/twenty-server/src/database/commands/workspace-export/workspace-export.module.ts@@ -6,6 +6,7 @@ import { WorkspaceExportService } from 'src/database/commands/workspace-export/wimport { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { SearchFieldMetadataEntity } from 'src/engine/metadata-modules/search-field-metadata/search-field-metadata.entity';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -15,6 +16,12 @@ import { SearchFieldMetadataEntity } from 'src/engine/metadata-modules/search-fiSearchFieldMetadataEntity,]),],- providers: [WorkspaceExportCommand, WorkspaceExportService],+ providers: [+ WorkspaceExportCommand,+ WorkspaceExportService,+ provideWorkspaceScopedRepository(ObjectMetadataEntity),+ provideWorkspaceScopedRepository(FieldMetadataEntity),+ provideWorkspaceScopedRepository(SearchFieldMetadataEntity),+ ],})export class WorkspaceExportModule {}diff --git a/packages/twenty-server/src/database/commands/workspace-export/workspace-export.service.ts b/packages/twenty-server/src/database/commands/workspace-export/workspace-export.service.tsindex 13d4fdcdc58..2ddd2cf47aa 100644--- a/packages/twenty-server/src/database/commands/workspace-export/workspace-export.service.ts+++ b/packages/twenty-server/src/database/commands/workspace-export/workspace-export.service.ts@@ -1,15 +1,10 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';+import { InjectDataSource } from '@nestjs/typeorm';import { once } from 'events';import { type WriteStream, createWriteStream, mkdirSync } from 'fs';import { finished } from 'stream/promises';-import {- DataSource,- type EntityMetadata,- type QueryRunner,- Repository,-} from 'typeorm';+import { DataSource, type EntityMetadata, type QueryRunner } from 'typeorm';import { buildInsertPrefix } from 'src/database/commands/workspace-export/utils/build-insert-prefix.util';import { buildWorkspaceTableColumnSets } from 'src/database/commands/workspace-export/utils/build-workspace-table-column-sets.util';@@ -24,6 +19,8 @@ import { computeTableName } from 'src/engine/utils/compute-table-name.util';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.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 { isNonEmptyArray } from 'twenty-shared/utils';import { formatPgCopyField } from './utils/format-pg-copy-value.util';@@ -54,13 +51,12 @@ export class WorkspaceExportService {constructor(@InjectDataSource()private readonly dataSource: DataSource,- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,- // eslint-disable-next-line twenty/prefer-workspace-scoped-repository -- Ignored- @InjectRepository(SearchFieldMetadataEntity)- private readonly searchFieldMetadataRepository: Repository<SearchFieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(SearchFieldMetadataEntity)+ private readonly searchFieldMetadataRepository: WorkspaceScopedRepository<SearchFieldMetadataEntity>,) {}async exportWorkspace({@@ -80,14 +76,12 @@ export class WorkspaceExportService {this.logger.log(`Exporting workspace ${workspaceId} (${schemaName})`);- const objectMetadatas = await this.objectMetadataRepository.find({- where: { workspaceId },- relations: { application: true },- });+ const objectMetadatas = await this.objectMetadataRepository.find(+ workspaceId,+ { relations: { application: true } },+ );- const fieldMetadatas = await this.fieldMetadataRepository.find({- where: { workspaceId },- });+ const fieldMetadatas = await this.fieldMetadataRepository.find(workspaceId);const fieldsByObjectId = new Map<string, FieldMetadataEntity[]>();@@ -99,9 +93,8 @@ export class WorkspaceExportService {fieldsByObjectId.set(fieldMetadata.objectMetadataId, objectFields);}- const searchFieldMetadatas = await this.searchFieldMetadataRepository.find({- where: { workspaceId },- });+ const searchFieldMetadatas =+ await this.searchFieldMetadataRepository.find(workspaceId);const searchFieldMetadatasByObjectId = new Map<string,diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.tsindex e3e55700d73..b0974c906ea 100644--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts@@ -1,9 +1,12 @@-import { type FindOptionsWhere, type Repository } from 'typeorm';+import { type FindOptionsWhere } from 'typeorm';++import { isDefined } from 'twenty-shared/utils';import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { paginateMetadataQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util';+import { type WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';export const paginateByIdCursor = async <T extends { id: string; workspaceId: string },@@ -13,7 +16,7 @@ export const paginateByIdCursor = async <where,request,}: {- repository: Repository<T>;+ repository: WorkspaceScopedRepository<T>;workspaceId: string;where?: FindOptionsWhere<T>;request: AuthenticatedRequest;@@ -22,10 +25,15 @@ export const paginateByIdCursor = async <pageInfo: RestCursorPageInfo;totalCount: number;}> => {- const baseWhere = { ...where, workspaceId } as FindOptionsWhere<T>;- const queryBuilder = repository- .createQueryBuilder('metadata')- .where(baseWhere);+ const queryBuilder = repository.createScopedQueryBuilder(+ workspaceId,+ 'metadata',+ );++ if (isDefined(where)) {+ queryBuilder.andWhere(where);+ }+const countQueryBuilder = queryBuilder.clone();const [page, totalCount] = await Promise.all([paginateMetadataQueryBuilder({diff --git a/packages/twenty-server/src/engine/core-modules/application/application.module.ts b/packages/twenty-server/src/engine/core-modules/application/application.module.tsindex 408aa6acb3d..5778719eeef 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.module.ts@@ -60,6 +60,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheprovideWorkspaceScopedRepository(SettingsMenuItemEntity),provideWorkspaceScopedRepository(FrontComponentEntity),provideWorkspaceScopedRepository(LogicFunctionEntity),+ provideWorkspaceScopedRepository(ObjectMetadataEntity),],})export class ApplicationModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application.service.ts b/packages/twenty-server/src/engine/core-modules/application/application.service.tsindex bcaab2c8f71..6cb9e331e52 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.service.ts@@ -60,8 +60,8 @@ export class ApplicationService {private readonly commandMenuItemRepository: WorkspaceScopedRepository<CommandMenuItemEntity>,@InjectWorkspaceScopedRepository(SettingsMenuItemEntity)private readonly settingsMenuItemRepository: WorkspaceScopedRepository<SettingsMenuItemEntity>,- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,@InjectWorkspaceScopedRepository(ApplicationVariableEntity)private readonly applicationVariableRepository: WorkspaceScopedRepository<ApplicationVariableEntity>,private readonly workspaceEventBroadcaster: WorkspaceEventBroadcaster,@@ -229,8 +229,8 @@ export class ApplicationService {this.settingsMenuItemRepository.find(workspaceId, {where: { applicationId: application.id },}),- this.objectMetadataRepository.find({- where: { applicationId: application.id, workspaceId },+ this.objectMetadataRepository.find(workspaceId, {+ where: { applicationId: application.id },}),this.applicationVariableRepository.find(workspaceId, {where: { applicationId: application.id },diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.tsindex 14659d9c621..06bc57c7c40 100644--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts@@ -43,6 +43,7 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspacPendingFileCleanupCronJob,PendingFileCleanupCronCommand,provideWorkspaceScopedRepository(FileEntity),+ provideWorkspaceScopedRepository(FieldMetadataEntity),],exports: [FileUploadService,diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.tsindex 105227b9b0a..765a7b685b7 100644--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/services/file-upload.service.ts@@ -72,8 +72,8 @@ export class FileUploadService {private readonly applicationRepository: Repository<ApplicationEntity>,@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,@InjectWorkspaceScopedRepository(FileEntity)private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,) {}@@ -375,16 +375,18 @@ export class FileUploadService {);}- const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail({- select: ['applicationId', 'universalIdentifier'],- where: {- ...(fieldMetadataId ? { id: fieldMetadataId } : {}),- ...(fieldMetadataUniversalIdentifier- ? { universalIdentifier: fieldMetadataUniversalIdentifier }- : {}),- workspaceId,+ const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail(+ workspaceId,+ {+ select: ['applicationId', 'universalIdentifier'],+ where: {+ ...(fieldMetadataId ? { id: fieldMetadataId } : {}),+ ...(fieldMetadataUniversalIdentifier+ ? { universalIdentifier: fieldMetadataUniversalIdentifier }+ : {}),+ },},- });+ );const application = await this.applicationRepository.findOneOrFail({where: {diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/files-field.module.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/files-field.module.tsindex f93de7043e0..e93ec0b0aac 100644--- a/packages/twenty-server/src/engine/core-modules/file/files-field/files-field.module.ts+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/files-field.module.ts@@ -36,6 +36,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permiFilesFieldDeletionListener,FilesFieldDeletionJob,provideWorkspaceScopedRepository(FileEntity),+ provideWorkspaceScopedRepository(FieldMetadataEntity),],exports: [FilesFieldService],})diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.tsindex c9e7ec2c474..132793566f5 100644--- a/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/services/__tests__/files-field.service.copy-file-into-files-field.spec.ts@@ -16,7 +16,9 @@ describe('FilesFieldService.copyFileIntoFilesField', () => {let fileStorageService: jest.Mocked<FileStorageService>;let applicationRepository: jest.Mocked<Repository<ApplicationEntity>>;- let fieldMetadataRepository: jest.Mocked<Repository<FieldMetadataEntity>>;+ let fieldMetadataRepository: jest.Mocked<+ WorkspaceScopedRepository<FieldMetadataEntity>+ >;let fileRepository: jest.Mocked<WorkspaceScopedRepository<FileEntity>>;const buildService = () =>@@ -57,7 +59,7 @@ describe('FilesFieldService.copyFileIntoFilesField', () => {applicationId: 'field-application-id',universalIdentifier: 'field-universal-identifier',}),- } as unknown as jest.Mocked<Repository<FieldMetadataEntity>>;+ } as unknown as jest.Mocked<WorkspaceScopedRepository<FieldMetadataEntity>>;fileRepository = {findOne: jest.fn().mockResolvedValue(null),diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.tsindex 942ce54422c..77e536f5887 100644--- a/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/services/files-field.service.ts@@ -32,8 +32,8 @@ export class FilesFieldService {private readonly fileStorageService: FileStorageService,@InjectRepository(ApplicationEntity)private readonly applicationRepository: Repository<ApplicationEntity>,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,@InjectWorkspaceScopedRepository(FileEntity)private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,private readonly fileUrlService: FileUrlService,@@ -70,16 +70,18 @@ export class FilesFieldService {const fileId = v4();const name = `${fileId}${isNonEmptyString(ext) ? `.${ext}` : ''}`;- const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail({- select: ['applicationId', 'universalIdentifier'],- where: {- ...(fieldMetadataId ? { id: fieldMetadataId } : {}),- ...(fieldMetadataUniversalIdentifier- ? { universalIdentifier: fieldMetadataUniversalIdentifier }- : {}),- workspaceId,+ const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail(+ workspaceId,+ {+ select: ['applicationId', 'universalIdentifier'],+ where: {+ ...(fieldMetadataId ? { id: fieldMetadataId } : {}),+ ...(fieldMetadataUniversalIdentifier+ ? { universalIdentifier: fieldMetadataUniversalIdentifier }+ : {}),+ },},- });+ );const application = await this.applicationRepository.findOneOrFail({where: {@@ -142,10 +144,13 @@ export class FilesFieldService {);}- const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail({- select: ['applicationId', 'universalIdentifier'],- where: { id: fieldMetadataId, workspaceId },- });+ const fieldMetadata = await this.fieldMetadataRepository.findOneOrFail(+ workspaceId,+ {+ select: ['applicationId', 'universalIdentifier'],+ where: { id: fieldMetadataId },+ },+ );const [sourceApplication, destinationApplication] = await Promise.all([this.applicationRepository.findOneOrFail({diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.tsindex e03887b73d5..d151f83c2f1 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts@@ -14,11 +14,9 @@ import {UsePipes,ValidationPipe,} from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';-import { Repository } from 'typeorm';import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';@@ -57,6 +55,8 @@ import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-moduleimport { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-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';@Controller(`${ApiPath.Rest}/metadata/fields`)@UseGuards(@@ -74,8 +74,8 @@ import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters@UsePipes(new ValidationPipe())export class FieldMetadataController {constructor(- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,private readonly fieldMetadataService: FieldMetadataService,private readonly featureFlagService: FeatureFlagService,private readonly derivedFieldMetadataIdsService: DerivedFieldMetadataIdsService,@@ -151,8 +151,8 @@ export class FieldMetadataController {@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,) {- const field = await this.fieldMetadataRepository.findOne({- where: { id, workspaceId },+ const field = await this.fieldMetadataRepository.findOne(workspaceId, {+ where: { id },});if (!field) {diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.tsindex dd43dc0391d..7559de993be 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts@@ -26,6 +26,7 @@ import { ViewModule } from 'src/engine/metadata-modules/view/view.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { FieldMetadataEntity } from './field-metadata.entity';@@ -57,6 +58,7 @@ import { FieldMetadataEntity } from './field-metadata.entity';FieldMetadataService,FieldMetadataResolver,FieldMetadataToolsFactory,+ provideWorkspaceScopedRepository(FieldMetadataEntity),],exports: [FieldMetadataService, FieldMetadataToolsFactory],})diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.tsindex b3858175c41..6e6ca40bf5d 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts@@ -7,11 +7,9 @@ import {Query,ResolveField,} from '@nestjs/graphql';-import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';-import { Repository } 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';@@ -53,6 +51,8 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overimport { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.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';// Keep @Parent() structurally typed so ResolverValidationPipe does not validate// FieldMetadataDTO date decorators on already-loaded parent records.@@ -73,8 +73,8 @@ export class FieldMetadataResolver {constructor(private readonly fieldMetadataService: FieldMetadataService,private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,private readonly derivedFieldMetadataIdsService: DerivedFieldMetadataIdsService,) {}@@ -136,9 +136,10 @@ export class FieldMetadataResolver {id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<FieldMetadataDTO> {- const fieldMetadata = await this.fieldMetadataRepository.findOne({- where: { id, workspaceId },- });+ const fieldMetadata = await this.fieldMetadataRepository.findOne(+ workspaceId,+ { where: { id } },+ );if (!isDefined(fieldMetadata)) {throw new NotFoundError(diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.tsindex 25aa8563f68..87501395632 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts@@ -1,8 +1,6 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { isDefined } from 'twenty-shared/utils';-import { type FindOneOptions, type Repository } from 'typeorm';import { ApplicationService } from 'src/engine/core-modules/application/application.service';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';@@ -28,12 +26,14 @@ import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/worksimport { EMPTY_ORCHESTRATOR_FAILURE_REPORT } from 'src/engine/workspace-manager/workspace-migration/constant/empty-orchestrator-failure-report.constant';import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';+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 FieldMetadataService {constructor(- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,private readonly applicationService: ApplicationService,@@ -51,9 +51,8 @@ export class FieldMetadataService {objectMetadataId?: string;limit: number;}): Promise<FieldMetadataEntity[]> {- return this.fieldMetadataRepository.find({+ return this.fieldMetadataRepository.find(workspaceId, {where: {- workspaceId,...(isDefined(fieldMetadataId) ? { id: fieldMetadataId } : {}),...(isDefined(objectMetadataId) ? { objectMetadataId } : {}),},@@ -475,19 +474,4 @@ export class FieldMetadataService {},);}-- public async findOneWithinWorkspace(- workspaceId: string,- options: FindOneOptions<FieldMetadataEntity>,- ) {- const [fieldMetadata] = await this.fieldMetadataRepository.find({- ...options,- where: {- ...options.where,- workspaceId,- },- });-- return fieldMetadata;- }}diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.tsindex 3d40ff44bc9..ccf5a99ba8e 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts@@ -14,11 +14,10 @@ import {UsePipes,ValidationPipe,} from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';-import { In, Repository } from 'typeorm';+import { In } from 'typeorm';import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';@@ -59,6 +58,8 @@ import {} from 'src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-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';@Controller(`${ApiPath.Rest}/metadata/objects`)@UseGuards(@@ -76,10 +77,10 @@ import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters@UsePipes(new ValidationPipe())export class ObjectMetadataController {constructor(- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,- @InjectRepository(FieldMetadataEntity)- private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: WorkspaceScopedRepository<FieldMetadataEntity>,private readonly objectMetadataService: ObjectMetadataService,private readonly featureFlagService: FeatureFlagService,private readonly derivedFieldMetadataIdsService: DerivedFieldMetadataIdsService,@@ -131,8 +132,8 @@ export class ObjectMetadataController {@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,) {- const object = await this.objectMetadataRepository.findOne({- where: { id, workspaceId },+ const object = await this.objectMetadataRepository.findOne(workspaceId, {+ where: { id },});if (!object) {@@ -143,8 +144,8 @@ export class ObjectMetadataController {}const [fields, derivedFieldMetadataIds] = await Promise.all([- this.fieldMetadataRepository.find({- where: { objectMetadataId: object.id, workspaceId },+ this.fieldMetadataRepository.find(workspaceId, {+ where: { objectMetadataId: object.id },}),this.derivedFieldMetadataIdsService.getForWorkspace(workspaceId),]);@@ -173,8 +174,8 @@ export class ObjectMetadataController {});const [fields, derivedFieldMetadataIds] = await Promise.all([- this.fieldMetadataRepository.find({- where: { objectMetadataId: flatObject.id, workspaceId },+ this.fieldMetadataRepository.find(workspaceId, {+ where: { objectMetadataId: flatObject.id },}),this.derivedFieldMetadataIdsService.getForWorkspace(workspaceId),]);@@ -244,8 +245,8 @@ export class ObjectMetadataController {});const [fields, derivedFieldMetadataIds] = await Promise.all([- this.fieldMetadataRepository.find({- where: { objectMetadataId: flatObject.id, workspaceId },+ this.fieldMetadataRepository.find(workspaceId, {+ where: { objectMetadataId: flatObject.id },}),this.derivedFieldMetadataIdsService.getForWorkspace(workspaceId),]);@@ -282,8 +283,8 @@ export class ObjectMetadataController {return grouped;}- const fields = await this.fieldMetadataRepository.find({- where: { workspaceId, objectMetadataId: In(objectIds) },+ const fields = await this.fieldMetadataRepository.find(workspaceId, {+ where: { objectMetadataId: In(objectIds) },});for (const field of fields) {diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.tsindex 40c06bcf3eb..47f0b83a7f8 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts@@ -28,6 +28,7 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -61,6 +62,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceObjectRecordCountService,MostlyEmptyFieldsService,ObjectMetadataToolsFactory,+ provideWorkspaceScopedRepository(ObjectMetadataEntity),+ provideWorkspaceScopedRepository(FieldMetadataEntity),],exports: [ObjectMetadataService, ObjectMetadataToolsFactory],})diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.tsindex 1e583ce0d20..d9720f18daf 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts@@ -7,11 +7,9 @@ import {Query,ResolveField,} from '@nestjs/graphql';-import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';-import { Repository } 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';@@ -61,6 +59,8 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overimport { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util';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';@UseGuards(WorkspaceAuthGuard)@MetadataResolver(() => ObjectMetadataDTO)@@ -76,8 +76,8 @@ export class ObjectMetadataResolver {private readonly objectRecordCountService: ObjectRecordCountService,private readonly mostlyEmptyFieldsService: MostlyEmptyFieldsService,private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,) {}@UseGuards(NoPermissionGuard)@@ -134,9 +134,10 @@ export class ObjectMetadataResolver {id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ObjectMetadataDTO> {- const objectMetadata = await this.objectMetadataRepository.findOne({- where: { id, workspaceId },- });+ const objectMetadata = await this.objectMetadataRepository.findOne(+ workspaceId,+ { where: { id } },+ );if (!isDefined(objectMetadata)) {throw new NotFoundError(diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.tsindex 7791d1fba97..807673bacfc 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts@@ -1,8 +1,7 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { fromArrayToUniqueKeyRecord, isDefined } from 'twenty-shared/utils';-import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';+import { FindManyOptions, FindOneOptions } from 'typeorm';import { v4 } from 'uuid';import { ApplicationService } from 'src/engine/core-modules/application/application.service';@@ -34,6 +33,8 @@ import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-managerimport { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-object-metadata.type';+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';const MAX_OBJECTS_PER_BATCH_UPDATE = 100;@@ -46,8 +47,8 @@ const NON_BATCHABLE_UPDATE_PROPERTIES = [@Injectable()export class ObjectMetadataService {constructor(- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,private readonly workspaceCacheService: WorkspaceCacheService,@@ -662,17 +663,13 @@ export class ObjectMetadataService {workspaceId: string,options: FindOneOptions<ObjectMetadataEntity>,): Promise<ObjectMetadataEntity | null> {- return this.objectMetadataRepository.findOne({+ return this.objectMetadataRepository.findOne(workspaceId, {relations: ['fields','indexMetadatas','indexMetadatas.indexFieldMetadatas',],...options,- where: {- ...options.where,- workspaceId,- },});}@@ -680,24 +677,16 @@ export class ObjectMetadataService {workspaceId: string,options?: FindManyOptions<ObjectMetadataEntity>,): Promise<FlatObjectMetadata[]> {- const whereWithWorkspaceId = Array.isArray(options?.where)- ? options.where.map((whereCondition) => ({- ...whereCondition,- workspaceId,- }))- : {- ...options?.where,- workspaceId,- };-- const objectMetadataEntities = await this.objectMetadataRepository.find({- ...options,- where: whereWithWorkspaceId,- order: {- ...options?.order,+ const objectMetadataEntities = await this.objectMetadataRepository.find(+ workspaceId,+ {+ ...options,+ order: {+ ...options?.order,+ },+ select: { id: true },},- select: { id: true },- });+ );const objectMetadataIds = objectMetadataEntities.map((objectMetadata) => objectMetadata.id,diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.tsindex d4e6e846343..8b2ae20750f 100644--- a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts@@ -312,6 +312,17 @@ export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {return this.repository.createQueryBuilder(alias);}+ createScopedQueryBuilder(+ workspaceId: string,+ alias: string,+ ): SelectQueryBuilder<T> {+ this.assertWorkspaceId(workspaceId);++ return this.repository+ .createQueryBuilder(alias)+ .where(`${alias}.workspaceId = :workspaceId`, { workspaceId });+ }+withManager(manager: EntityManager): WorkspaceScopedRepository<T> {return new WorkspaceScopedRepository<T>(manager.getRepository(this.repository.target),diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.tsindex 43b8b8b909f..dd020760a83 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts@@ -1,9 +1,9 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';+import { InjectDataSource } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { WorkspaceActivationStatus } from 'twenty-shared/workspace';-import { DataSource, Repository } from 'typeorm';+import { DataSource } from 'typeorm';import { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -37,8 +37,8 @@ export class DevSeederPermissionsService {private readonly roleService: RoleService,private readonly userRoleService: UserRoleService,private readonly objectPermissionService: ObjectPermissionService,- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,@InjectWorkspaceScopedRepository(RoleEntity)private readonly roleRepository: WorkspaceScopedRepository<RoleEntity>,private readonly fieldPermissionService: FieldPermissionService,@@ -262,39 +262,26 @@ export class DevSeederPermissionsService {});const petObjectMetadata = await this.objectMetadataRepository.findOneOrFail(- {- where: {- nameSingular: 'pet',- workspaceId,- },- },+ workspaceId,+ { where: { nameSingular: 'pet' } },);const rocketObjectMetadata =- await this.objectMetadataRepository.findOneOrFail({- where: {- nameSingular: 'rocket',- workspaceId,- },+ await this.objectMetadataRepository.findOneOrFail(workspaceId, {+ where: { nameSingular: 'rocket' },});const personObjectMetadata =- await this.objectMetadataRepository.findOneOrFail({- where: {- nameSingular: 'person',- workspaceId,- },+ await this.objectMetadataRepository.findOneOrFail(workspaceId, {+ where: { nameSingular: 'person' },relations: {fields: true,},});const companyObjectMetadata =- await this.objectMetadataRepository.findOneOrFail({- where: {- nameSingular: 'company',- workspaceId,- },+ await this.objectMetadataRepository.findOneOrFail(workspaceId, {+ where: { nameSingular: 'company' },relations: {fields: true,},diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.tsindex b4afa1d0f1a..2142f9f3aef 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts@@ -73,6 +73,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceDevSeederDataService,TimelineActivitySeederService,provideWorkspaceScopedRepository(RoleEntity),+ provideWorkspaceScopedRepository(ObjectMetadataEntity),],})export class DevSeederModule {}diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.tsindex 92e46f901b9..f2c89349b62 100644--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step-operations.workspace-service.ts@@ -1,5 +1,4 @@import { Injectable } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID } from 'twenty-shared/ai';import { inputSchemaToOutputSchema } from 'twenty-shared/logic-function';@@ -15,7 +14,6 @@ import {getFunctionInputFromInputSchema,type StepIfElseBranch,} from 'twenty-shared/workflow';-import { Repository } from 'typeorm';import { v4 } from 'uuid';import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';@@ -78,8 +76,8 @@ export class WorkflowVersionStepOperationsWorkspaceService {private readonly agentService: AgentService,@InjectWorkspaceScopedRepository(RoleTargetEntity)private readonly roleTargetRepository: WorkspaceScopedRepository<RoleTargetEntity>,- @InjectRepository(ObjectMetadataEntity)- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,+ @InjectWorkspaceScopedRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,private readonly aiAgentRoleService: AiAgentRoleService,private readonly workspaceCacheService: WorkspaceCacheService,@@ -148,6 +146,12 @@ export class WorkflowVersionStepOperationsWorkspaceService {}}+ private async findFirstActiveObjectMetadata(workspaceId: string) {+ return this.objectMetadataRepository.findOne(workspaceId, {+ where: { isActive: true, isSystem: false },+ });+ }+async runStepCreationSideEffectsAndBuildStep({type,workspaceId,@@ -374,9 +378,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.CREATE_RECORD: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {@@ -395,9 +397,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.UPDATE_RECORD: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {@@ -418,9 +418,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.DELETE_RECORD: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {@@ -439,9 +437,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.UPSERT_RECORD: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {@@ -461,9 +457,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.FIND_RECORDS: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {@@ -483,9 +477,7 @@ export class WorkflowVersionStepOperationsWorkspaceService {}case WorkflowActionType.PICK_RECORD: {const activeObjectMetadataItem =- await this.objectMetadataRepository.findOne({- where: { workspaceId, isActive: true, isSystem: false },- });+ await this.findFirstActiveObjectMetadata(workspaceId);return {builtStep: {diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.tsindex a3115d69d3b..4f4fb2c04af 100644--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts@@ -46,6 +46,7 @@ import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workflWorkflowVersionStepUpdateWorkspaceService,WorkflowVersionStepDeletionWorkspaceService,provideWorkspaceScopedRepository(RoleTargetEntity),+ provideWorkspaceScopedRepository(ObjectMetadataEntity),],exports: [WorkflowVersionStepWorkspaceService,