Refactor: Refactor TypeORM configuration to use injectable for DI

Author: Ho-s

src/app.module.ts

@@ -1,15 +1,12 @@
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { Module } from '@nestjs/common';
-import { ConfigModule, ConfigService } from '@nestjs/config';
+import { ConfigModule } from '@nestjs/config';
 import { GraphQLModule } from '@nestjs/graphql';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { AuthModule } from './auth/auth.module';
 import { CustomCacheModule } from './cache/custom-cache.module';
-import {
-  typeormConfigKey,
-  typeormConfigLoader,
-} from './common/config/ormconfig';
+import { TypeORMConfigService } from './common/config/ormconfig.service';
 import { getEnvPath } from './common/helper/env.helper';
 import { envValidation } from './common/helper/env.validation';
 import { SettingModule } from './common/shared/setting/setting.module';
@@ -23,7 +20,6 @@ import { UserModule } from './user/user.module';
     ConfigModule.forRoot({
       envFilePath: getEnvPath(`${__dirname}/..`),
       validate: envValidation,
-      load: [typeormConfigLoader],
     }),
     GraphQLModule.forRootAsync<ApolloDriverConfig>({
       driver: ApolloDriver,
@@ -33,10 +29,8 @@ import { UserModule } from './user/user.module';
         settingService.graphqlUseFactory,
     }),
     TypeOrmModule.forRootAsync({
+      useClass: TypeORMConfigService,
       imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: (configService: ConfigService) =>
-        configService.get(typeormConfigKey),
     }),
     UserModule,
     AuthModule,

src/common/config/ormconfig.service.ts

@@ -0,0 +1,14 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { TypeOrmModuleOptions, TypeOrmOptionsFactory } from '@nestjs/typeorm';
+
+import { setTypeormConfig } from './ormconfig';
+
+@Injectable()
+export class TypeORMConfigService implements TypeOrmOptionsFactory {
+  constructor(private readonly configService: ConfigService) {}
+
+  createTypeOrmOptions(): Promise<TypeOrmModuleOptions> | TypeOrmModuleOptions {
+    return setTypeormConfig(this.configService);
+  }
+}

src/common/config/ormconfig.ts

@@ -1,4 +1,4 @@
-import { registerAs } from '@nestjs/config';
+import { ConfigService } from '@nestjs/config';
 
 import { config } from 'dotenv';
 import { join } from 'path';
@@ -11,29 +11,33 @@ config({
   path: getEnvPath(cwd()),
 });
 
-const typeormConfig: DataSourceOptions = {
-  type: 'postgres',
-  host: env.DB_HOST,
-  port: Number(env.DB_PORT),
-  username: env.DB_USER,
-  password: env.DB_PASSWORD,
-  database: env.DB_NAME,
-  entities:
-    env.NODE_ENV === 'test'
-      ? [join(cwd(), 'src', '**', '*.entity.{ts,js}')]
-      : [join(cwd(), 'dist', '**', '*.entity.js')],
-  synchronize: env.NODE_ENV !== 'production',
-  dropSchema: env.NODE_ENV === 'test',
-  migrations: [
-    join(cwd(), 'dist', 'common', 'database', 'migrations', '*{.ts,.js}'),
-  ],
-  migrationsRun: false,
-  logging: false,
+export const setTypeormConfig = (
+  conf: NodeJS.ProcessEnv | ConfigService,
+): DataSourceOptions => {
+  const getConfigValue =
+    conf instanceof ConfigService
+      ? conf.get.bind(conf)
+      : (key: string) => conf[key];
+
+  return {
+    type: 'postgres',
+    host: getConfigValue('DB_HOST'),
+    port: Number(getConfigValue('DB_PORT')),
+    username: getConfigValue('DB_USER'),
+    password: getConfigValue('DB_PASSWORD'),
+    database: getConfigValue('DB_NAME'),
+    entities:
+      getConfigValue('NODE_ENV') === 'test'
+        ? [join(cwd(), 'src', '**', '*.entity.{ts,js}')]
+        : [join(cwd(), 'dist', '**', '*.entity.js')],
+    synchronize: getConfigValue('NODE_ENV') !== 'production',
+    dropSchema: getConfigValue('NODE_ENV') === 'test',
+    migrations: [
+      join(cwd(), 'dist', 'common', 'database', 'migrations', '*{.ts,.js}'),
+    ],
+    migrationsRun: false,
+    logging: false,
+  };
 };
 
-export const typeormConfigKey = 'typeorm';
-export const typeormConfigLoader = registerAs(
-  typeormConfigKey,
-  () => typeormConfig,
-);
-export default new DataSource(typeormConfig);
+export default new DataSource(setTypeormConfig(env));