From 58de1b1652707f92b469691405e03ef3b58e3972 Mon Sep 17 00:00:00 2001 From: Francesco Spilla Date: Fri, 7 Feb 2025 17:19:57 +0100 Subject: [PATCH] chore(repo): locate config files beside corresponding module --- apps/ebitemp-api/src/app/modules/config/config.module.ts | 6 +++--- .../src/app/{ => modules}/config/local.config.ts | 2 +- .../app/modules/config/{ => utils}/coerce-record-types.ts | 0 .../app/{config => modules/database}/database.config.ts | 2 +- .../src/app/modules/database/database.module.ts | 8 ++++---- .../database/{ => utils}/typeorm-data-source-factory.ts | 0 .../database/{ => utils}/typeorm-import-entities.ts | 0 .../{ => utils}/typeorm-module-options-factory.ts | 2 +- .../src/app/modules/database/{ => utils}/typeorm-patch.ts | 0 .../src/app/{config => modules/logger}/logger.config.ts | 2 +- apps/ebitemp-api/src/app/modules/logger/logger.module.ts | 2 +- apps/ebitemp-api/src/main.ts | 6 +++--- 12 files changed, 15 insertions(+), 15 deletions(-) rename apps/ebitemp-api/src/app/{ => modules}/config/local.config.ts (86%) rename apps/ebitemp-api/src/app/modules/config/{ => utils}/coerce-record-types.ts (100%) rename apps/ebitemp-api/src/app/{config => modules/database}/database.config.ts (95%) rename apps/ebitemp-api/src/app/modules/database/{ => utils}/typeorm-data-source-factory.ts (100%) rename apps/ebitemp-api/src/app/modules/database/{ => utils}/typeorm-import-entities.ts (100%) rename apps/ebitemp-api/src/app/modules/database/{ => utils}/typeorm-module-options-factory.ts (91%) rename apps/ebitemp-api/src/app/modules/database/{ => utils}/typeorm-patch.ts (100%) rename apps/ebitemp-api/src/app/{config => modules/logger}/logger.config.ts (89%) diff --git a/apps/ebitemp-api/src/app/modules/config/config.module.ts b/apps/ebitemp-api/src/app/modules/config/config.module.ts index d8717a7..0cacf02 100644 --- a/apps/ebitemp-api/src/app/modules/config/config.module.ts +++ b/apps/ebitemp-api/src/app/modules/config/config.module.ts @@ -1,9 +1,9 @@ import { Module } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { localConfig } from '../../config/local.config'; -import { loggerConfig } from '../../config/logger.config'; -import { databaseConfig } from '../../config/database.config'; +import { localConfig } from './local.config'; +import { loggerConfig } from '../logger/logger.config'; +import { databaseConfig } from '../database/database.config'; @Module({ imports: [ diff --git a/apps/ebitemp-api/src/app/config/local.config.ts b/apps/ebitemp-api/src/app/modules/config/local.config.ts similarity index 86% rename from apps/ebitemp-api/src/app/config/local.config.ts rename to apps/ebitemp-api/src/app/modules/config/local.config.ts index 844c438..9ab7cb9 100644 --- a/apps/ebitemp-api/src/app/config/local.config.ts +++ b/apps/ebitemp-api/src/app/modules/config/local.config.ts @@ -1,4 +1,4 @@ -import coerceRecordTypes from '../modules/config/coerce-record-types'; +import coerceRecordTypes from './utils/coerce-record-types'; import { registerAs } from '@nestjs/config'; import { z } from 'zod'; diff --git a/apps/ebitemp-api/src/app/modules/config/coerce-record-types.ts b/apps/ebitemp-api/src/app/modules/config/utils/coerce-record-types.ts similarity index 100% rename from apps/ebitemp-api/src/app/modules/config/coerce-record-types.ts rename to apps/ebitemp-api/src/app/modules/config/utils/coerce-record-types.ts diff --git a/apps/ebitemp-api/src/app/config/database.config.ts b/apps/ebitemp-api/src/app/modules/database/database.config.ts similarity index 95% rename from apps/ebitemp-api/src/app/config/database.config.ts rename to apps/ebitemp-api/src/app/modules/database/database.config.ts index 2e23bbf..a97d54f 100644 --- a/apps/ebitemp-api/src/app/config/database.config.ts +++ b/apps/ebitemp-api/src/app/modules/database/database.config.ts @@ -2,7 +2,7 @@ import { registerAs } from '@nestjs/config'; import { ConnectionString } from 'connection-string'; import { first } from 'lodash'; import { z } from 'zod'; -import coerceRecordTypes from '../modules/config/coerce-record-types'; +import coerceRecordTypes from '../config/utils/coerce-record-types'; export const databaseSchema = z.object({ connectionString: z.string(), diff --git a/apps/ebitemp-api/src/app/modules/database/database.module.ts b/apps/ebitemp-api/src/app/modules/database/database.module.ts index 25a5585..e12ad9a 100644 --- a/apps/ebitemp-api/src/app/modules/database/database.module.ts +++ b/apps/ebitemp-api/src/app/modules/database/database.module.ts @@ -2,10 +2,10 @@ import { Global, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { DataSource } from 'typeorm'; import { APP_DATASOURCES } from './database.constants'; -import { DatabaseConfig, databaseConfig } from '../../config/database.config'; -import { typeormTransactionalDataSourceFactory } from './typeorm-data-source-factory'; -import { typeormModuleOptionsFactory } from './typeorm-module-options-factory'; -import { typeormEntitiesFromImport } from './typeorm-import-entities'; +import { DatabaseConfig, databaseConfig } from './database.config'; +import { typeormTransactionalDataSourceFactory } from './utils/typeorm-data-source-factory'; +import { typeormModuleOptionsFactory } from './utils/typeorm-module-options-factory'; +import { typeormEntitiesFromImport } from './utils/typeorm-import-entities'; const dataSources: DataSource[] = []; diff --git a/apps/ebitemp-api/src/app/modules/database/typeorm-data-source-factory.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts similarity index 100% rename from apps/ebitemp-api/src/app/modules/database/typeorm-data-source-factory.ts rename to apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts diff --git a/apps/ebitemp-api/src/app/modules/database/typeorm-import-entities.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-import-entities.ts similarity index 100% rename from apps/ebitemp-api/src/app/modules/database/typeorm-import-entities.ts rename to apps/ebitemp-api/src/app/modules/database/utils/typeorm-import-entities.ts diff --git a/apps/ebitemp-api/src/app/modules/database/typeorm-module-options-factory.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts similarity index 91% rename from apps/ebitemp-api/src/app/modules/database/typeorm-module-options-factory.ts rename to apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts index e97913c..fa4bf79 100644 --- a/apps/ebitemp-api/src/app/modules/database/typeorm-module-options-factory.ts +++ b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts @@ -1,5 +1,5 @@ import { TypeOrmModuleOptions } from '@nestjs/typeorm'; -import { DatabaseConfig } from '../../config/database.config'; +import { DatabaseConfig } from '../database.config'; export const typeormModuleOptionsFactory = async ( name: string, diff --git a/apps/ebitemp-api/src/app/modules/database/typeorm-patch.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-patch.ts similarity index 100% rename from apps/ebitemp-api/src/app/modules/database/typeorm-patch.ts rename to apps/ebitemp-api/src/app/modules/database/utils/typeorm-patch.ts diff --git a/apps/ebitemp-api/src/app/config/logger.config.ts b/apps/ebitemp-api/src/app/modules/logger/logger.config.ts similarity index 89% rename from apps/ebitemp-api/src/app/config/logger.config.ts rename to apps/ebitemp-api/src/app/modules/logger/logger.config.ts index 3de98b0..c4bd44a 100644 --- a/apps/ebitemp-api/src/app/config/logger.config.ts +++ b/apps/ebitemp-api/src/app/modules/logger/logger.config.ts @@ -1,4 +1,4 @@ -import coerceRecordTypes from '../modules/config/coerce-record-types'; +import coerceRecordTypes from '../config/utils/coerce-record-types'; import { registerAs } from '@nestjs/config'; import { z } from 'zod'; diff --git a/apps/ebitemp-api/src/app/modules/logger/logger.module.ts b/apps/ebitemp-api/src/app/modules/logger/logger.module.ts index c9549f1..f7e3fca 100644 --- a/apps/ebitemp-api/src/app/modules/logger/logger.module.ts +++ b/apps/ebitemp-api/src/app/modules/logger/logger.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { NestApplication } from '@nestjs/core'; import { LoggerModule } from 'nestjs-pino'; -import { LoggerConfig, loggerConfig } from '../../config/logger.config'; +import { LoggerConfig, loggerConfig } from './logger.config'; @Module({ imports: [ diff --git a/apps/ebitemp-api/src/main.ts b/apps/ebitemp-api/src/main.ts index 41c3018..0b5c23f 100644 --- a/apps/ebitemp-api/src/main.ts +++ b/apps/ebitemp-api/src/main.ts @@ -3,13 +3,13 @@ * This is only a minimal backend to get started. */ -import { NestFactory } from '@nestjs/core'; import { Logger } from '@nestjs/common'; +import { NestFactory } from '@nestjs/core'; import { Logger as PinoLogger } from 'nestjs-pino'; import { AppModule } from './app/app.module'; -import { LocalConfig, localConfig } from './app/config/local.config'; -import { patchTypeOrm } from './app/modules/database/typeorm-patch'; +import { LocalConfig, localConfig } from './app/modules/config/local.config'; +import { patchTypeOrm } from './app/modules/database/utils/typeorm-patch'; async function bootstrap() { await patchTypeOrm();