simplify connect config type

Author: etiennejouan

packages/twenty-server/src/engine/twenty-orm/relation-nested-queries/relation-nested-queries.ts

@@ -35,7 +35,10 @@ export class RelationNestedQueries {
       | QueryDeepPartialEntityWithNestedRelationFields<Entity>[]
       | QueryDeepPartialEntityWithNestedRelationFields<Entity>,
     target: EntityTarget<Entity>,
-  ) {
+  ): [
+    RelationConnectQueryConfig[],
+    RelationDisconnectQueryFieldsByEntityIndex,
+  ] {
     const entitiesArray = Array.isArray(entities) ? entities : [entities];
 
     const {
@@ -49,10 +52,7 @@ export class RelationNestedQueries {
       relationConnectQueryFieldsByEntityIndex,
     );
 
-    return {
-      disconnectConfig: relationDisconnectQueryFieldsByEntityIndex,
-      connectConfig,
-    };
+    return [connectConfig, relationDisconnectQueryFieldsByEntityIndex];
   }
 
   private prepareRelationConnect<Entity extends ObjectLiteral>(
@@ -79,19 +79,25 @@ export class RelationNestedQueries {
 
   async processRelationNestedQueries<Entity extends ObjectLiteral>({
     entities,
-    relationDisconnectQueryFieldsByEntityIndex,
-    relationConnectQueryConfigs,
+    relationNestedConfig,
     queryBuilder,
   }: {
     entities:
       | QueryDeepPartialEntityWithNestedRelationFields<Entity>[]
       | QueryDeepPartialEntityWithNestedRelationFields<Entity>;
-    relationDisconnectQueryFieldsByEntityIndex: RelationDisconnectQueryFieldsByEntityIndex;
-    relationConnectQueryConfigs: Record<string, RelationConnectQueryConfig>;
+    relationNestedConfig: [
+      RelationConnectQueryConfig[],
+      RelationDisconnectQueryFieldsByEntityIndex,
+    ];
     queryBuilder: WorkspaceSelectQueryBuilder<Entity>;
   }): Promise<QueryDeepPartialEntity<Entity>[]> {
     const entitiesArray = Array.isArray(entities) ? entities : [entities];
 
+    const [
+      relationConnectQueryConfigs,
+      relationDisconnectQueryFieldsByEntityIndex,
+    ] = relationNestedConfig;
+
     const updatedEntitiesWithDisconnect = this.processRelationDisconnect({
       entities: entitiesArray,
       relationDisconnectQueryFieldsByEntityIndex,
@@ -112,7 +118,7 @@ export class RelationNestedQueries {
     queryBuilder,
   }: {
     entities: QueryDeepPartialEntityWithNestedRelationFields<Entity>[];
-    relationConnectQueryConfigs: Record<string, RelationConnectQueryConfig>;
+    relationConnectQueryConfigs: RelationConnectQueryConfig[];
     queryBuilder: WorkspaceSelectQueryBuilder<Entity>;
   }): Promise<QueryDeepPartialEntity<Entity>[]> {
     if (!isDefined(relationConnectQueryConfigs)) return entities;
@@ -131,17 +137,15 @@ export class RelationNestedQueries {
   }
 
   private async executeConnectQueries<Entity extends ObjectLiteral>(
-    relationConnectQueryConfigs: Record<string, RelationConnectQueryConfig>,
+    relationConnectQueryConfigs: RelationConnectQueryConfig[],
     queryBuilder: WorkspaceSelectQueryBuilder<Entity>,
   ): Promise<[RelationConnectQueryConfig, Record<string, unknown>[]][]> {
     const AllRecordsToConnectWithConfig: [
       RelationConnectQueryConfig,
       Record<string, unknown>[],
     ][] = [];
 
-    for (const connectQueryConfig of Object.values(
-      relationConnectQueryConfigs,
-    )) {
+    for (const connectQueryConfig of relationConnectQueryConfigs) {
       const { clause, parameters } = createSqlWhereTupleInClause(
         connectQueryConfig.recordToConnectConditions,
         connectQueryConfig.targetObjectName,

packages/twenty-server/src/engine/twenty-orm/repository/workspace-insert-query-builder.ts

@@ -35,8 +35,10 @@ export class WorkspaceInsertQueryBuilder<
   private internalContext: WorkspaceInternalContext;
   private authContext?: AuthContext;
   private relationNestedQueries: RelationNestedQueries;
-  private connectConfig: Record<string, RelationConnectQueryConfig>;
-  private disconnectConfig: RelationDisconnectQueryFieldsByEntityIndex;
+  private relationNestedConfig: [
+    RelationConnectQueryConfig[],
+    RelationDisconnectQueryFieldsByEntityIndex,
+  ];
 
   constructor(
     queryBuilder: InsertQueryBuilder<T>,
@@ -74,15 +76,12 @@ export class WorkspaceInsertQueryBuilder<
   ): this {
     const mainAliasTarget = this.getMainAliasTarget();
 
-    const { disconnectConfig, connectConfig } =
+    this.relationNestedConfig =
       this.relationNestedQueries.prepareNestedRelationQueries(
         values,
         mainAliasTarget,
       );
 
-    this.disconnectConfig = disconnectConfig;
-    this.connectConfig = connectConfig;
-
     const objectMetadata = getObjectMetadataFromEntityTarget(
       mainAliasTarget,
       this.internalContext,
@@ -121,8 +120,7 @@ export class WorkspaceInsertQueryBuilder<
         entities: this.expressionMap.valuesSet as
           | QueryDeepPartialEntityWithNestedRelationFields<T>
           | QueryDeepPartialEntityWithNestedRelationFields<T>[],
-        relationDisconnectQueryFieldsByEntityIndex: this.disconnectConfig,
-        relationConnectQueryConfigs: this.connectConfig,
+        relationNestedConfig: this.relationNestedConfig,
         queryBuilder,
       });
 

packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts

@@ -35,8 +35,10 @@ export class WorkspaceUpdateQueryBuilder<
   private internalContext: WorkspaceInternalContext;
   private authContext?: AuthContext;
   private relationNestedQueries: RelationNestedQueries;
-  private connectConfig: Record<string, RelationConnectQueryConfig>;
-  private disconnectConfig: RelationDisconnectQueryFieldsByEntityIndex;
+  private relationNestedConfig: [
+    Record<string, RelationConnectQueryConfig>,
+    RelationDisconnectQueryFieldsByEntityIndex,
+  ];
 
   constructor(
     queryBuilder: UpdateQueryBuilder<T>,
@@ -109,8 +111,7 @@ export class WorkspaceUpdateQueryBuilder<
         entities: this.expressionMap.valuesSet as
           | QueryDeepPartialEntityWithNestedRelationFields<T>
           | QueryDeepPartialEntityWithNestedRelationFields<T>[],
-        relationDisconnectQueryFieldsByEntityIndex: this.disconnectConfig,
-        relationConnectQueryConfigs: this.connectConfig,
+        relationNestedConfig: this.relationNestedConfig,
         queryBuilder: nestedRelationQueryBuilder,
       });
 
@@ -174,15 +175,13 @@ export class WorkspaceUpdateQueryBuilder<
     const extendedValues = _values as
       | QueryDeepPartialEntityWithNestedRelationFields<T>
       | QueryDeepPartialEntityWithNestedRelationFields<T>[];
-    const { disconnectConfig, connectConfig } =
+
+    this.relationNestedConfig =
       this.relationNestedQueries.prepareNestedRelationQueries(
         extendedValues,
         mainAliasTarget,
       );
 
-    this.disconnectConfig = disconnectConfig;
-    this.connectConfig = connectConfig;
-
     const formattedUpdateSet = formatData(_values, objectMetadata);
 
     return super.set(formattedUpdateSet as QueryDeepPartialEntity<T>);

packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-relation-connect-query-configs.util.spec.ts

@@ -163,7 +163,7 @@ describe('computeRelationConnectQueryConfigs', () => {
       {},
     );
 
-    expect(result).toEqual({});
+    expect(result).toEqual([]);
   });
 
   it('should throw an error if a connect field is not a relation field', () => {
@@ -378,8 +378,8 @@ describe('computeRelationConnectQueryConfigs', () => {
       relationConnectQueryFieldsByEntityIndex,
     );
 
-    expect(result).toEqual({
-      'company-related-to-1': {
+    expect(result).toEqual([
+      {
         connectFieldName: 'company-related-to-1',
         recordToConnectConditions: [
           [['domainNamePrimaryLinkUrl', 'company.com']],
@@ -400,7 +400,7 @@ describe('computeRelationConnectQueryConfigs', () => {
           },
         ],
       },
-      'company-related-to-2': {
+      {
         connectFieldName: 'company-related-to-2',
         recordToConnectConditions: [[['id', '1']], [['id', '2']]],
         recordToConnectConditionByEntityIndex: {
@@ -418,6 +418,6 @@ describe('computeRelationConnectQueryConfigs', () => {
           },
         ],
       },
-    });
+    ]);
   });
 });

packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts

@@ -79,7 +79,7 @@ export const computeRelationConnectQueryConfigs = (
     }
   }
 
-  return allConnectQueryConfigs;
+  return Object.values(allConnectQueryConfigs);
 };
 
 const updateConnectQueryConfigs = (