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

Refacto environment service (#4473)

Browse Source 
* Refacto environment service

* Remove environment variable type
This commit is contained in:
Félix Malfait
2024-03-14 11:51:19 +01:00
committed by GitHub
parent 3caf860848
commit fd06d52a13
42 changed files with 320 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,14 +19,14 @@ export class DataSeedDemoWorkspaceService {
async seedDemo(): Promise<void> {
try {
const dataSource = new DataSource({
url: this.environmentService.getPGDatabaseUrl(),
url: this.environmentService.get('PG_DATABASE_URL'),
type: 'postgres',
logging: true,
schema: 'public',
});
await dataSource.initialize();
const demoWorkspaceIds = this.environmentService.getDemoWorkspaceIds();
const demoWorkspaceIds = this.environmentService.get('DEMO_WORKSPACE_IDS');
if (demoWorkspaceIds.length === 0) {
throw new Error(

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

@ -38,7 +38,7 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
async run(): Promise<void> {
try {
const dataSource = new DataSource({
url: this.environmentService.getPGDatabaseUrl(),
url: this.environmentService.get('PG_DATABASE_URL'),
type: 'postgres',
logging: true,
schema: 'core',

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

@ -20,7 +20,7 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
constructor(private readonly environmentService: EnvironmentService) {
this.mainDataSource = new DataSource({
url: environmentService.getPGDatabaseUrl(),
url: environmentService.get('PG_DATABASE_URL'),
type: 'postgres',
logging: false,
schema: 'core',
@ -83,9 +83,9 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
const schema = dataSource.schema;
const workspaceDataSource = new DataSource({
url: dataSource.url ?? this.environmentService.getPGDatabaseUrl(),
url: dataSource.url ?? this.environmentService.get('PG_DATABASE_URL'),
type: 'postgres',
logging: this.environmentService.isDebugMode()
logging: this.environmentService.get('DEBUG_MODE')
? ['query', 'error']
: ['error'],
schema,