Feat/new relation drop foreign key

packages/twenty-server/src/database/commands/upgrade-version/0-43/0-43-migrate-relations-to-field-metadata.command.ts

@@ -19,7 +19,7 @@ import {
   RelationDirection,
   deduceRelationDirection,
 } from 'src/engine/utils/deduce-relation-direction.util';
-import { isFieldMetadataOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
+import { isFieldMetadataEntityOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
 
 @MigrationCommand({
   name: 'migrate-relations-to-field-metadata',
@@ -89,13 +89,16 @@ export class MigrateRelationsToFieldMetadataCommand extends ActiveWorkspacesMigr
 
       const joinColumnFieldMetadataCollection = fieldMetadataCollection.filter(
         (fieldMetadata) =>
-          isFieldMetadataOfType(fieldMetadata, FieldMetadataType.UUID),
+          isFieldMetadataEntityOfType(fieldMetadata, FieldMetadataType.UUID),
         // TODO: Fix this, it's working in other places but not here
       ) as FieldMetadataEntity<FieldMetadataType.UUID>[];
 
       const fieldMetadataToUpdateCollection = fieldMetadataCollection
         .filter((fieldMetadata) =>
-          isFieldMetadataOfType(fieldMetadata, FieldMetadataType.RELATION),
+          isFieldMetadataEntityOfType(
+            fieldMetadata,
+            FieldMetadataType.RELATION,
+          ),
         )
         .map((fieldMetadata) =>
           this.updateRelationFieldMetadata(

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-nested-relations-v2.helper.ts

@@ -23,7 +23,7 @@ import { ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/typ
 import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
 import { getObjectMetadataMapItemByNameSingular } from 'src/engine/metadata-modules/utils/get-object-metadata-map-item-by-name-singular.util';
 import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
-import { isFieldMetadataOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
+import { isFieldMetadataInterfaceOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
 
 @Injectable()
 export class ProcessNestedRelationsV2Helper {
@@ -98,7 +98,10 @@ export class ProcessNestedRelationsV2Helper {
       parentObjectMetadataItem.fieldsByName[sourceFieldName];
 
     if (
-      !isFieldMetadataOfType(sourceFieldMetadata, FieldMetadataType.RELATION)
+      !isFieldMetadataInterfaceOfType(
+        sourceFieldMetadata,
+        FieldMetadataType.RELATION,
+      )
     ) {
       // TODO: Maybe we should throw an error here ?
       return;

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/query-result-getters.factory.ts

@@ -21,7 +21,7 @@ import { CompositeInputTypeDefinitionFactory } from 'src/engine/api/graphql/work
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { FileService } from 'src/engine/core-modules/file/services/file.service';
 import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
-import { isFieldMetadataOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
+import { isFieldMetadataInterfaceOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
 
 // TODO: find a way to prevent conflict between handlers executing logic on object relations
 // And this factory that is also executing logic on object relations
@@ -152,7 +152,10 @@ export class QueryResultGettersFactory {
       )
       .filter(isDefined)
       .filter((fieldMetadata) =>
-        isFieldMetadataOfType(fieldMetadata, FieldMetadataType.RELATION),
+        isFieldMetadataInterfaceOfType(
+          fieldMetadata,
+          FieldMetadataType.RELATION,
+        ),
       );
 
     const relationFieldsProcessedMap = {} as Record<

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/extend-object-type-definition-v2.factory.ts

@@ -15,7 +15,7 @@ import { RelationTypeV2Factory } from 'src/engine/api/graphql/workspace-schema-b
 import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
 import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
 import { objectContainsRelationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field';
-import { isFieldMetadataOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
+import { isFieldMetadataInterfaceOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
 
 import { ArgsFactory } from './args.factory';
 
@@ -108,7 +108,12 @@ export class ExtendObjectTypeDefinitionV2Factory {
 
     for (const fieldMetadata of objectMetadata.fields) {
       // Ignore non-relation fields as they are already defined
-      if (!isFieldMetadataOfType(fieldMetadata, FieldMetadataType.RELATION)) {
+      if (
+        !isFieldMetadataInterfaceOfType(
+          fieldMetadata,
+          FieldMetadataType.RELATION,
+        )
+      ) {
         continue;
       }
 

packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts

@@ -9,6 +9,8 @@ import { v4 as uuidV4 } from 'uuid';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { IndexMetadataService } from 'src/engine/metadata-modules/index-metadata/index-metadata.service';
@@ -55,6 +57,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
     private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly indexMetadataService: IndexMetadataService,
     private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
+    private readonly featureFlagService: FeatureFlagService,
   ) {
     super(relationMetadataRepository);
   }
@@ -66,6 +69,11 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
       relationMetadataInput,
     );
 
+    const isNewRelationEnabled = await this.featureFlagService.isFeatureEnabled(
+      FeatureFlagKey.IsNewRelationEnabled,
+      relationMetadataInput.workspaceId,
+    );
+
     try {
       validateMetadataNameValidityOrThrow(relationMetadataInput.fromName);
       validateMetadataNameValidityOrThrow(relationMetadataInput.toName);
@@ -93,21 +101,31 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
     const toId = uuidV4();
 
     const createdRelationFieldsMetadata =
-      await this.fieldMetadataRepository.save([
-        this.createFieldMetadataForRelationMetadata(
-          relationMetadataInput,
-          'from',
-          isCustom,
-          fromId,
-        ),
-        this.createFieldMetadataForRelationMetadata(
-          relationMetadataInput,
-          'to',
-          isCustom,
-          toId,
-        ),
-        this.createForeignKeyFieldMetadata(relationMetadataInput, columnName),
-      ]);
+      await this.fieldMetadataRepository.save(
+        [
+          this.createFieldMetadataForRelationMetadata(
+            relationMetadataInput,
+            'from',
+            isCustom,
+            fromId,
+          ),
+          this.createFieldMetadataForRelationMetadata(
+            relationMetadataInput,
+            'to',
+            isCustom,
+            toId,
+          ),
+          // We don't want to create the join column field metadata for new relation
+          ...(isNewRelationEnabled
+            ? []
+            : [
+                this.createForeignKeyFieldMetadata(
+                  relationMetadataInput,
+                  columnName,
+                ),
+              ]),
+        ].flat(),
+      );
 
     const createdRelationMetadata = await super.createOne({
       ...relationMetadataInput,

packages/twenty-server/src/engine/utils/is-field-metadata-of-type.util.ts

@@ -4,25 +4,22 @@ import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metada
 
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
-export function isFieldMetadataOfType<
+export function isFieldMetadataInterfaceOfType<
   Field extends FieldMetadataInterface<FieldMetadataType>,
   Type extends FieldMetadataType,
 >(
   fieldMetadata: Field,
   type: Type,
-): fieldMetadata is Field & FieldMetadataInterface<Type>;
-export function isFieldMetadataOfType<
+): fieldMetadata is Field & FieldMetadataInterface<Type> {
+  return fieldMetadata.type === type;
+}
+
+export function isFieldMetadataEntityOfType<
   Field extends FieldMetadataEntity<FieldMetadataType>,
   Type extends FieldMetadataType,
 >(
   fieldMetadata: Field,
   type: Type,
-): fieldMetadata is Field & FieldMetadataEntity<Type>;
-export function isFieldMetadataOfType<
-  Field extends
-    | FieldMetadataInterface<FieldMetadataType>
-    | FieldMetadataEntity<FieldMetadataType>,
-  Type extends FieldMetadataType,
->(fieldMetadata: Field, type: Type): boolean {
+): fieldMetadata is Field & FieldMetadataEntity<Type> {
   return fieldMetadata.type === type;
 }

packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts

@@ -84,9 +84,13 @@ export class WorkspaceManagerService {
         schemaName,
       );
 
+    const featureFlags =
+      await this.featureFlagService.getWorkspaceFeatureFlagsMap(workspaceId);
+
     await this.workspaceSyncMetadataService.synchronize({
       workspaceId,
       dataSourceId: dataSourceMetadata.id,
+      featureFlags,
     });
 
     const dataSourceMetadataCreationEnd = performance.now();
@@ -140,9 +144,13 @@ export class WorkspaceManagerService {
         schemaName,
       );
 
+    const featureFlags =
+      await this.featureFlagService.getWorkspaceFeatureFlagsMap(workspaceId);
+
     await this.workspaceSyncMetadataService.synchronize({
       workspaceId,
       dataSourceId: dataSourceMetadata.id,
+      featureFlags,
     });
 
     await this.prefillWorkspaceWithDemoObjects(dataSourceMetadata, workspaceId);
@@ -160,9 +168,13 @@ export class WorkspaceManagerService {
         schemaName,
       );
 
+    const featureFlags =
+      await this.featureFlagService.getWorkspaceFeatureFlagsMap(workspaceId);
+
     await this.workspaceSyncMetadataService.synchronize({
       workspaceId: workspaceId,
       dataSourceId: dataSourceMetadata.id,
+      featureFlags,
     });
 
     const permissionsEnabled =

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts

@@ -7,6 +7,7 @@ import {
   ActiveWorkspacesMigrationCommandOptions,
   ActiveWorkspacesMigrationCommandRunner,
 } from 'src/database/commands/migration-command/active-workspaces-migration-command.runner';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
@@ -32,6 +33,7 @@ export class SyncWorkspaceMetadataCommand extends ActiveWorkspacesMigrationComma
     private readonly workspaceHealthService: WorkspaceHealthService,
     private readonly dataSourceService: DataSourceService,
     private readonly syncWorkspaceLoggerService: SyncWorkspaceLoggerService,
+    private readonly featureFlagService: FeatureFlagService,
     protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {
     super(workspaceRepository, twentyORMGlobalManager);
@@ -98,11 +100,17 @@ export class SyncWorkspaceMetadataCommand extends ActiveWorkspacesMigrationComma
             workspaceId,
           );
 
+        const featureFlags =
+          await this.featureFlagService.getWorkspaceFeatureFlagsMap(
+            workspaceId,
+          );
+
         const { storage, workspaceMigrations } =
           await this.workspaceSyncMetadataService.synchronize(
             {
               workspaceId,
               dataSourceId: dataSourceMetadata.id,
+              featureFlags,
             },
             { applyChanges: !options.dryRun },
           );