Rename unsync functions

twentyhq · Apr 17, 2024 · 2971e62 · 2971e62
1 parent 08e8d89
commit 2971e62
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.entity.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.entity.ts
@@ -1,5 +1,3 @@
-import { ObjectType } from '@nestjs/graphql';
-
 import {
   Column,
   CreateDateColumn,
@@ -34,7 +32,6 @@ export type UserMappingOptions = {
 };
 
 @Entity('remoteServer')
-@ObjectType('RemoteServer')
 export class RemoteServerEntity<T extends RemoteServerType> {
   @PrimaryGeneratedColumn('uuid')
   id: string;

diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts
@@ -116,10 +116,7 @@ export class RemoteServerService<T extends RemoteServerType> {
       throw new NotFoundException('Remote server does not exist');
     }
 
-    await this.remoteTableService.unsyncByServerInput(
-      workspaceId,
-      remoteServer,
-    );
+    await this.remoteTableService.unsyncAll(workspaceId, remoteServer);
 
     return this.metadataDataSource.transaction(
       async (entityManager: EntityManager) => {

diff --git a/...enty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.entity.ts b/...enty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.entity.ts
@@ -1,5 +1,3 @@
-import { ObjectType } from '@nestjs/graphql';
-
 import {
   Entity,
   PrimaryGeneratedColumn,
@@ -17,7 +15,6 @@ import {
 } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
 
 @Entity('remoteTable')
-@ObjectType('RemoteTable')
 export class RemoteTableEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;

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
@@ -95,6 +95,12 @@ export class RemoteTableService {
   }
 
   public async syncRemoteTable(input: RemoteTableInput, workspaceId: string) {
+    if (!input.schema) {
+      throw new BadRequestException(
+        'Schema is required for syncing remote table',
+      );
+    }
+
     const remoteServer = await this.remoteServerRepository.findOne({
       where: {
         id: input.remoteServerId,
@@ -106,12 +112,6 @@ export class RemoteTableService {
       throw new NotFoundException('Remote server does not exist');
     }
 
-    if (!input.schema) {
-      throw new BadRequestException(
-        'Schema is required for syncing remote table',
-      );
-    }
-
     const currentRemoteTableWithSameDistantName =
       await this.remoteTableRepository.findOne({
         where: {
@@ -132,7 +132,7 @@ export class RemoteTableService {
 
     const localTableName = getRemoteTableLocalName(input.name);
 
-    this.validateTableNameDoesNotExists(
+    await this.validateTableNameDoesNotExists(
       localTableName,
       workspaceId,
       dataSourceMetatada.schema,
@@ -202,7 +202,7 @@ export class RemoteTableService {
       throw new NotFoundException('Remote table does not exist');
     }
 
-    await this.unsyncByTableInput(workspaceId, remoteTable, remoteServer);
+    await this.unsyncOne(workspaceId, remoteTable, remoteServer);
 
     return {
       name: input.name,
@@ -211,7 +211,7 @@ export class RemoteTableService {
     };
   }
 
-  public async unsyncByServerInput(
+  public async unsyncAll(
     workspaceId: string,
     remoteServer: RemoteServerEntity<RemoteServerType>,
   ) {
@@ -223,11 +223,11 @@ export class RemoteTableService {
     });
 
     for (const remoteTable of remoteTables) {
-      await this.unsyncByTableInput(workspaceId, remoteTable, remoteServer);
+      await this.unsyncOne(workspaceId, remoteTable, remoteServer);
     }
   }
 
-  private async unsyncByTableInput(
+  private async unsyncOne(
     workspaceId: string,
     remoteTable: RemoteTableEntity,
     remoteServer: RemoteServerEntity<RemoteServerType>,
@@ -360,7 +360,7 @@ export class RemoteTableService {
   ) {
     if (!remoteTableInput.schema) {
       throw new BadRequestException(
-        'Schema is required for syncing remote table',
+        'Schema is required for creating foreign table',
       );
     }