scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-11-11 10:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add standard company table migrations (#2484)

Browse Source
This commit is contained in:
Charles Bochet
2023-11-13 17:18:37 +01:00
committed by GitHub
parent f8a887e33e
commit 05dbde79cf
15 changed files with 184 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/database/typeorm-seeds/tenant/views.ts
View File

@@ -55,7 +55,7 @@ export const seedViews = async (
{
id: SeedViewIds.Person,
name: 'All People',
objectMetadataId: SeedObjectMetadataIds.Company,
objectMetadataId: SeedObjectMetadataIds.Person,
type: 'table',
},
{

6
server/src/metadata/tenant-migration/migrations/1697618009-addCompanyTable.ts
View File

@@ -62,12 +62,6 @@ export const addCompanyTable: TenantMigrationTableAction[] = [
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
{
columnName: 'accountOwnerId',
referencedTableName: 'workspaceMember',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

13
server/src/metadata/tenant-migration/migrations/1697618015-addActivityTargetTable.ts
View File

@@ -1,4 +1,7 @@
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addActivityTargetTable: TenantMigrationTableAction[] = [
{
@@ -8,6 +11,12 @@ export const addActivityTargetTable: TenantMigrationTableAction[] = [
{
name: 'activityTarget',
action: 'alter',
columns: [],
columns: [
{
columnName: 'companyId',
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
],
},
];

13
server/src/metadata/tenant-migration/migrations/1697618018-addAttachmentTable.ts
View File

@@ -1,4 +1,7 @@
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addAttachmentTable: TenantMigrationTableAction[] = [
{
@@ -8,6 +11,12 @@ export const addAttachmentTable: TenantMigrationTableAction[] = [
{
name: 'attachment',
action: 'alter',
columns: [],
columns: [
{
columnName: 'companyId',
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
],
},
];

13
server/src/metadata/tenant-migration/migrations/1697618020-addFavoriteTable.ts
View File

@@ -1,4 +1,7 @@
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addFavoriteTable: TenantMigrationTableAction[] = [
{
@@ -8,6 +11,12 @@ export const addFavoriteTable: TenantMigrationTableAction[] = [
{
name: 'favorite',
action: 'alter',
columns: [],
columns: [
{
columnName: 'companyId',
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
],
},
];

13
server/src/metadata/tenant-migration/migrations/1697618021-addOpportunityTable.ts
View File

@@ -1,4 +1,7 @@
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addOpportunityTable: TenantMigrationTableAction[] = [
{
@@ -8,6 +11,12 @@ export const addOpportunityTable: TenantMigrationTableAction[] = [
{
name: 'opportunity',
action: 'alter',
columns: [],
columns: [
{
columnName: 'companyId',
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
],
},
];

13
server/src/metadata/tenant-migration/migrations/1697618022-addPersonTable.ts
View File

@@ -1,4 +1,7 @@
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addPersonTable: TenantMigrationTableAction[] = [
{
@@ -8,6 +11,12 @@ export const addPersonTable: TenantMigrationTableAction[] = [
{
name: 'person',
action: 'alter',
columns: [],
columns: [
{
columnName: 'companyId',
columnType: 'uuid',
action: TenantMigrationColumnActionType.CREATE,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618027-addCompanyRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addCompanyRelations: TenantMigrationTableAction[] = [
{
name: 'company',
action: 'alter',
columns: [
{
columnName: 'accountOwnerId',
referencedTableName: 'workspaceMember',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618028-addAttachmentRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addAttachmentRelations: TenantMigrationTableAction[] = [
{
name: 'attachment',
action: 'alter',
columns: [
{
columnName: 'companyId',
referencedTableName: 'company',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618029-addPersonRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addPersonRelations: TenantMigrationTableAction[] = [
{
name: 'person',
action: 'alter',
columns: [
{
columnName: 'companyId',
referencedTableName: 'company',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618030-addFavoriteRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addFavoriteRelations: TenantMigrationTableAction[] = [
{
name: 'favorite',
action: 'alter',
columns: [
{
columnName: 'companyId',
referencedTableName: 'company',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618031-addOpportunitiesRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addOpportunitiesRelations: TenantMigrationTableAction[] = [
{
name: 'opportunity',
action: 'alter',
columns: [
{
columnName: 'companyId',
referencedTableName: 'company',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

19
server/src/metadata/tenant-migration/migrations/1697618032-addActivityTargetRelations.ts Normal file
View File

@@ -0,0 +1,19 @@
import {
TenantMigrationColumnActionType,
TenantMigrationTableAction,
} from 'src/metadata/tenant-migration/tenant-migration.entity';
export const addActivityTargetRelations: TenantMigrationTableAction[] = [
{
name: 'activityTarget',
action: 'alter',
columns: [
{
columnName: 'companyId',
referencedTableName: 'company',
referencedTableColumnName: 'id',
action: TenantMigrationColumnActionType.RELATION,
},
],
},
];

14
server/src/metadata/tenant-migration/standard-migrations.ts
View File

@@ -10,6 +10,12 @@ import { addPipelineStepTable } from 'src/metadata/tenant-migration/migrations/1
import { addWebhookTable } from 'src/metadata/tenant-migration/migrations/1697618024-addWebhookTable';
import { addWorkspaceMemberSettingTable } from 'src/metadata/tenant-migration/migrations/1697618025-addWorkspaceMemberSettingTable';
import { addWorkspaceMemberTable } from 'src/metadata/tenant-migration/migrations/1697618026-addWorspaceMemberTable';
import { addCompanyRelations } from 'src/metadata/tenant-migration/migrations/1697618027-addCompanyRelations';
import { addAttachmentRelations } from 'src/metadata/tenant-migration/migrations/1697618028-addAttachmentRelations';
import { addPersonRelations } from 'src/metadata/tenant-migration/migrations/1697618029-addPersonRelations';
import { addFavoriteRelations } from 'src/metadata/tenant-migration/migrations/1697618030-addFavoriteRelations';
import { addOpportunitiesRelations } from 'src/metadata/tenant-migration/migrations/1697618031-addOpportunitiesRelations';
import { addActivityTargetRelations } from 'src/metadata/tenant-migration/migrations/1697618032-addActivityTargetRelations';
import { addCompanyTable } from './migrations/1697618009-addCompanyTable';
import { addViewTable } from './migrations/1697618011-addViewTable';
@@ -19,6 +25,7 @@ import { addViewSortTable } from './migrations/1697618014-addViewSortTable';
// TODO: read the folder and return all migrations
export const standardMigrations = {
'1697618009-addCompanyTable': addCompanyTable,
'1697618011-addViewTable': addViewTable,
'1697618012-addViewFieldTable': addViewFieldTable,
'1697618013-addViewFilterTable': addViewFilterTable,
@@ -36,5 +43,10 @@ export const standardMigrations = {
'1697618024-addWebhookTable': addWebhookTable,
'1697618025-addWorkspaceMemberSettingTable': addWorkspaceMemberSettingTable,
'1697618026-addWorkspaceMemberTable': addWorkspaceMemberTable,
'1697618009-addCompanyTable': addCompanyTable,
'1697618027-addCompanyRelations': addCompanyRelations,
'1697618028-addAttachmentRelations': addAttachmentRelations,
'1697618029-addPersonRelations': addPersonRelations,
'1697618030-addFavoriteRelations': addFavoriteRelations,
'1697618031-addOpportunitiesRelations': addOpportunitiesRelations,
'1697618032-addActivityTargetRelations': addActivityTargetRelations,
};

2
server/src/tenant/query-builder/factories/composite-field-alias.factory.ts
View File

@@ -98,7 +98,7 @@ export class CompositeFieldAliasFactory {
// Otherwise it means it's a relation destination is of kind ONE
return `
${fieldKey}: ${referencedObjectMetadata.targetTableName} {
${fieldKey} {
${this.fieldsStringFactory.createFieldsStringRecursive(
info,
fieldValue,