Skip to content

The open alternative to Salesforce, designed for AI.

Rename the legacy schema service and fold the v2 ORM module (#24761)

Charles Bochet29868e209612
diff --git a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
index 4939437da9f..fb58808e8ce 100644
--- a/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
+++ b/packages/twenty-server/src/engine/api/common/core-common-api.module.ts
@@ -24,7 +24,6 @@ import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.
import { ViewFilterGroupModule } from 'src/engine/metadata-modules/view-filter-group/view-filter-group.module';
import { ViewFilterModule } from 'src/engine/metadata-modules/view-filter/view-filter.module';
import { ViewModule } from 'src/engine/metadata-modules/view/view.module';
-import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
@@ -46,7 +45,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
FeatureFlagModule,
WorkspaceCacheModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
- TwentyORMV2Module,
],
providers: [
ProcessNestedRelationsHelper,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts
index 1c333dd62db..3369d236890 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';
-import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';
import { ProcessAggregateHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper';
import { WorkspaceQueryHookModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module';
import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';
@@ -16,7 +15,6 @@ import { ViewModule } from 'src/engine/metadata-modules/view/view.module';
@Module({
imports: [
- TwentyORMV2Module,
WorkspaceQueryHookModule,
WorkspaceQueryRunnerModule,
PermissionsModule,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index 39edc578653..bb1ff860a0f 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -78,7 +78,7 @@ import {
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
-import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceSchemaService } from 'src/engine/workspace-datasource/workspace-schema.service';
import { PrefillLogicFunctionService } from 'src/engine/workspace-manager/standard-objects-prefill-data/services/prefill-logic-function.service';
import { prefillCompanies } from 'src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-companies.util';
import { prefillDashboards } from 'src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-dashboards.util';
@@ -154,7 +154,7 @@ export class WorkspaceService {
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
private readonly subdomainManagerService: SubdomainManagerService,
- private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+ private readonly workspaceSchemaService: WorkspaceSchemaService,
private readonly customDomainManagerService: CustomDomainManagerService,
private readonly fileCorePictureService: FileCorePictureService,
private readonly aiModelRegistryService: AiModelRegistryService,
@@ -632,7 +632,7 @@ export class WorkspaceService {
await this.deleteWorkspaceSyncableMetadataEntities(workspace);
- await this.workspaceDataSourceService.deleteWorkspaceDBSchema(
+ await this.workspaceSchemaService.deleteWorkspaceDBSchema(
workspace.id,
);
diff --git a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
index 5dc989c7071..45b45ada479 100644
--- a/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
+++ b/packages/twenty-server/src/engine/subscriptions/subscriptions.module.ts
@@ -2,7 +2,6 @@ import { Global, Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';
-import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';
import { CommonSelectFieldsHelper } from 'src/engine/api/common/common-select-fields/common-select-fields-helper';
import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-storage.module';
@@ -27,7 +26,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
@Global()
@Module({
imports: [
- TwentyORMV2Module,
RedisClientModule,
CacheStorageModule,
CacheLockModule,
diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/twenty-orm-v2.module.ts b/packages/twenty-server/src/engine/twenty-orm-v2/twenty-orm-v2.module.ts
deleted file mode 100644
index 0ccd223842c..00000000000
--- a/packages/twenty-server/src/engine/twenty-orm-v2/twenty-orm-v2.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
-import { WorkspaceDataSourceV2Service } from 'src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service';
-import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
-
-@Module({
- imports: [TwentyConfigModule, WorkspaceEventEmitterModule, TypeORMModule],
- providers: [WorkspaceDataSourceV2Service],
- exports: [WorkspaceDataSourceV2Service],
-})
-export class TwentyORMV2Module {}
diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts
index c343893463b..2089151120e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module.ts
@@ -13,7 +13,7 @@ import { WorkspaceFeatureFlagsMapCacheModule } from 'src/engine/metadata-modules
import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
import { WorkspaceORMEntityMetadatasCacheService } from 'src/engine/twenty-orm/global-workspace-datasource/workspace-orm-entity-metadatas-cache.service';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
-import { TwentyORMV2Module } from 'src/engine/twenty-orm-v2/twenty-orm-v2.module';
+import { WorkspaceDataSourceV2Service } from 'src/engine/twenty-orm-v2/datasource/workspace-data-source-v2.service';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
@@ -35,13 +35,13 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/
TwentyConfigModule,
WorkspaceEventEmitterModule,
WorkspaceCacheModule,
- TwentyORMV2Module,
],
providers: [
GlobalWorkspaceOrmManager,
+ WorkspaceDataSourceV2Service,
WorkspaceORMEntityMetadatasCacheService,
provideWorkspaceScopedRepository(FeatureFlagEntity),
],
- exports: [GlobalWorkspaceOrmManager],
+ exports: [GlobalWorkspaceOrmManager, WorkspaceDataSourceV2Service],
})
export class GlobalWorkspaceDataSourceModule {}
diff --git a/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
index 9df09d71729..a1f1e55fc0e 100644
--- a/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
+++ b/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.module.ts
@@ -4,11 +4,11 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { WorkspaceDataSourceService } from './workspace-datasource.service';
+import { WorkspaceSchemaService } from './workspace-schema.service';
@Module({
imports: [TypeOrmModule.forFeature([WorkspaceEntity]), TypeORMModule],
- exports: [WorkspaceDataSourceService],
- providers: [WorkspaceDataSourceService],
+ exports: [WorkspaceSchemaService],
+ providers: [WorkspaceSchemaService],
})
export class WorkspaceDataSourceModule {}
diff --git a/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts b/packages/twenty-server/src/engine/workspace-datasource/workspace-schema.service.ts
similarity index 98%
rename from packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts
rename to packages/twenty-server/src/engine/workspace-datasource/workspace-schema.service.ts
index 601042d9723..01c6869dca3 100644
--- a/packages/twenty-server/src/engine/workspace-datasource/workspace-datasource.service.ts
+++ b/packages/twenty-server/src/engine/workspace-datasource/workspace-schema.service.ts
@@ -17,7 +17,7 @@ import {
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
@Injectable()
-export class WorkspaceDataSourceService {
+export class WorkspaceSchemaService {
constructor(
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
index 3c7fc74ed00..1c6ff30df5a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
@@ -18,7 +18,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceSchemaService } from 'src/engine/workspace-datasource/workspace-schema.service';
import { seedBillingCustomers } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-customers.util';
import { seedBillingSubscriptions } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-subscriptions.util';
import {
@@ -53,7 +53,7 @@ export class DevSeederService {
constructor(
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
private readonly twentyConfigService: TwentyConfigService,
- private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+ private readonly workspaceSchemaService: WorkspaceSchemaService,
private readonly twentyStandardApplicationService: TwentyStandardApplicationService,
private readonly devSeederMetadataService: DevSeederMetadataService,
private readonly devSeederPermissionsService: DevSeederPermissionsService,
@@ -99,9 +99,7 @@ export class DevSeederService {
await this.applicationRegistrationService.createCliRegistrationIfNotExists();
const schemaName =
- await this.workspaceDataSourceService.createWorkspaceDBSchema(
- workspaceId,
- );
+ await this.workspaceSchemaService.createWorkspaceDBSchema(workspaceId);
const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(
workspaceId,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
index 8df71cfcdce..6a8bc631f1d 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
@@ -13,7 +13,7 @@ import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role
import { MEMBER_ROLE_LABEL } from 'src/engine/metadata-modules/permissions/constants/member-role-label.constants';
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 { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceSchemaService } from 'src/engine/workspace-datasource/workspace-schema.service';
import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';
import { TwentyStandardApplicationService } from 'src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service';
@@ -22,7 +22,7 @@ export class WorkspaceManagerService {
private readonly logger = new Logger(WorkspaceManagerService.name);
constructor(
- private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+ private readonly workspaceSchemaService: WorkspaceSchemaService,
@InjectRepository(UserWorkspaceEntity)
private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
private readonly roleService: RoleService,
@@ -45,9 +45,7 @@ export class WorkspaceManagerService {
const workspaceId = workspace.id;
const schemaCreationStart = performance.now();
const schemaName =
- await this.workspaceDataSourceService.createWorkspaceDBSchema(
- workspaceId,
- );
+ await this.workspaceSchemaService.createWorkspaceDBSchema(workspaceId);
const schemaCreationEnd = performance.now();