twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-11-23 14:03:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix get available tables (#4873)

Browse Source 
Endpoint is broken since we now use `Remote` as a suffix for remote
table names.

This PR:
- creates a common function to calculate the name of the remote table
- use it in the `findAvailableRemotePostgresTables` to know if a table
has been synced or not

Co-authored-by: Thomas Trompette <thomast@twenty.com>
This commit is contained in:
Thomas Trompette 2024-04-08 11:11:24 +02:00 committed by GitHub
parent 3eef4a8938
commit 2890a7a44a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/remote-postgres-table.service.ts
View File

@ -13,6 +13,7 @@ import {
} from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util'; } from 'src/engine/metadata-modules/remote-server/remote-table/remote-postgres-table/utils/remote-postgres-table.util';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service'; import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service'; import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
import { getRemoteTableName } from 'src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util';
@Injectable() @Injectable()
export class RemotePostgresTableService { export class RemotePostgresTableService {
@ -42,7 +43,9 @@ export class RemotePostgresTableService {
return remotePostgresTables.map((remoteTable) => ({ return remotePostgresTables.map((remoteTable) => ({
name: remoteTable.table_name, name: remoteTable.table_name,
schema: remoteTable.table_schema, schema: remoteTable.table_schema,
status: currentForeignTableNames.includes(remoteTable.table_name) status: currentForeignTableNames.includes(
getRemoteTableName(remoteTable.table_name),
)
? RemoteTableStatus.SYNCED ? RemoteTableStatus.SYNCED
: RemoteTableStatus.NOT_SYNCED, : RemoteTableStatus.NOT_SYNCED,
})); }));

7
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
View File

@ -25,6 +25,7 @@ import { RemotePostgresTableService } from 'src/engine/metadata-modules/remote-s
import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service'; import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
import { camelCase } from 'src/utils/camel-case'; import { camelCase } from 'src/utils/camel-case';
import { camelToTitleCase } from 'src/utils/camel-to-title-case'; import { camelToTitleCase } from 'src/utils/camel-to-title-case';
import { getRemoteTableName } from 'src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util';
export class RemoteTableService { export class RemoteTableService {
constructor( constructor(
@ -149,7 +150,7 @@ export class RemoteTableService {
.map((column) => `"${column.column_name}" ${column.data_type}`) .map((column) => `"${column.column_name}" ${column.data_type}`)
.join(', '); .join(', ');
const remoteTableName = `${camelCase(input.name)}Remote`; const remoteTableName = getRemoteTableName(input.name);
const remoteTableLabel = camelToTitleCase(remoteTableName); const remoteTableLabel = camelToTitleCase(remoteTableName);
// We only support remote tables with an id column for now. // We only support remote tables with an id column for now.
@ -211,9 +212,11 @@ export class RemoteTableService {
workspaceDataSource: DataSource, workspaceDataSource: DataSource,
localSchema: string, localSchema: string,
) { ) {
const remoteTableName = getRemoteTableName(input.name);
const objectMetadata = const objectMetadata =
await this.objectMetadataService.findOneWithinWorkspace(workspaceId, { await this.objectMetadataService.findOneWithinWorkspace(workspaceId, {
where: { nameSingular: `${input.name}Remote` }, where: { nameSingular: remoteTableName },
}); });
if (objectMetadata) { if (objectMetadata) {

4
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-name.util.ts Normal file
View File

@ -0,0 +1,4 @@
import { camelCase } from 'src/utils/camel-case';
export const getRemoteTableName = (distantTableName: string) =>
`${camelCase(distantTableName)}Remote`;