Skip to content

Commit 6d8dfc5

Browse files
committed
REFACTOR: config-service definition
1 parent 3d32bba commit 6d8dfc5

19 files changed

+311
-112
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ typings/
5656

5757
# dotenv environment variables file
5858
.env
59+
.env*
60+
61+
# ormconfig files
62+
ormconfig*.json
5963

6064
# next.js build output
6165
.next

development.env

Lines changed: 0 additions & 5 deletions
This file was deleted.

ormconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"type": "mysql",
3-
"host": "192.168.99.14",
43
"port": 3306,
5-
"username": "pgsql_admin",
6-
"password": "pgsql_admin123",
74
"database": "shopify_db",
85
"entities": ["src/models/**{.ts,.js}"],
96
"synchronize": true

package-lock.json

Lines changed: 140 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"dependencies": {
2020
"@nestjs/axios": "0.0.3",
2121
"@nestjs/common": "^8.1.2",
22+
"@nestjs/config": "^1.1.0",
2223
"@nestjs/core": "^8.1.2",
2324
"@nestjs/microservices": "^8.1.2",
2425
"@nestjs/passport": "^8.0.1",
@@ -34,6 +35,7 @@
3435
"mysql": "^2.18.1",
3536
"passport": "^0.5.0",
3637
"passport-http-bearer": "^1.0.1",
38+
"pg": "^8.7.1",
3739
"reflect-metadata": "^0.1.13",
3840
"rxjs": "^7.4.0",
3941
"typeorm": "^0.2.38",

src/app.module.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,29 @@ import { UserCredentialRepository } from './repositories/user-credential.reposit
2626
import { IsUserAlreadyExistConstraint } from './dto/validators/is-user-already-exist-constraint';
2727
import { AuthServiceFacade } from './services/facades/auth.service.facade';
2828
import { CorsMiddleware } from './middlewares/cors/cors.middleware';
29-
import { ConfigService } from './services/config.service';
29+
import { ConfigModule, ConfigService } from '@nestjs/config';
30+
import { CatalogModule } from './catalog/catalog.module';
31+
import { AuthModule } from './auth/auth.module';
32+
import databaseConfiguration from 'config/database/database.configuration';
33+
import thirdpartyConfiguration from 'config/thirdparty/thirdparty.configuration';
3034

3135
@Module({
3236
imports: [
3337
HttpModule,
34-
TypeOrmModule.forRoot(),
38+
ConfigModule.forRoot({
39+
load: [databaseConfiguration, thirdpartyConfiguration],
40+
}),
41+
TypeOrmModule.forRootAsync({
42+
imports: [ConfigModule],
43+
useFactory: (config: ConfigService) => config.get('database'),
44+
inject: [ConfigService],
45+
}),
3546
TypeOrmModule.forFeature([Label, Category, Item, Cart, CartDetail, User]),
3647
MulterModule.register({
3748
dest: './upload',
3849
}),
50+
CatalogModule,
51+
AuthModule,
3952
],
4053
controllers: [
4154
AppController,
@@ -47,12 +60,6 @@ import { ConfigService } from './services/config.service';
4760
AuthController,
4861
],
4962
providers: [
50-
{
51-
provide: ConfigService,
52-
useValue: new ConfigService(
53-
`${process.env.NODE_ENV || 'development'}.env`,
54-
),
55-
},
5663
AppService,
5764
{ provide: 'CategoryRepository', useClass: CategoryRepository },
5865
{ provide: 'UserCredentialRepository', useClass: UserCredentialRepository },

src/app.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable } from '@nestjs/common';
2-
import { ConfigService } from './services/config.service';
2+
import { ConfigService } from '@nestjs/config';
33

44
@Injectable()
55
export class AppService {

src/auth/auth.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { Module } from '@nestjs/common';
2+
3+
@Module({})
4+
export class AuthModule {}

src/catalog/catalog.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { Module } from '@nestjs/common';
2+
3+
@Module({})
4+
export class CatalogModule {}

src/config/config.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { Module } from '@nestjs/common';
2+
3+
@Module({})
4+
export class ConfigModule {}

0 commit comments

Comments
 (0)