diff --git a/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.spec.ts b/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.spec.ts index b5e11295b..c21492a30 100644 --- a/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.spec.ts +++ b/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.spec.ts @@ -2,13 +2,23 @@ import type { TestingModule } from '@nestjs/testing' import { Test } from '@nestjs/testing' import { ApplicationInitializationService } from './application-initialization.service' +import { ConfigurationModule } from '@/cpin-module/infrastructure/configuration/configuration.module' +import { PluginManagementService } from '../plugin-management/plugin-management.service' +import { DatabaseInitializationService } from '../database-initialization/database-initialization.service' +import { DatabaseService } from '@/cpin-module/infrastructure/database/database.service' describe('applicationInitializationServiceService', () => { let service: ApplicationInitializationService beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - providers: [ApplicationInitializationService], + imports: [ConfigurationModule], + providers: [ + ApplicationInitializationService, + PluginManagementService, + DatabaseInitializationService, + DatabaseService, + ], }).compile() service = module.get( diff --git a/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.ts b/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.ts index 2ec85c514..0d903f8b0 100644 --- a/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.ts +++ b/apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.ts @@ -1,20 +1,20 @@ -import type { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' -import type { DatabaseService } from '@/cpin-module/infrastructure/database/database.service' -import { Injectable, Logger } from '@nestjs/common' +import { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' +import { DatabaseService } from '@/cpin-module/infrastructure/database/database.service' +import { Inject, Injectable, Logger } from '@nestjs/common' import { rm } from 'node:fs/promises' import { resolve } from 'node:path' -import type { DatabaseInitializationService } from '../database-initialization/database-initialization.service' -import type { PluginManagementService } from '../plugin-management/plugin-management.service' +import { DatabaseInitializationService } from '../database-initialization/database-initialization.service' +import { PluginManagementService } from '../plugin-management/plugin-management.service' @Injectable() export class ApplicationInitializationService { private readonly logger = new Logger(ApplicationInitializationService.name) constructor( - private readonly configurationService: ConfigurationService, - private readonly pluginManagementService: PluginManagementService, - private readonly databaseInitializationService: DatabaseInitializationService, - private readonly databaseService: DatabaseService, + @Inject(ConfigurationService) private readonly configurationService: ConfigurationService, + @Inject(PluginManagementService) private readonly pluginManagementService: PluginManagementService, + @Inject(DatabaseInitializationService) private readonly databaseInitializationService: DatabaseInitializationService, + @Inject(DatabaseService) private readonly databaseService: DatabaseService, ) { this.handleExit() } diff --git a/apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts b/apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts index 2aebfa3bd..6cb42781a 100644 --- a/apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts +++ b/apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts @@ -2,13 +2,16 @@ import type { TestingModule } from '@nestjs/testing' import { Test } from '@nestjs/testing' import { AppService } from './app.service' +import { ConfigurationModule } from '@/cpin-module/infrastructure/configuration/configuration.module' +import { FastifyService } from '../fastify/fastify.service' describe('appService', () => { let service: AppService beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - providers: [AppService], + imports: [ConfigurationModule], + providers: [AppService, FastifyService], }).compile() service = module.get(AppService) diff --git a/apps/server-nestjs/src/cpin-module/core/app/app.service.ts b/apps/server-nestjs/src/cpin-module/core/app/app.service.ts index 3a0b070af..a81c61132 100644 --- a/apps/server-nestjs/src/cpin-module/core/app/app.service.ts +++ b/apps/server-nestjs/src/cpin-module/core/app/app.service.ts @@ -1,4 +1,4 @@ -import type { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' import { apiPrefix, getContract, @@ -16,14 +16,14 @@ import type { import fastifySession from '@fastify/session' import fastifySwagger from '@fastify/swagger' import fastifySwaggerUi from '@fastify/swagger-ui' -import { Injectable, Logger } from '@nestjs/common' +import { Inject, Injectable, Logger } from '@nestjs/common' import { generateOpenApi } from '@ts-rest/open-api' import fastify from 'fastify' import type { FastifyRequest } from 'fastify' import type { KeycloakOptions } from 'fastify-keycloak-adapter' import keycloak from 'fastify-keycloak-adapter' -import type { FastifyService } from '../fastify/fastify.service' +import { FastifyService } from '../fastify/fastify.service' interface KeycloakPayload { sub: string @@ -59,8 +59,8 @@ export class AppService { private readonly loggerService = new Logger(AppService.name) constructor( - private readonly configurationService: ConfigurationService, - private readonly fastifyService: FastifyService, + @Inject(ConfigurationService) private readonly configurationService: ConfigurationService, + @Inject(FastifyService) private readonly fastifyService: FastifyService, ) { this.keycloakConf = { appOrigin: diff --git a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts b/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts index f0a5ac44a..75bec62b1 100644 --- a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts +++ b/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts @@ -2,12 +2,14 @@ import type { TestingModule } from '@nestjs/testing' import { Test } from '@nestjs/testing' import { FastifyService } from './fastify.service' +import { ConfigurationModule } from '@/cpin-module/infrastructure/configuration/configuration.module' describe('fastifyService', () => { let service: FastifyService beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ + imports: [ConfigurationModule], providers: [FastifyService], }).compile() diff --git a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts b/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts index df67480e3..170dc6285 100644 --- a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts +++ b/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts @@ -1,15 +1,17 @@ -import type { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '@/cpin-module/infrastructure/configuration/configuration.service' import { loggerConfiguration } from '@/cpin-module/infrastructure/logger/logger.module' import { swaggerUiPath } from '@cpn-console/shared' import type { FastifySwaggerUiOptions } from '@fastify/swagger-ui' -import { Injectable } from '@nestjs/common' +import { Inject, Injectable } from '@nestjs/common' import type { generateOpenApi } from '@ts-rest/open-api' import type { FastifyServerOptions } from 'fastify' import { randomUUID } from 'node:crypto' @Injectable() export class FastifyService { - constructor(private readonly configurationService: ConfigurationService) { + constructor( + @Inject(ConfigurationService) private readonly configurationService: ConfigurationService, + ) { this.fastifyConf = { maxParamLength: 5000, logger: diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts b/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts index 3e398c37e..48084da3d 100644 --- a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts +++ b/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts @@ -2,12 +2,14 @@ import type { TestingModule } from '@nestjs/testing' import { Test } from '@nestjs/testing' import { DatabaseService } from './database.service' +import { ConfigurationModule } from '../configuration/configuration.module' describe('databaseService', () => { let service: DatabaseService beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ + imports: [ConfigurationModule], providers: [DatabaseService], }).compile() diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts b/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts index 62bcc9481..77e62d4ed 100644 --- a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts +++ b/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts @@ -1,14 +1,13 @@ import prisma from '@/prisma' -import { Injectable, Logger } from '@nestjs/common' +import { Inject, Injectable, Logger } from '@nestjs/common' import { setTimeout } from 'node:timers/promises' - -import type { ConfigurationService } from '../configuration/configuration.service' +import { ConfigurationService } from '../configuration/configuration.service' @Injectable() export class DatabaseService { private readonly loggerService = new Logger(DatabaseService.name) - constructor(private readonly configurationService: ConfigurationService) { + constructor(@Inject(ConfigurationService) private readonly configurationService: ConfigurationService) { this.DELAY_BEFORE_RETRY = this.configurationService.isTest || this.configurationService.isCI ? 1000