Sync main to develop

app/src/app.module.ts

@@ -1,8 +1,9 @@
 import { Module } from '@nestjs/common';
-import { WebModule } from '@entrypoints/web';
-import { ConsumerModule } from '@src/entrypoints/consumers';
+import { InfrastructureModule } from '@src/infrastructure';
+import { EntrypointsModule } from '@src/entrypoints';
+import { DynamicConfigModule } from '@shared/config';
 
 @Module({
-  imports: [WebModule, ConsumerModule],
+  ...DynamicConfigModule.forModules([InfrastructureModule, EntrypointsModule]),
 })
 export class AppModule {}

app/src/entrypoints/consumers/consumer.module.ts

@@ -1,13 +1,12 @@
 import { Module } from '@nestjs/common';
-import { WebhookIntegrationClientModule } from '@infrastructure/integrations/webhook-client';
 import { NotificationSendWebhookUsecaseImpl } from '@core/usecases/notification/impl';
 import { WebhookIntegrationClientProviderImpl } from '@infrastructure/integrations/webhook-client/impl';
 import { NotificationOrderConsumerService } from '@entrypoints/consumers/notification';
 import { DynamicConfigModule } from '@shared/config';
-import { SqsQueueInfraModule } from '@infrastructure/queue/sqs';
+import { InfrastructureModule } from '@src/infrastructure';
 
 @Module({
-  imports: [SqsQueueInfraModule, WebhookIntegrationClientModule],
+  imports: [InfrastructureModule],
   providers: [DynamicConfigModule.forProvider(NotificationSendWebhookUsecaseImpl, [WebhookIntegrationClientProviderImpl]), NotificationOrderConsumerService],
 })
 export class ConsumerModule {}

app/src/entrypoints/entrypoints.module.ts

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { DynamicConfigModule } from '@shared/config';
+import { WebModule } from '@entrypoints/web';
+import { ConsumerModule } from '@entrypoints/consumers';
+
+@Module({
+  ...DynamicConfigModule.forModules([WebModule, ConsumerModule]),
+})
+export class EntrypointsModule {}

app/src/entrypoints/index.ts

@@ -0,0 +1 @@
+export * from './entrypoints.module';

app/src/entrypoints/web/rest/health/health-app.module.ts → app/src/entrypoints/web/rest/health/health.web.module.ts

@@ -6,4 +6,4 @@ import { TerminusModule } from '@nestjs/terminus';
   imports: [TerminusModule],
   controllers: [HealthController],
 })
-export class HealthAppModule {}
+export class HealthWebModule {}

app/src/entrypoints/web/rest/health/index.ts

@@ -1,2 +1,2 @@
-export * from './health-app.module';
 export * from './health.controller';
+export * from './health.web.module';

app/src/entrypoints/web/rest/orders/index.ts

@@ -1,2 +1,2 @@
-export * from './orders-app.module';
 export * from './orders.controller';
+export * from './orders.web.module';

app/src/entrypoints/web/rest/orders/orders-app.module.ts → app/src/entrypoints/web/rest/orders/orders.web.module.ts

@@ -1,18 +1,16 @@
 import { Module } from '@nestjs/common';
-import { RepositoryInfraModule } from '@infrastructure/repositories';
 import { AuthAppModule } from '@entrypoints/web/shared/middleware/apikey';
 import { OrdersController } from '@src/entrypoints/web/rest/orders';
 import { NotificationOrderRegisterUsecaseImpl } from '@core/usecases/notification/impl';
 import { SqsProducerQueueProviderImpl } from '@infrastructure/queue/sqs/impl';
-import { SqsQueueInfraModule } from '@infrastructure/queue/sqs';
 import { OrderCreationUseCaseImpl, OrderEndUsecaseImpl, OrderFindByIdUsecaseImpl, OrderQueryQuantityStatusUsecaseImpl, OrderQueryUsecaseImpl, OrderStartUsecaseImpl } from '@core/usecases/orders/impl';
 import { OrderRepositoryProviderImpl } from '@infrastructure/repositories/orders/impl';
 import { DynamicConfigModule } from '@shared/config';
 import { ConfigEnvProviderImpl } from '@infrastructure/config-env/impl';
-import { ConfigEnvModule } from '@infrastructure/config-env';
+import { InfrastructureModule } from '@src/infrastructure';
 
 @Module({
-  imports: [RepositoryInfraModule, AuthAppModule, SqsQueueInfraModule, ConfigEnvModule],
+  imports: [InfrastructureModule, AuthAppModule],
   controllers: [OrdersController],
   providers: [
     DynamicConfigModule.forProvider(OrderCreationUseCaseImpl, [OrderRepositoryProviderImpl, NotificationOrderRegisterUsecaseImpl]),
@@ -24,4 +22,4 @@ import { ConfigEnvModule } from '@infrastructure/config-env';
     DynamicConfigModule.forProvider(NotificationOrderRegisterUsecaseImpl, [SqsProducerQueueProviderImpl, ConfigEnvProviderImpl]),
   ],
 })
-export class OrdersAppModule {}
+export class OrdersWebModule {}

app/src/entrypoints/web/shared/middleware/apikey/auth-app.module.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
-import { RepositoryInfraModule } from '@infrastructure/repositories';
 import { CheckApiKeyUsecaseImpl } from '@core/usecases/auth/impl';
 import { ApiKeyApplicationRepositoryProviderImpl } from '@infrastructure/repositories/auth/impl';
 import { DynamicConfigModule } from '@shared/config';
