Move id column check before foreign table creation (twentyhq#5029)

When distant table does not have an id column, syncing does not work. Today the check is only made after creating the foreign table locally. We should do it first, so we avoid having a foreign table created and failing right after. Co-authored-by: Thomas Trompette <thomast@twenty.com>
c973447852 · Apr 18, 2024 · b08e954 · b08e954
1 parent bc5cfd0
commit b08e954
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/...nty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts b/...nty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
@@ -151,6 +151,15 @@ export class RemoteTableService {
       input.schema,
     );
 
+    // We only support remote tables with an id column for now.
+    const remoteTableIdColumn = remoteTableColumns.find(
+      (column) => column.columnName === 'id',
+    );
+
+    if (!remoteTableIdColumn) {
+      throw new BadRequestException('Remote table must have an id column');
+    }
+
     await this.createForeignTable(
       workspaceId,
       localTableName,
@@ -163,6 +172,7 @@ export class RemoteTableService {
       workspaceId,
       localTableName,
       remoteTableColumns,
+      remoteTableIdColumn,
       dataSourceMetatada.id,
     );
 
@@ -406,17 +416,9 @@ export class RemoteTableService {
     workspaceId: string,
     localTableName: string,
     remoteTableColumns: RemoteTableColumn[],
+    remoteTableIdColumn: RemoteTableColumn,
     dataSourceMetadataId: string,
   ) {
-    // We only support remote tables with an id column for now.
-    const remoteTableIdColumn = remoteTableColumns.filter(
-      (column) => column.columnName === 'id',
-    )?.[0];
-
-    if (!remoteTableIdColumn) {
-      throw new BadRequestException('Remote table must have an id column');
-    }
-
     const objectMetadata = await this.objectMetadataService.createOne({
       nameSingular: localTableName,
       namePlural: plural(localTableName),