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

Revert "Convert metadata tables to camelCase" (#2419)

Browse Source 
Revert "Convert metadata tables to camelCase (#2400)"

This reverts commit 1cf08c797f.
This commit is contained in:
Charles Bochet
2023-11-10 11:48:44 +01:00
committed by GitHub
parent 1cf08c797f
commit 7b9175a4a4
238 changed files with 2253 additions and 1852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/core/workspace/services/workspace.service.spec.ts
View File

@ -7,7 +7,7 @@ import { PipelineStageService } from 'src/core/pipeline/services/pipeline-stage.
import { PersonService } from 'src/core/person/person.service';
import { CompanyService } from 'src/core/company/company.service';
import { PipelineProgressService } from 'src/core/pipeline/services/pipeline-progress.service';
import { TenantManagerService } from 'src/tenant-manager/tenant-manager.service';
import { TenantInitialisationService } from 'src/metadata/tenant-initialisation/tenant-initialisation.service';
import { WorkspaceService } from './workspace.service';
@ -43,7 +43,7 @@ describe('WorkspaceService', () => {
useValue: {},
},
{
provide: TenantManagerService,
provide: TenantInitialisationService,
useValue: {},
},
],

8
server/src/core/workspace/services/workspace.service.ts
View File

@ -10,7 +10,7 @@ import { PipelineStageService } from 'src/core/pipeline/services/pipeline-stage.
import { PipelineService } from 'src/core/pipeline/services/pipeline.service';
import { PrismaService } from 'src/database/prisma.service';
import { assert } from 'src/utils/assert';
import { TenantManagerService } from 'src/tenant-manager/tenant-manager.service';
import { TenantInitialisationService } from 'src/metadata/tenant-initialisation/tenant-initialisation.service';
@Injectable()
export class WorkspaceService {
@ -21,7 +21,7 @@ export class WorkspaceService {
private readonly personService: PersonService,
private readonly pipelineStageService: PipelineStageService,
private readonly pipelineProgressService: PipelineProgressService,
private readonly tenantManagerService: TenantManagerService,
private readonly tenantInitialisationService: TenantInitialisationService,
) {}
// Find
@ -64,7 +64,7 @@ export class WorkspaceService {
});
// Create workspace schema
await this.tenantManagerService.init(workspace.id);
await this.tenantInitialisationService.init(workspace.id);
// Create default companies
const companies = await this.companyService.createDefaultCompanies({
@ -161,7 +161,7 @@ export class WorkspaceService {
this.delete({ where: { id: workspaceId } }),
]);
await this.tenantManagerService.delete(workspaceId);
await this.tenantInitialisationService.delete(workspaceId);
return workspace;
}

4
server/src/core/workspace/workspace.module.ts
View File

@ -4,9 +4,9 @@ import { FileUploadService } from 'src/core/file/services/file-upload.service';
import { PipelineModule } from 'src/core/pipeline/pipeline.module';
import { CompanyModule } from 'src/core/company/company.module';
import { PersonModule } from 'src/core/person/person.module';
import { TenantInitialisationModule } from 'src/metadata/tenant-initialisation/tenant-initialisation.module';
import { AbilityModule } from 'src/ability/ability.module';
import { PrismaModule } from 'src/database/prisma.module';
import { TenantManagerModule } from 'src/tenant-manager/tenant-manager.module';
import { WorkspaceService } from './services/workspace.service';
import { WorkspaceMemberService } from './services/workspace-member.service';
@ -19,7 +19,7 @@ import { WorkspaceResolver } from './resolvers/workspace.resolver';
PipelineModule,
CompanyModule,
PersonModule,
TenantManagerModule,
TenantInitialisationModule,
PrismaModule,
],
providers: [