+import { InfrastructureModule } from '@src/infrastructure';
 
 const dynamicProvider = [DynamicConfigModule.forProvider(CheckApiKeyUsecaseImpl, [ApiKeyApplicationRepositoryProviderImpl])];
 
 @Module({
-  imports: [RepositoryInfraModule],
+  imports: [InfrastructureModule],
   providers: dynamicProvider,
   exports: dynamicProvider,
 })

app/src/entrypoints/web/web.module.ts

@@ -1,10 +1,11 @@
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
-import { HealthAppModule } from '@src/entrypoints/web/rest/health/health-app.module';
-import { OrdersAppModule } from '@src/entrypoints/web/rest/orders/orders-app.module';
-import { LoggingMiddleware } from '@entrypoints/web/shared/middleware/logger/logging.middleware';
+import { HealthWebModule } from '@entrypoints/web/rest/health';
+import { OrdersWebModule } from '@entrypoints/web/rest/orders';
+import { LoggingMiddleware } from '@entrypoints/web/shared/middleware/logger';
+import { DynamicConfigModule } from '@shared/config';
 
 @Module({
-  imports: [HealthAppModule, OrdersAppModule],
+  ...DynamicConfigModule.forModules([HealthWebModule, OrdersWebModule]),
 })
 export class WebModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {

app/src/infrastructure/config-env/config.env.module.ts

@@ -6,7 +6,7 @@ import { DynamicConfigModule } from '@shared/config';
 @Module({
   imports: [
     ConfigModule.forRoot({
-      isGlobal: false,
+      isGlobal: true,
     }),
   ],
   ...DynamicConfigModule.forFeature([ConfigEnvProviderImpl]),

app/src/infrastructure/index.ts

@@ -0,0 +1 @@
+export * from './infrastructure.module';

app/src/infrastructure/infrastructure.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { ConfigEnvModule } from '@infrastructure/config-env';
+import { QueueInfraModule } from '@infrastructure/queue';
+import { RepositoryModule } from '@infrastructure/repositories';
+import { DynamicConfigModule } from '@shared/config';
+import { IntegrationsModule } from '@infrastructure/integrations';
+
+@Module({
+  ...DynamicConfigModule.forModules([ConfigEnvModule, IntegrationsModule, QueueInfraModule, RepositoryModule]),
+})
+export class InfrastructureModule {}

app/src/infrastructure/integrations/index.ts

@@ -1 +1 @@
-export * from './integration-infra.module';
+export * from './integrations.module';

app/src/infrastructure/integrations/integration-infra.module.ts → app/src/infrastructure/integrations/integrations.module.ts

@@ -5,4 +5,4 @@ import { DynamicConfigModule } from '@shared/config';
 @Module({
   ...DynamicConfigModule.forModules([WebhookIntegrationClientModule]),
 })
-export class IntegrationInfraModule {}
+export class IntegrationsModule {}

app/src/infrastructure/repositories/auth/auth-infra.module.ts → app/src/infrastructure/repositories/auth/auth.repository.module.ts

@@ -12,4 +12,4 @@ const dynamicFeature = DynamicConfigModule.forFeature([ApiKeyApplicationReposito
   providers: [ApiKeyApplicationSeed, ...dynamicFeature.providers],
   exports: [ApiKeyApplicationSeed, ...dynamicFeature.exports],
 })
-export class AuthInfraModule {}
+export class AuthRepositoryModule {}

app/src/infrastructure/repositories/auth/index.ts

@@ -1 +1 @@
-export * from './auth-infra.module';
+export * from './auth.repository.module';

app/src/infrastructure/repositories/index.ts

@@ -1 +1 @@
-export * from './repository-infra.module';
+export * from './repository.module';

app/src/infrastructure/repositories/orders/index.ts

@@ -1 +1 @@
-export * from './orders-infra.module';
+export * from './orders.repository.module';

app/src/infrastructure/repositories/orders/orders-infra.module.ts → app/src/infrastructure/repositories/orders/orders.repository.module.ts

@@ -8,4 +8,4 @@ import { TypeOrmModule } from '@nestjs/typeorm';
   imports: [TypeOrmModule.forFeature([OrderEntity])],
   ...DynamicConfigModule.forFeature([OrderRepositoryProviderImpl]),
 })
-export class OrdersInfraModule {}
+export class OrdersRepositoryModule {}

app/src/infrastructure/repositories/repository.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { AuthRepositoryModule } from '@infrastructure/repositories/auth';
+import { OrdersRepositoryModule } from '@infrastructure/repositories/orders';
+import { DatabaseModule } from '@src/database.module';
+import { DynamicConfigModule } from '@shared/config';
+
+@Module({
+  ...DynamicConfigModule.forModules([DatabaseModule, AuthRepositoryModule, OrdersRepositoryModule]),
+})
+export class RepositoryModule {}

app/src/seed.module.ts

@@ -1,8 +1,7 @@
 import { Module } from '@nestjs/common';
-import { DatabaseModule } from '@src/database.module';
-import { RepositoryInfraModule } from '@infrastructure/repositories';
+import { InfrastructureModule } from '@src/infrastructure';
 
 @Module({
-  imports: [DatabaseModule, RepositoryInfraModule],
+  imports: [InfrastructureModule],
 })
 export class SeedModule {}