admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: refactor folder structure (#4498)

Browse Source 
* feat: wip refactor folder structure

* Fix

* fix position

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Jérémy M
2024-03-15 14:40:58 +01:00
committed by GitHub
parent 52f1b3ac98
commit 94487f6737
760 changed files with 3215 additions and 3155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts
View File

@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
import { EnvironmentModule } from 'src/integrations/environment/environment.module';
import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
@Module({

5
packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
View File

@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { DataSource } from 'typeorm';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
import {
deleteCoreSchema,
seedCoreSchema,
@ -26,7 +26,8 @@ export class DataSeedDemoWorkspaceService {
});
await dataSource.initialize();
const demoWorkspaceIds = this.environmentService.get('DEMO_WORKSPACE_IDS');
const demoWorkspaceIds =
this.environmentService.get('DEMO_WORKSPACE_IDS');
if (demoWorkspaceIds.length === 0) {
throw new Error(

8
packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
View File

@ -1,7 +1,7 @@
import { Command, CommandRunner } from 'nest-commander';
import { DataSource } from 'typeorm';
import { DataSourceService } from 'src/metadata/data-source/data-source.service';
import { DataSourceService } from 'src/engine-metadata/data-source/data-source.service';
import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
import { seedViews } from 'src/database/typeorm-seeds/workspace/views';
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
@ -11,9 +11,9 @@ import { seedWorkspaceMember } from 'src/database/typeorm-seeds/workspace/worksp
import { seedPeople } from 'src/database/typeorm-seeds/workspace/people';
import { seedCoreSchema } from 'src/database/typeorm-seeds/core';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { WorkspaceSyncMetadataService } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.service';
import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
import { ObjectMetadataService } from 'src/engine-metadata/object-metadata/object-metadata.service';
// TODO: implement dry-run
@Command({

12
packages/twenty-server/src/database/commands/database-command.module.ts
View File

@ -1,15 +1,15 @@
import { Module } from '@nestjs/common';
import { ConfirmationQuestion } from 'src/database/commands/questions/confirmation.question';
import { WorkspaceManagerModule } from 'src/workspace/workspace-manager/workspace-manager.module';
import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
import { DataSourceModule } from 'src/engine-metadata/data-source/data-source.module';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { WorkspaceModule } from 'src/core/workspace/workspace.module';
import { WorkspaceModule } from 'src/engine/modules/workspace/workspace.module';
import { DataSeedWorkspaceCommand } from 'src/database/commands/data-seed-dev-workspace.command';
import { DataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace.cron.command';
import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
import { WorkspaceSyncMetadataModule } from 'src/workspace/workspace-sync-metadata/workspace-sync-metadata.module';
import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
import { ObjectMetadataModule } from 'src/engine-metadata/object-metadata/object-metadata.module';
import { WorkspaceAddTotalCountCommand } from 'src/database/commands/workspace-add-total-count.command';
import { DataSeedDemoWorkspaceCommand } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace-command';
import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';

2
packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
View File

@ -1,6 +1,6 @@
import { DataSource } from 'typeorm';
import { FeatureFlagKeys } from 'src/core/feature-flag/feature-flag.entity';
import { FeatureFlagKeys } from 'src/engine/modules/feature-flag/feature-flag.entity';
const tableName = 'featureFlag';

30
packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
View File

@ -29,7 +29,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
email: 'christoph.calisto@linkedin.com',
position: 0,
position: 1,
},
{
id: '0aa00beb-ac73-4797-824e-87a1f5aea9e0',
@ -39,7 +39,7 @@ export const seedPeople = async (
city: 'Los Angeles',
companyId: 'fe256b39-3ec3-4fe3-8997-b76aa0bfa408',
email: 'sylvie.palmer@linkedin.com',
position: 1,
position: 2,
},
{
id: '93c72d2e-f517-42fd-80ae-14173b3b70ae',
@ -49,7 +49,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
email: 'christopher.gonzalez@qonto.com',
position: 2,
position: 3,
},
{
id: 'eeeacacf-eee1-4690-ad2c-8619e5b56a2e',
@ -59,7 +59,7 @@ export const seedPeople = async (
city: 'Los Angeles',
companyId: '118995f3-5d81-46d6-bf83-f7fd33ea6102',
email: 'ashley.parker@qonto.com',
position: 3,
position: 4,
},
{
id: '9b324a88-6784-4449-afdf-dc62cb8702f2',
@ -69,7 +69,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
email: 'nicholas.wright@microsoft.com',
position: 4,
position: 5,
},
{
id: '1d151852-490f-4466-8391-733cfd66a0c8',
@ -79,7 +79,7 @@ export const seedPeople = async (
city: 'New York',
companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
email: 'isabella.scott@microsoft.com',
position: 5,
position: 6,
},
{
id: '98406e26-80f1-4dff-b570-a74942528de3',
@ -89,7 +89,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
email: 'matthew.green@microsoft.com',
position: 6,
position: 7,
},
{
id: 'a2e78a5f-338b-46df-8811-fa08c7d19d35',
@ -99,7 +99,7 @@ export const seedPeople = async (
city: 'New York',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'elizabeth.baker@airbnb.com',
position: 7,
position: 8,
},
{
id: 'ca1f5bf3-64ad-4b0e-bbfd-e9fd795b7016',
@ -109,7 +109,7 @@ export const seedPeople = async (
city: 'San Francisco',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'christopher.nelson@airbnb.com',
position: 8,
position: 9,
},
{
id: '56955422-5d54-41b7-ba36-f0d20e1417ae',
@ -119,7 +119,7 @@ export const seedPeople = async (
city: 'New York',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'avery.carter@airbnb.com',
position: 9,
position: 10,
},
{
id: '755035db-623d-41fe-92e7-dd45b7c568e1',
@ -129,7 +129,7 @@ export const seedPeople = async (
city: 'Los Angeles',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'ethan.mitchell@google.com',
position: 10,
position: 11,
},
{
id: '240da2ec-2d40-4e49-8df4-9c6a049190ef',
@ -139,7 +139,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'madison.perez@google.com',
position: 11,
position: 12,
},
{
id: '240da2ec-2d40-4e49-8df4-9c6a049190df',
@ -149,7 +149,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: '0d940997-c21e-4ec2-873b-de4264d89025',
email: 'bertrand.voulzy@google.com',
position: 12,
position: 13,
},
{
id: '240da2ec-2d40-4e49-8df4-9c6a049191de',
@ -159,7 +159,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: 'a7bc68d5-f79e-40dd-bd06-c36e6abb4678',
email: 'louis.duss@google.com',
position: 13,
position: 14,
},
{
id: '240da2ec-2d40-4e49-8df4-9c6a049191df',
@ -169,7 +169,7 @@ export const seedPeople = async (
city: 'Seattle',
companyId: 'a674fa6c-1455-4c57-afaf-dd5dc086361d',
email: 'lorie.vladim@google.com',
position: 14,
position: 15,
},
])
.execute();

2
packages/twenty-server/src/database/typeorm-seeds/workspace/views.ts
View File

@ -1,6 +1,6 @@
import { DataSource } from 'typeorm';
import { ObjectMetadataEntity } from 'src/metadata/object-metadata/object-metadata.entity';
import { ObjectMetadataEntity } from 'src/engine-metadata/object-metadata/object-metadata.entity';
export const seedViews = async (
workspaceDataSource: DataSource,

2
packages/twenty-server/src/database/typeorm/core/core.datasource.ts
View File

@ -11,7 +11,7 @@ export const typeORMCoreModuleOptions: TypeOrmModuleOptions = {
type: 'postgres',
logging: ['error'],
schema: 'core',
entities: ['dist/src/core/**/*.entity{.ts,.js}'],
entities: ['dist/src/engine/modules/**/*.entity{.ts,.js}'],
synchronize: false,
migrationsRun: false,
migrationsTableName: '_typeorm_migrations',

2
packages/twenty-server/src/database/typeorm/metadata/metadata.datasource.ts
View File

@ -11,7 +11,7 @@ export const typeORMMetadataModuleOptions: TypeOrmModuleOptions = {
type: 'postgres',
logging: ['error'],
schema: 'metadata',
entities: ['dist/src/metadata/**/*.entity{.ts,.js}'],
entities: ['dist/src/engine-metadata/**/*.entity{.ts,.js}'],
synchronize: false,
migrationsRun: false,
migrationsTableName: '_typeorm_migrations',

16
packages/twenty-server/src/database/typeorm/typeorm.service.ts
View File

@ -3,14 +3,14 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
import { DataSource } from 'typeorm';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
import { User } from 'src/core/user/user.entity';
import { Workspace } from 'src/core/workspace/workspace.entity';
import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
import { FeatureFlagEntity } from 'src/core/feature-flag/feature-flag.entity';
import { BillingSubscription } from 'src/core/billing/entities/billing-subscription.entity';
import { BillingSubscriptionItem } from 'src/core/billing/entities/billing-subscription-item.entity';
import { UserWorkspace } from 'src/core/user-workspace/user-workspace.entity';
import { DataSourceEntity } from 'src/engine-metadata/data-source/data-source.entity';
import { User } from 'src/engine/modules/user/user.entity';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { RefreshToken } from 'src/engine/modules/refresh-token/refresh-token.entity';
import { FeatureFlagEntity } from 'src/engine/modules/feature-flag/feature-flag.entity';
import { BillingSubscription } from 'src/engine/modules/billing/entities/billing-subscription.entity';
import { BillingSubscriptionItem } from 'src/engine/modules/billing/entities/billing-subscription-item.entity';
import { UserWorkspace } from 'src/engine/modules/user-workspace/user-workspace.entity';
@Injectable()
export class TypeORMService implements OnModuleInit, OnModuleDestroy {