From 402fe556265ba2cfc6327c1113df8db60881206e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20TR=C3=89BEL=20=28Perso=29?= Date: Mon, 27 Apr 2026 08:40:39 +0200 Subject: [PATCH 1/4] chore(server-nestjs): remove useless HttpClientService --- .../http-client/http-client.service.spec.ts | 21 ------------------- .../http-client/http-client.service.ts | 4 ---- .../infrastructure/infrastructure.module.ts | 5 ++--- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.spec.ts delete mode 100644 apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.spec.ts b/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.spec.ts deleted file mode 100644 index 0d730e8022..0000000000 --- a/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { TestingModule } from '@nestjs/testing' -import { Test } from '@nestjs/testing' -import { beforeEach, describe, expect, it } from 'vitest' - -import { HttpClientService } from './http-client.service' - -describe('httpClientService', () => { - let service: HttpClientService - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [HttpClientService], - }).compile() - - service = module.get(HttpClientService) - }) - - it('should be defined', () => { - expect(service).toBeDefined() - }) -}) diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.ts b/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.ts deleted file mode 100644 index a72aeda504..0000000000 --- a/apps/server-nestjs/src/cpin-module/infrastructure/http-client/http-client.service.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Injectable } from '@nestjs/common' - -@Injectable() -export class HttpClientService {} diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts b/apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts index 833f953a68..847c376bac 100644 --- a/apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts +++ b/apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts @@ -2,14 +2,13 @@ import { Module } from '@nestjs/common' import { ConfigurationModule } from './configuration/configuration.module' import { DatabaseModule } from './database/database.module' -import { HttpClientService } from './http-client/http-client.service' import { LoggerModule } from './logger/logger.module' import { ServerService } from './server/server.service' import { TelemetryModule } from './telemetry/telemetry.module' @Module({ - providers: [HttpClientService, ServerService], + providers: [ServerService], imports: [DatabaseModule, LoggerModule, ConfigurationModule, TelemetryModule], - exports: [DatabaseModule, HttpClientService, ServerService], + exports: [DatabaseModule, ServerService], }) export class InfrastructureModule {} From 4834a48c9e582d8587b2188e87de048bed8dec95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20TR=C3=89BEL=20=28Perso=29?= Date: Mon, 27 Apr 2026 08:42:23 +0200 Subject: [PATCH 2/4] chore(server-nestjs): remove useless CpinModule core modules --- .../cpin-module/core/app/app.service.spec.ts | 24 --- .../src/cpin-module/core/app/app.service.ts | 175 ------------------ .../src/cpin-module/core/core.module.ts | 4 +- .../core/fastify/fastify.service.spec.ts | 23 --- .../core/fastify/fastify.service.ts | 62 ------- 5 files changed, 1 insertion(+), 287 deletions(-) delete mode 100644 apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts delete mode 100644 apps/server-nestjs/src/cpin-module/core/app/app.service.ts delete mode 100644 apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts delete mode 100644 apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts 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 deleted file mode 100644 index 49e3cf9009..0000000000 --- a/apps/server-nestjs/src/cpin-module/core/app/app.service.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { TestingModule } from '@nestjs/testing' -import { Test } from '@nestjs/testing' -import { beforeEach, describe, expect, it } from 'vitest' - -import { ConfigurationModule } from '../../infrastructure/configuration/configuration.module' -import { FastifyService } from '../fastify/fastify.service' -import { AppService } from './app.service' - -describe('appService', () => { - let service: AppService - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - imports: [ConfigurationModule], - providers: [AppService, FastifyService], - }).compile() - - service = module.get(AppService) - }) - - it('should be defined', () => { - expect(service).toBeDefined() - }) -}) 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 deleted file mode 100644 index 0b807b7e9b..0000000000 --- a/apps/server-nestjs/src/cpin-module/core/app/app.service.ts +++ /dev/null @@ -1,175 +0,0 @@ -import type { - FastifySessionObject, - FastifySessionOptions, -} from '@fastify/session' -import type { FastifyRequest } from 'fastify' -import type { KeycloakOptions } from 'fastify-keycloak-adapter' -import { - apiPrefix, - getContract, - serviceContract, - swaggerUiPath, - systemContract, - tokenHeaderName, -} from '@cpn-console/shared' -import fastifyCookie from '@fastify/cookie' -import helmet from '@fastify/helmet' -import fastifySession from '@fastify/session' -import fastifySwagger from '@fastify/swagger' -import fastifySwaggerUi from '@fastify/swagger-ui' -import { Inject, Injectable, Logger } from '@nestjs/common' -import { generateOpenApi } from '@ts-rest/open-api' -import fastify from 'fastify' -import keycloak from 'fastify-keycloak-adapter' -import { ConfigurationService } from '../../infrastructure/configuration/configuration.service' - -import { FastifyService } from '../fastify/fastify.service' - -interface KeycloakPayload { - sub: string - email: string - given_name: string - family_name: string - groups: string[] -} - -interface FastifySessionObjectWithUser extends FastifySessionObject { - user: { id: string } -} - -function userPayloadMapper(userPayload: KeycloakPayload) { - return { - id: userPayload.sub, - email: userPayload.email, - firstName: userPayload.given_name, - lastName: userPayload.family_name, - groups: userPayload.groups || [], - } -} - -function bypassFn(request: FastifyRequest) { - try { - return !!request.headers[tokenHeaderName] - } catch {} - return false -} - -@Injectable() -export class AppService { - private readonly loggerService = new Logger(AppService.name) - - constructor( - @Inject(ConfigurationService) private readonly configurationService: ConfigurationService, - @Inject(FastifyService) private readonly fastifyService: FastifyService, - ) { - this.keycloakConf = { - appOrigin: - this.configurationService.keycloakRedirectUri - ?? 'http://localhost:8080', - keycloakSubdomain: `${this.configurationService.keycloakDomain}/realms/${this.configurationService.keycloakRealm}`, - clientId: this.configurationService.keycloakClientId ?? '', - clientSecret: this.configurationService.keycloakClientSecret ?? '', - useHttps: this.configurationService.keycloakProtocol === 'https', - disableCookiePlugin: true, - disableSessionPlugin: true, - // @ts-ignore - userPayloadMapper, - retries: 5, - excludedPatterns: [ - systemContract.getVersion.path, - systemContract.getHealth.path, - serviceContract.getServiceHealth.path, - `${swaggerUiPath}/**`, - ], - bypassFn, - } - - this.sessionConf = { - cookieName: 'sessionId', - secret: - this.configurationService.sessionSecret - || 'a-very-strong-secret-with-more-than-32-char', - cookie: { - httpOnly: true, - secure: true, - maxAge: 1_800_000, - }, - } - } - - keycloakConf!: KeycloakOptions - sessionConf!: FastifySessionOptions - - async startApp() { - const openApiDocument = generateOpenApi( - await getContract() as any, - this.fastifyService.swaggerConf, - { setOperationId: true }, - ) - - const app = fastify(this.fastifyService.fastifyConf) - .register(helmet, () => ({ - contentSecurityPolicy: !( - this.configurationService.isInt - || this.configurationService.isDev - || this.configurationService.isTest - ), - })) - .register(fastifyCookie) - .register(fastifySession, this.sessionConf) - // @ts-ignore - .register(keycloak, this.keycloakConf) - .register(fastifySwagger, { - transformObject: () => openApiDocument, - }) - .register(fastifySwaggerUi, this.fastifyService.swaggerUiConf) - .addHook('onRoute', (opts) => { - if (opts.path === `${apiPrefix}/healthz`) { - opts.logLevel = 'silent' - } - }) - .setErrorHandler((error: Error, req: { id: string }, reply) => { - const statusCode = 500 - // @ts-ignore vérifier l'objet - const message = error.description || error.message - reply.status(statusCode).send({ - status: statusCode, - error: message, - stack: error.stack, - }) - this.loggerService.log('info', { reqId: req.id, error }) - }) - .addHook('onResponse', (req, res) => { - if (res.statusCode < 400) { - req.log.info({ - status: res.statusCode, - userId: ( - req.session as - | FastifySessionObjectWithUser - | undefined - )?.user?.id, - }) - } else if (res.statusCode < 500) { - req.log.warn({ - status: res.statusCode, - userId: ( - req.session as - | FastifySessionObjectWithUser - | undefined - )?.user?.id, - }) - } else { - req.log.error({ - status: res.statusCode, - userId: ( - req.session as - | FastifySessionObjectWithUser - | undefined - )?.user?.id, - }) - } - }) - - await app.ready() - } -} diff --git a/apps/server-nestjs/src/cpin-module/core/core.module.ts b/apps/server-nestjs/src/cpin-module/core/core.module.ts index b1dee3fd19..8244afd2c7 100644 --- a/apps/server-nestjs/src/cpin-module/core/core.module.ts +++ b/apps/server-nestjs/src/cpin-module/core/core.module.ts @@ -2,11 +2,9 @@ import { Module } from '@nestjs/common' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' -import { AppService } from './app/app.service' -import { FastifyService } from './fastify/fastify.service' @Module({ imports: [ConfigurationModule, InfrastructureModule], - providers: [AppService, FastifyService], + providers: [], }) export class CoreModule {} 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 deleted file mode 100644 index 1d21703f0d..0000000000 --- a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { TestingModule } from '@nestjs/testing' -import { Test } from '@nestjs/testing' -import { beforeEach, describe, expect, it } from 'vitest' - -import { ConfigurationModule } from '../../infrastructure/configuration/configuration.module' -import { FastifyService } from './fastify.service' - -describe('fastifyService', () => { - let service: FastifyService - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - imports: [ConfigurationModule], - providers: [FastifyService], - }).compile() - - service = module.get(FastifyService) - }) - - it('should be defined', () => { - expect(service).toBeDefined() - }) -}) 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 deleted file mode 100644 index 4a9e20e55e..0000000000 --- a/apps/server-nestjs/src/cpin-module/core/fastify/fastify.service.ts +++ /dev/null @@ -1,62 +0,0 @@ -import type { FastifySwaggerUiOptions } from '@fastify/swagger-ui' -import type { generateOpenApi } from '@ts-rest/open-api' -import type { FastifyServerOptions } from 'fastify' -import { randomUUID } from 'node:crypto' -import { getLoggerOptions } from '@cpn-console/logger' -import { swaggerUiPath } from '@cpn-console/shared' -import { Inject, Injectable } from '@nestjs/common' -import { ConfigurationService } from '../../infrastructure/configuration/configuration.service' - -@Injectable() -export class FastifyService { - constructor( - @Inject(ConfigurationService) private readonly configurationService: ConfigurationService, - ) { - this.fastifyConf = { - maxParamLength: 5000, - logger: getLoggerOptions(this.configurationService.isProd ? 'production' : 'development', this.configurationService.isTest ? 'info' : 'debug'), - genReqId: () => randomUUID(), - } - - this.swaggerConf = { - info: { - title: 'Console Cloud Pi Native', - description: 'API de gestion des ressources Cloud Pi Native.', - version: this.configurationService.appVersion, - }, - - externalDocs: this.externalDocs, - servers: [ - { - url: this.configurationService.keycloakRedirectUri, - }, - ], - } - - this.swaggerUiConf = { - routePrefix: swaggerUiPath, - uiConfig: { - docExpansion: 'list', - deepLinking: false, - }, - initOAuth: { - clientId: this.configurationService.keycloakClientId, - clientSecret: this.configurationService.keycloakClientSecret, - realm: this.configurationService.keycloakRealm, - appName: 'Cloud Pi Native', - scopes: 'openid generic', - }, - } - } - - fastifyConf!: FastifyServerOptions - - externalDocs = { - description: 'External documentation.', - url: 'https://cloud-pi-native.fr', - } - - swaggerConf: Parameters[1] - - swaggerUiConf: FastifySwaggerUiOptions -} From 5f00ba894f1e41e87c3edfd90532e83d4deed783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20TR=C3=89BEL=20=28Perso=29?= Date: Mon, 27 Apr 2026 08:47:37 +0200 Subject: [PATCH 3/4] chore(server-nestjs): move infrastructure modules from cpin-module to modules directory --- .../src/cpin-module/core/core.module.ts | 10 ---------- apps/server-nestjs/src/cpin-module/cpin.module.ts | 15 --------------- apps/server-nestjs/src/main.module.ts | 2 -- apps/server-nestjs/src/main.ts | 2 +- .../modules/argocd/argocd-datastore.service.ts | 2 +- .../src/modules/argocd/argocd-health.service.ts | 2 +- .../src/modules/argocd/argocd.module.ts | 4 ++-- .../src/modules/argocd/argocd.service.spec.ts | 2 +- .../src/modules/argocd/argocd.service.ts | 4 ++-- .../modules/gitlab/gitlab-client.service.spec.ts | 2 +- .../src/modules/gitlab/gitlab-client.service.ts | 2 +- .../modules/gitlab/gitlab-datastore.service.ts | 2 +- .../src/modules/gitlab/gitlab-health.service.ts | 2 +- .../src/modules/gitlab/gitlab.module.ts | 6 +++--- .../src/modules/gitlab/gitlab.service.spec.ts | 2 +- .../src/modules/gitlab/gitlab.service.ts | 4 ++-- .../src/modules/healthz/healthz.controller.ts | 2 +- .../src/modules/healthz/healthz.module.ts | 2 +- .../auth/admin-permission.decorator.ts | 0 .../auth/admin-permission.guard.spec.ts | 0 .../infrastructure/auth/admin-permission.guard.ts | 0 .../infrastructure/auth/auth.module.ts | 0 .../infrastructure/auth/auth.service.spec.ts | 0 .../infrastructure/auth/auth.service.ts | 0 .../configuration/configuration.module.ts | 0 .../configuration/configuration.service.spec.ts | 0 .../configuration/configuration.service.ts | 0 .../database/database-health.service.ts | 0 .../infrastructure/database/database.module.ts | 0 .../database/database.service.spec.ts | 0 .../infrastructure/database/database.service.ts | 0 .../infrastructure/database/prisma.service.ts | 0 .../infrastructure/infrastructure.module.ts | 0 .../infrastructure/logger/logger.module.ts | 0 .../infrastructure/server/server.service.spec.ts | 0 .../infrastructure/server/server.service.ts | 0 .../telemetry/telemetry.constants.ts | 0 .../telemetry/telemetry.decorator.ts | 0 .../infrastructure/telemetry/telemetry.module.ts | 0 .../infrastructure/telemetry/telemetry.service.ts | 0 .../modules/keycloak/keycloak-client.service.ts | 4 ++-- .../keycloak/keycloak-datastore.service.ts | 2 +- .../modules/keycloak/keycloak-health.service.ts | 2 +- .../src/modules/keycloak/keycloak.module.ts | 6 +++--- .../src/modules/keycloak/keycloak.service.spec.ts | 2 +- .../src/modules/keycloak/keycloak.service.ts | 2 +- .../service-chain/open-cds-client.service.spec.ts | 2 +- .../service-chain/open-cds-client.service.ts | 2 +- .../service-chain.controller.spec.ts | 2 +- .../service-chain/service-chain.controller.ts | 4 ++-- .../modules/service-chain/service-chain.module.ts | 4 ++-- .../service-chain/service-chain.service.ts | 2 +- .../modules/vault/vault-client.service.spec.ts | 2 +- .../src/modules/vault/vault-client.service.ts | 4 ++-- .../src/modules/vault/vault-datastore.service.ts | 2 +- .../src/modules/vault/vault-health.service.ts | 2 +- .../modules/vault/vault-http-client.service.ts | 4 ++-- .../src/modules/vault/vault.module.ts | 4 ++-- .../src/modules/vault/vault.service.spec.ts | 2 +- .../src/modules/vault/vault.service.ts | 4 ++-- .../src/modules/version/version.controller.ts | 2 +- .../src/modules/version/version.module.ts | 2 +- apps/server-nestjs/test/argocd.e2e-spec.ts | 8 ++++---- apps/server-nestjs/test/gitlab.e2e-spec.ts | 8 ++++---- apps/server-nestjs/test/keycloak.e2e-spec.ts | 6 +++--- apps/server-nestjs/test/vault.e2e-spec.ts | 6 +++--- 66 files changed, 65 insertions(+), 92 deletions(-) delete mode 100644 apps/server-nestjs/src/cpin-module/core/core.module.ts delete mode 100644 apps/server-nestjs/src/cpin-module/cpin.module.ts rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/admin-permission.decorator.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/admin-permission.guard.spec.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/admin-permission.guard.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/auth.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/auth.service.spec.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/auth/auth.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/configuration/configuration.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/configuration/configuration.service.spec.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/configuration/configuration.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/database/database-health.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/database/database.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/database/database.service.spec.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/database/database.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/database/prisma.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/infrastructure.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/logger/logger.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/server/server.service.spec.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/server/server.service.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/telemetry/telemetry.constants.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/telemetry/telemetry.decorator.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/telemetry/telemetry.module.ts (100%) rename apps/server-nestjs/src/{cpin-module => modules}/infrastructure/telemetry/telemetry.service.ts (100%) diff --git a/apps/server-nestjs/src/cpin-module/core/core.module.ts b/apps/server-nestjs/src/cpin-module/core/core.module.ts deleted file mode 100644 index 8244afd2c7..0000000000 --- a/apps/server-nestjs/src/cpin-module/core/core.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from '@nestjs/common' - -import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' -import { InfrastructureModule } from '../infrastructure/infrastructure.module' - -@Module({ - imports: [ConfigurationModule, InfrastructureModule], - providers: [], -}) -export class CoreModule {} diff --git a/apps/server-nestjs/src/cpin-module/cpin.module.ts b/apps/server-nestjs/src/cpin-module/cpin.module.ts deleted file mode 100644 index c55fe724b9..0000000000 --- a/apps/server-nestjs/src/cpin-module/cpin.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Module } from '@nestjs/common' - -import { CoreModule } from './core/core.module' -import { InfrastructureModule } from './infrastructure/infrastructure.module' - -// This module host the old "server code" of our backend. -// It it means to be empty in the future, by extracting from it -// as many modules as possible ! -@Module({ - imports: [ - CoreModule, - InfrastructureModule, - ], -}) -export class CpinModule {} diff --git a/apps/server-nestjs/src/main.module.ts b/apps/server-nestjs/src/main.module.ts index dbac573216..300cef6962 100644 --- a/apps/server-nestjs/src/main.module.ts +++ b/apps/server-nestjs/src/main.module.ts @@ -1,7 +1,6 @@ import { Module } from '@nestjs/common' import { EventEmitterModule } from '@nestjs/event-emitter' import { ScheduleModule } from '@nestjs/schedule' -import { CpinModule } from './cpin-module/cpin.module' import { HealthzModule } from './modules/healthz/healthz.module' import { KeycloakModule } from './modules/keycloak/keycloak.module' import { ServiceChainModule } from './modules/service-chain/service-chain.module' @@ -9,7 +8,6 @@ import { VersionModule } from './modules/version/version.module' @Module({ imports: [ - CpinModule, EventEmitterModule.forRoot(), HealthzModule, KeycloakModule, diff --git a/apps/server-nestjs/src/main.ts b/apps/server-nestjs/src/main.ts index d1ab874414..e416212842 100644 --- a/apps/server-nestjs/src/main.ts +++ b/apps/server-nestjs/src/main.ts @@ -1,8 +1,8 @@ import { NestFactory } from '@nestjs/core' import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger' import { Logger } from 'nestjs-pino' -import { ConfigurationService } from './cpin-module/infrastructure/configuration/configuration.service' import { MainModule } from './main.module' +import { ConfigurationService } from './modules/infrastructure/configuration/configuration.service' async function bootstrap() { const app = await NestFactory.create(MainModule, { bufferLogs: true }) diff --git a/apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts b/apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts index ffe9d6a939..5ccb2f6b10 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts @@ -1,6 +1,6 @@ import type { Prisma } from '@prisma/client' import { Inject, Injectable } from '@nestjs/common' -import { PrismaService } from '../../cpin-module/infrastructure/database/prisma.service' +import { PrismaService } from '../infrastructure/database/prisma.service' export const projectSelect = { id: true, diff --git a/apps/server-nestjs/src/modules/argocd/argocd-health.service.ts b/apps/server-nestjs/src/modules/argocd/argocd-health.service.ts index f5959c3dd3..0a929bd6e4 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd-health.service.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd-health.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Injectable() export class ArgoCDHealthService { diff --git a/apps/server-nestjs/src/modules/argocd/argocd.module.ts b/apps/server-nestjs/src/modules/argocd/argocd.module.ts index b554561f94..2007d8b904 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd.module.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' -import { InfrastructureModule } from '../../cpin-module/infrastructure/infrastructure.module' import { GitlabModule } from '../gitlab/gitlab.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' +import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultModule } from '../vault/vault.module' import { ArgoCDDatastoreService } from './argocd-datastore.service' import { ArgoCDHealthService } from './argocd-health.service' diff --git a/apps/server-nestjs/src/modules/argocd/argocd.service.spec.ts b/apps/server-nestjs/src/modules/argocd/argocd.service.spec.ts index c98cd5db48..7434171ec7 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd.service.spec.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd.service.spec.ts @@ -5,9 +5,9 @@ import { generateNamespaceName } from '@cpn-console/shared' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it, vi } from 'vitest' import { stringify } from 'yaml' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' import { GitlabClientService } from '../gitlab/gitlab-client.service' import { makeCommitAction, makeProjectSchema, makeRepositoryTreeSchema } from '../gitlab/gitlab-testing.utils' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { VaultClientService } from '../vault/vault-client.service' import { ArgoCDDatastoreService } from './argocd-datastore.service' import { ArgoCDService } from './argocd.service' diff --git a/apps/server-nestjs/src/modules/argocd/argocd.service.ts b/apps/server-nestjs/src/modules/argocd/argocd.service.ts index 1dceaa7d6d..c3805363db 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd.service.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd.service.ts @@ -7,9 +7,9 @@ import { OnEvent } from '@nestjs/event-emitter' import { Cron, CronExpression } from '@nestjs/schedule' import { trace } from '@opentelemetry/api' import { stringify } from 'yaml' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' import { GitlabClientService } from '../gitlab/gitlab-client.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { VaultClientService } from '../vault/vault-client.service' import { ArgoCDDatastoreService } from './argocd-datastore.service' import { diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.spec.ts b/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.spec.ts index 928cbe5fed..e58c4e5d5f 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.spec.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.spec.ts @@ -4,7 +4,7 @@ import type { MockedFunction } from 'vitest' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it } from 'vitest' import { mockDeep, mockReset } from 'vitest-mock-extended' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { GITLAB_REST_CLIENT, GitlabClientService } from './gitlab-client.service' import { makeAccessTokenExposedSchema, diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.ts b/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.ts index 87a7c541ba..51fa121503 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab-client.service.ts @@ -20,8 +20,8 @@ import { readFile } from 'node:fs/promises' import { join } from 'node:path' import { GitbeakerRequestError } from '@gitbeaker/requester-utils' import { Inject, Injectable, Logger } from '@nestjs/common' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' import { find } from '../../utils/iterable' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { GROUP_ROOT_CUSTOM_ATTRIBUTE_KEY, INFRA_GROUP_CUSTOM_ATTRIBUTE_KEY, diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab-datastore.service.ts b/apps/server-nestjs/src/modules/gitlab/gitlab-datastore.service.ts index 3820f98632..55b9ba4392 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab-datastore.service.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab-datastore.service.ts @@ -1,6 +1,6 @@ import type { Prisma } from '@prisma/client' import { Inject, Injectable } from '@nestjs/common' -import { PrismaService } from '../../cpin-module/infrastructure/database/prisma.service' +import { PrismaService } from '../infrastructure/database/prisma.service' export const projectSelect = { id: true, diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab-health.service.ts b/apps/server-nestjs/src/modules/gitlab/gitlab-health.service.ts index 54ad2a6fcf..87346f32e5 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab-health.service.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab-health.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Injectable() export class GitlabHealthService { diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts b/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts index 954b10b84b..5b441eb09e 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts @@ -1,9 +1,9 @@ import { Gitlab } from '@gitbeaker/rest' import { Module } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { InfrastructureModule } from '../../cpin-module/infrastructure/infrastructure.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultModule } from '../vault/vault.module' import { GITLAB_REST_CLIENT, GitlabClientService } from './gitlab-client.service' import { GitlabDatastoreService } from './gitlab-datastore.service' diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab.service.spec.ts b/apps/server-nestjs/src/modules/gitlab/gitlab.service.spec.ts index 73e20821c7..6e3d062b58 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab.service.spec.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab.service.spec.ts @@ -4,7 +4,7 @@ import { faker } from '@faker-js/faker' import { AccessLevel } from '@gitbeaker/core' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { VaultClientService } from '../vault/vault-client.service' import { GitlabClientService } from './gitlab-client.service' import { GitlabDatastoreService } from './gitlab-datastore.service' diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab.service.ts b/apps/server-nestjs/src/modules/gitlab/gitlab.service.ts index a212959e09..cbcfb34bc6 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab.service.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab.service.ts @@ -7,9 +7,9 @@ import { Inject, Injectable, Logger } from '@nestjs/common' import { OnEvent } from '@nestjs/event-emitter' import { Cron, CronExpression } from '@nestjs/schedule' import { trace } from '@opentelemetry/api' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' import { getAll } from '../../utils/iterable' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { VaultClientService } from '../vault/vault-client.service' import { GitlabClientService } from './gitlab-client.service' import { GitlabDatastoreService } from './gitlab-datastore.service' diff --git a/apps/server-nestjs/src/modules/healthz/healthz.controller.ts b/apps/server-nestjs/src/modules/healthz/healthz.controller.ts index ab01a10357..24a54ba5c7 100644 --- a/apps/server-nestjs/src/modules/healthz/healthz.controller.ts +++ b/apps/server-nestjs/src/modules/healthz/healthz.controller.ts @@ -1,8 +1,8 @@ import { Controller, Get, Inject } from '@nestjs/common' import { HealthCheck, HealthCheckService } from '@nestjs/terminus' -import { DatabaseHealthService } from '../../cpin-module/infrastructure/database/database-health.service' import { ArgoCDHealthService } from '../argocd/argocd-health.service' import { GitlabHealthService } from '../gitlab/gitlab-health.service' +import { DatabaseHealthService } from '../infrastructure/database/database-health.service' import { KeycloakHealthService } from '../keycloak/keycloak-health.service' import { VaultHealthService } from '../vault/vault-health.service' diff --git a/apps/server-nestjs/src/modules/healthz/healthz.module.ts b/apps/server-nestjs/src/modules/healthz/healthz.module.ts index 995ae24a5f..8d78c3ea36 100644 --- a/apps/server-nestjs/src/modules/healthz/healthz.module.ts +++ b/apps/server-nestjs/src/modules/healthz/healthz.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common' import { TerminusModule } from '@nestjs/terminus' -import { DatabaseModule } from '../../cpin-module/infrastructure/database/database.module' import { ArgoCDModule } from '../argocd/argocd.module' import { GitlabModule } from '../gitlab/gitlab.module' +import { DatabaseModule } from '../infrastructure/database/database.module' import { KeycloakModule } from '../keycloak/keycloak.module' import { VaultModule } from '../vault/vault.module' import { HealthzController } from './healthz.controller' diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.decorator.ts b/apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.decorator.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.decorator.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.decorator.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.guard.spec.ts b/apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.guard.spec.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.guard.spec.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.guard.spec.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.guard.ts b/apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.guard.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/admin-permission.guard.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/admin-permission.guard.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.module.ts b/apps/server-nestjs/src/modules/infrastructure/auth/auth.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.module.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/auth.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.service.spec.ts b/apps/server-nestjs/src/modules/infrastructure/auth/auth.service.spec.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.service.spec.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/auth.service.spec.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.service.ts b/apps/server-nestjs/src/modules/infrastructure/auth/auth.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/auth/auth.service.ts rename to apps/server-nestjs/src/modules/infrastructure/auth/auth.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.module.ts b/apps/server-nestjs/src/modules/infrastructure/configuration/configuration.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.module.ts rename to apps/server-nestjs/src/modules/infrastructure/configuration/configuration.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.service.spec.ts b/apps/server-nestjs/src/modules/infrastructure/configuration/configuration.service.spec.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.service.spec.ts rename to apps/server-nestjs/src/modules/infrastructure/configuration/configuration.service.spec.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.service.ts b/apps/server-nestjs/src/modules/infrastructure/configuration/configuration.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/configuration/configuration.service.ts rename to apps/server-nestjs/src/modules/infrastructure/configuration/configuration.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database-health.service.ts b/apps/server-nestjs/src/modules/infrastructure/database/database-health.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/database/database-health.service.ts rename to apps/server-nestjs/src/modules/infrastructure/database/database-health.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.module.ts b/apps/server-nestjs/src/modules/infrastructure/database/database.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/database/database.module.ts rename to apps/server-nestjs/src/modules/infrastructure/database/database.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts b/apps/server-nestjs/src/modules/infrastructure/database/database.service.spec.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts rename to apps/server-nestjs/src/modules/infrastructure/database/database.service.spec.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts b/apps/server-nestjs/src/modules/infrastructure/database/database.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts rename to apps/server-nestjs/src/modules/infrastructure/database/database.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/database/prisma.service.ts b/apps/server-nestjs/src/modules/infrastructure/database/prisma.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/database/prisma.service.ts rename to apps/server-nestjs/src/modules/infrastructure/database/prisma.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts b/apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts rename to apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/logger/logger.module.ts b/apps/server-nestjs/src/modules/infrastructure/logger/logger.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/logger/logger.module.ts rename to apps/server-nestjs/src/modules/infrastructure/logger/logger.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/server/server.service.spec.ts b/apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/server/server.service.spec.ts rename to apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/server/server.service.ts b/apps/server-nestjs/src/modules/infrastructure/server/server.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/server/server.service.ts rename to apps/server-nestjs/src/modules/infrastructure/server/server.service.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.constants.ts b/apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.constants.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.constants.ts rename to apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.constants.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.decorator.ts b/apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.decorator.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.decorator.ts rename to apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.decorator.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.module.ts b/apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.module.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.module.ts rename to apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.module.ts diff --git a/apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.service.ts b/apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.service.ts similarity index 100% rename from apps/server-nestjs/src/cpin-module/infrastructure/telemetry/telemetry.service.ts rename to apps/server-nestjs/src/modules/infrastructure/telemetry/telemetry.service.ts diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak-client.service.ts b/apps/server-nestjs/src/modules/keycloak/keycloak-client.service.ts index 8e916c630f..3a28be82c4 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak-client.service.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak-client.service.ts @@ -5,8 +5,8 @@ import type { ProjectWithDetails } from './keycloak-datastore.service' import { Inject, Injectable, Logger } from '@nestjs/common' import { trace } from '@opentelemetry/api' import z from 'zod' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { CONSOLE_GROUP_NAME, SUBGROUPS_PAGINATE_QUERY_MAX } from './keycloak.constants' type With = T & Required> diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak-datastore.service.ts b/apps/server-nestjs/src/modules/keycloak/keycloak-datastore.service.ts index c66aef3e61..192259f58f 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak-datastore.service.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak-datastore.service.ts @@ -1,6 +1,6 @@ import type { Prisma } from '@prisma/client' import { Inject, Injectable } from '@nestjs/common' -import { PrismaService } from '../../cpin-module/infrastructure/database/prisma.service' +import { PrismaService } from '../infrastructure/database/prisma.service' export const projectSelect = { id: true, diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak-health.service.ts b/apps/server-nestjs/src/modules/keycloak/keycloak-health.service.ts index 126219e8ca..6cb9994459 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak-health.service.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak-health.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Injectable() export class KeycloakHealthService { diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts b/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts index b0889146c9..fef0cb47a7 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts @@ -1,9 +1,9 @@ import KcAdminClient from '@keycloak/keycloak-admin-client' import { Module } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { InfrastructureModule } from '../../cpin-module/infrastructure/infrastructure.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { KEYCLOAK_ADMIN_CLIENT, KeycloakClientService } from './keycloak-client.service' import { KeycloakDatastoreService } from './keycloak-datastore.service' import { KeycloakHealthService } from './keycloak-health.service' diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak.service.spec.ts b/apps/server-nestjs/src/modules/keycloak/keycloak.service.spec.ts index 577afebb08..704cb778d6 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak.service.spec.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak.service.spec.ts @@ -2,7 +2,7 @@ import type { Mocked } from 'vitest' import type { AdminRoleWithDetails, ProjectWithDetails, UserWithAdminRoles } from './keycloak-datastore.service' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { makeGroupRepresentation, makeProjectEnvironment, diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak.service.ts b/apps/server-nestjs/src/modules/keycloak/keycloak.service.ts index ad7eb4706d..8ecc199a06 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak.service.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak.service.ts @@ -7,7 +7,7 @@ import { OnEvent } from '@nestjs/event-emitter' import { Cron, CronExpression } from '@nestjs/schedule' import { trace } from '@opentelemetry/api' import z from 'zod' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { KeycloakClientService } from './keycloak-client.service' import { KeycloakDatastoreService } from './keycloak-datastore.service' import { CONSOLE_GROUP_NAME } from './keycloak.constants' diff --git a/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.spec.ts b/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.spec.ts index c1c120b34d..c4e3f55626 100644 --- a/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.spec.ts +++ b/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.spec.ts @@ -3,7 +3,7 @@ import type { Dispatcher, RequestInit } from 'undici' import { Test } from '@nestjs/testing' import { Agent, fetch, Headers, ProxyAgent, Response } from 'undici' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { OpenCdsClientError, OpenCdsClientService } from './open-cds-client.service' vi.mock('undici', async (importOriginal) => { diff --git a/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.ts b/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.ts index 28150b6f85..058f7dcbe0 100644 --- a/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.ts +++ b/apps/server-nestjs/src/modules/service-chain/open-cds-client.service.ts @@ -1,7 +1,7 @@ import type { Dispatcher, HeadersInit, Response } from 'undici' import { Inject, Injectable, Logger } from '@nestjs/common' import { Agent, fetch, Headers, ProxyAgent } from 'undici' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' const openCdsDisabledMessage = 'OpenCDS is disabled, please set OPENCDS_URL in your relevant .env file. See .env-example' diff --git a/apps/server-nestjs/src/modules/service-chain/service-chain.controller.spec.ts b/apps/server-nestjs/src/modules/service-chain/service-chain.controller.spec.ts index 3335f8392d..56675fcfe9 100644 --- a/apps/server-nestjs/src/modules/service-chain/service-chain.controller.spec.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain.controller.spec.ts @@ -4,7 +4,7 @@ import type { MockProxy } from 'vitest-mock-extended' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it } from 'vitest' import { mock } from 'vitest-mock-extended' -import { AdminPermissionGuard } from '../../cpin-module/infrastructure/auth/admin-permission.guard' +import { AdminPermissionGuard } from '../infrastructure/auth/admin-permission.guard' import { ServiceChainController } from './service-chain.controller' import { ServiceChainService } from './service-chain.service' diff --git a/apps/server-nestjs/src/modules/service-chain/service-chain.controller.ts b/apps/server-nestjs/src/modules/service-chain/service-chain.controller.ts index a7d9bf9830..d2d558996c 100644 --- a/apps/server-nestjs/src/modules/service-chain/service-chain.controller.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain.controller.ts @@ -8,8 +8,8 @@ import { Post, // UseGuards, } from '@nestjs/common' -// import { RequireAdminPermission } from '../../cpin-module/infrastructure/auth/admin-permission.decorator' -// import { AdminPermissionGuard } from '../../cpin-module/infrastructure/auth/admin-permission.guard' +// import { RequireAdminPermission } from '../infrastructure/auth/admin-permission.decorator' +// import { AdminPermissionGuard } from '../infrastructure/auth/admin-permission.guard' import { ServiceChainService } from './service-chain.service' @Controller('api/v1/service-chains') diff --git a/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts b/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts index 7ee16462f3..424d70f024 100644 --- a/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common' -import { AuthModule } from '../../cpin-module/infrastructure/auth/auth.module' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' +import { AuthModule } from '../infrastructure/auth/auth.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { OpenCdsClientService } from './open-cds-client.service' import { ServiceChainController } from './service-chain.controller' import { ServiceChainService } from './service-chain.service' diff --git a/apps/server-nestjs/src/modules/service-chain/service-chain.service.ts b/apps/server-nestjs/src/modules/service-chain/service-chain.service.ts index 161fa125ec..d40a031fdf 100644 --- a/apps/server-nestjs/src/modules/service-chain/service-chain.service.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain.service.ts @@ -5,7 +5,7 @@ import { ServiceChainListSchema, } from '@cpn-console/shared' import { Inject, Injectable } from '@nestjs/common' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { OpenCdsClientService } from './open-cds-client.service' @Injectable() diff --git a/apps/server-nestjs/src/modules/vault/vault-client.service.spec.ts b/apps/server-nestjs/src/modules/vault/vault-client.service.spec.ts index 08e2949fb4..6857d2f84b 100644 --- a/apps/server-nestjs/src/modules/vault/vault-client.service.spec.ts +++ b/apps/server-nestjs/src/modules/vault/vault-client.service.spec.ts @@ -2,7 +2,7 @@ import { Test } from '@nestjs/testing' import { http, HttpResponse } from 'msw' import { setupServer } from 'msw/node' import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { VaultClientService } from './vault-client.service' import { VaultError, VaultHttpClientService } from './vault-http-client.service' diff --git a/apps/server-nestjs/src/modules/vault/vault-client.service.ts b/apps/server-nestjs/src/modules/vault/vault-client.service.ts index 76612ecdba..f22e6879a9 100644 --- a/apps/server-nestjs/src/modules/vault/vault-client.service.ts +++ b/apps/server-nestjs/src/modules/vault/vault-client.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable, Logger } from '@nestjs/common' import { trace } from '@opentelemetry/api' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { VaultError, VaultHttpClientService } from './vault-http-client.service' import { generateGitlabMirrorCredPath, generateProjectPath, generateTechReadOnlyCredPath } from './vault.utils' diff --git a/apps/server-nestjs/src/modules/vault/vault-datastore.service.ts b/apps/server-nestjs/src/modules/vault/vault-datastore.service.ts index 6080c6bfb1..6cfae8d9af 100644 --- a/apps/server-nestjs/src/modules/vault/vault-datastore.service.ts +++ b/apps/server-nestjs/src/modules/vault/vault-datastore.service.ts @@ -1,6 +1,6 @@ import type { Prisma } from '@prisma/client' import { Inject, Injectable } from '@nestjs/common' -import { PrismaService } from '../../cpin-module/infrastructure/database/prisma.service' +import { PrismaService } from '../infrastructure/database/prisma.service' export const projectSelect = { id: true, diff --git a/apps/server-nestjs/src/modules/vault/vault-health.service.ts b/apps/server-nestjs/src/modules/vault/vault-health.service.ts index 33b01edbf9..5db057091f 100644 --- a/apps/server-nestjs/src/modules/vault/vault-health.service.ts +++ b/apps/server-nestjs/src/modules/vault/vault-health.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Injectable() export class VaultHealthService { diff --git a/apps/server-nestjs/src/modules/vault/vault-http-client.service.ts b/apps/server-nestjs/src/modules/vault/vault-http-client.service.ts index 71ae6a7373..7af75440af 100644 --- a/apps/server-nestjs/src/modules/vault/vault-http-client.service.ts +++ b/apps/server-nestjs/src/modules/vault/vault-http-client.service.ts @@ -1,8 +1,8 @@ import { Inject, Injectable, Logger } from '@nestjs/common' import { trace } from '@opentelemetry/api' import z from 'zod' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' export interface VaultFetchOptions { method?: string diff --git a/apps/server-nestjs/src/modules/vault/vault.module.ts b/apps/server-nestjs/src/modules/vault/vault.module.ts index 8281fb16ce..37af2e2bd3 100644 --- a/apps/server-nestjs/src/modules/vault/vault.module.ts +++ b/apps/server-nestjs/src/modules/vault/vault.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common' import { HealthIndicatorService } from '@nestjs/terminus' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' -import { InfrastructureModule } from '../../cpin-module/infrastructure/infrastructure.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' +import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultClientService } from './vault-client.service' import { VaultDatastoreService } from './vault-datastore.service' import { VaultHealthService } from './vault-health.service' diff --git a/apps/server-nestjs/src/modules/vault/vault.service.spec.ts b/apps/server-nestjs/src/modules/vault/vault.service.spec.ts index 673209ba2d..e0d217c52f 100644 --- a/apps/server-nestjs/src/modules/vault/vault.service.spec.ts +++ b/apps/server-nestjs/src/modules/vault/vault.service.spec.ts @@ -3,7 +3,7 @@ import type { Mocked } from 'vitest' import type { ProjectWithDetails, ZoneWithDetails } from './vault-datastore.service' import { Test } from '@nestjs/testing' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { VaultClientService } from './vault-client.service' import { VaultDatastoreService } from './vault-datastore.service' import { VaultService } from './vault.service' diff --git a/apps/server-nestjs/src/modules/vault/vault.service.ts b/apps/server-nestjs/src/modules/vault/vault.service.ts index 1fba011657..43b0eeb8be 100644 --- a/apps/server-nestjs/src/modules/vault/vault.service.ts +++ b/apps/server-nestjs/src/modules/vault/vault.service.ts @@ -3,8 +3,8 @@ import { Inject, Injectable, Logger } from '@nestjs/common' import { OnEvent } from '@nestjs/event-emitter' import { Cron, CronExpression } from '@nestjs/schedule' import { trace } from '@opentelemetry/api' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' -import { StartActiveSpan } from '../../cpin-module/infrastructure/telemetry/telemetry.decorator' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' +import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator' import { VaultClientService } from './vault-client.service' import { VaultDatastoreService } from './vault-datastore.service' import { VaultError } from './vault-http-client.service' diff --git a/apps/server-nestjs/src/modules/version/version.controller.ts b/apps/server-nestjs/src/modules/version/version.controller.ts index f93835e00e..16ce328f70 100644 --- a/apps/server-nestjs/src/modules/version/version.controller.ts +++ b/apps/server-nestjs/src/modules/version/version.controller.ts @@ -1,5 +1,5 @@ import { Controller, Get, Inject } from '@nestjs/common' -import { ConfigurationService } from '../../cpin-module/infrastructure/configuration/configuration.service' +import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Controller('api/v1/version') export class VersionController { diff --git a/apps/server-nestjs/src/modules/version/version.module.ts b/apps/server-nestjs/src/modules/version/version.module.ts index 901c94994a..cdf9b30c39 100644 --- a/apps/server-nestjs/src/modules/version/version.module.ts +++ b/apps/server-nestjs/src/modules/version/version.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common' -import { ConfigurationModule } from '../../cpin-module/infrastructure/configuration/configuration.module' +import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { VersionController } from './version.controller' @Module({ diff --git a/apps/server-nestjs/test/argocd.e2e-spec.ts b/apps/server-nestjs/test/argocd.e2e-spec.ts index 1c89e31590..06643e19aa 100644 --- a/apps/server-nestjs/test/argocd.e2e-spec.ts +++ b/apps/server-nestjs/test/argocd.e2e-spec.ts @@ -4,14 +4,14 @@ import { faker } from '@faker-js/faker' import { Test } from '@nestjs/testing' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' import { parse } from 'yaml' -import { ConfigurationModule } from '../src/cpin-module/infrastructure/configuration/configuration.module' -import { ConfigurationService } from '../src/cpin-module/infrastructure/configuration/configuration.service' -import { PrismaService } from '../src/cpin-module/infrastructure/database/prisma.service' -import { InfrastructureModule } from '../src/cpin-module/infrastructure/infrastructure.module' import { projectSelect } from '../src/modules/argocd/argocd-datastore.service' import { ArgoCDModule } from '../src/modules/argocd/argocd.module' import { ArgoCDService } from '../src/modules/argocd/argocd.service' import { GITLAB_REST_CLIENT, GitlabClientService } from '../src/modules/gitlab/gitlab-client.service' +import { ConfigurationModule } from '../src/modules/infrastructure/configuration/configuration.module' +import { ConfigurationService } from '../src/modules/infrastructure/configuration/configuration.service' +import { PrismaService } from '../src/modules/infrastructure/database/prisma.service' +import { InfrastructureModule } from '../src/modules/infrastructure/infrastructure.module' import { VaultClientService } from '../src/modules/vault/vault-client.service' const canRunArgoCDE2E diff --git a/apps/server-nestjs/test/gitlab.e2e-spec.ts b/apps/server-nestjs/test/gitlab.e2e-spec.ts index 6ee80faad5..56e28abab3 100644 --- a/apps/server-nestjs/test/gitlab.e2e-spec.ts +++ b/apps/server-nestjs/test/gitlab.e2e-spec.ts @@ -4,14 +4,14 @@ import { faker } from '@faker-js/faker' import { Test } from '@nestjs/testing' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' import z from 'zod' -import { ConfigurationModule } from '../src/cpin-module/infrastructure/configuration/configuration.module' -import { ConfigurationService } from '../src/cpin-module/infrastructure/configuration/configuration.service' -import { PrismaService } from '../src/cpin-module/infrastructure/database/prisma.service' -import { InfrastructureModule } from '../src/cpin-module/infrastructure/infrastructure.module' import { GITLAB_REST_CLIENT, GitlabClientService } from '../src/modules/gitlab/gitlab-client.service' import { projectSelect } from '../src/modules/gitlab/gitlab-datastore.service' import { GitlabModule } from '../src/modules/gitlab/gitlab.module' import { GitlabService } from '../src/modules/gitlab/gitlab.service' +import { ConfigurationModule } from '../src/modules/infrastructure/configuration/configuration.module' +import { ConfigurationService } from '../src/modules/infrastructure/configuration/configuration.service' +import { PrismaService } from '../src/modules/infrastructure/database/prisma.service' +import { InfrastructureModule } from '../src/modules/infrastructure/infrastructure.module' import { VaultClientService } from '../src/modules/vault/vault-client.service' const canRunGitlabE2E diff --git a/apps/server-nestjs/test/keycloak.e2e-spec.ts b/apps/server-nestjs/test/keycloak.e2e-spec.ts index 82af95f741..c5eb924602 100644 --- a/apps/server-nestjs/test/keycloak.e2e-spec.ts +++ b/apps/server-nestjs/test/keycloak.e2e-spec.ts @@ -5,9 +5,9 @@ import { Logger } from '@nestjs/common' import { Test } from '@nestjs/testing' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' import z from 'zod' -import { ConfigurationModule } from '../src/cpin-module/infrastructure/configuration/configuration.module' -import { PrismaService } from '../src/cpin-module/infrastructure/database/prisma.service' -import { InfrastructureModule } from '../src/cpin-module/infrastructure/infrastructure.module' +import { ConfigurationModule } from '../src/modules/infrastructure/configuration/configuration.module' +import { PrismaService } from '../src/modules/infrastructure/database/prisma.service' +import { InfrastructureModule } from '../src/modules/infrastructure/infrastructure.module' import { KEYCLOAK_ADMIN_CLIENT, KeycloakClientService } from '../src/modules/keycloak/keycloak-client.service' import { projectSelect } from '../src/modules/keycloak/keycloak-datastore.service' import { KeycloakModule } from '../src/modules/keycloak/keycloak.module' diff --git a/apps/server-nestjs/test/vault.e2e-spec.ts b/apps/server-nestjs/test/vault.e2e-spec.ts index 0fa5941c37..6c34f746ea 100644 --- a/apps/server-nestjs/test/vault.e2e-spec.ts +++ b/apps/server-nestjs/test/vault.e2e-spec.ts @@ -2,9 +2,9 @@ import type { TestingModule } from '@nestjs/testing' import { faker } from '@faker-js/faker' import { Test } from '@nestjs/testing' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' -import { ConfigurationModule } from '../src/cpin-module/infrastructure/configuration/configuration.module' -import { PrismaService } from '../src/cpin-module/infrastructure/database/prisma.service' -import { InfrastructureModule } from '../src/cpin-module/infrastructure/infrastructure.module' +import { ConfigurationModule } from '../src/modules/infrastructure/configuration/configuration.module' +import { PrismaService } from '../src/modules/infrastructure/database/prisma.service' +import { InfrastructureModule } from '../src/modules/infrastructure/infrastructure.module' import { VaultClientService } from '../src/modules/vault/vault-client.service' import { projectSelect } from '../src/modules/vault/vault-datastore.service' import { VaultModule } from '../src/modules/vault/vault.module' From fa4116343e089c5309ac98506cff1fa388ec5146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20TR=C3=89BEL=20=28Perso=29?= Date: Mon, 27 Apr 2026 14:03:51 +0200 Subject: [PATCH 4/4] chore(server-nestjs): remove useless ServerService service --- .../infrastructure/infrastructure.module.ts | 5 ++--- .../server/server.service.spec.ts | 21 ------------------- .../infrastructure/server/server.service.ts | 12 ----------- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts delete mode 100644 apps/server-nestjs/src/modules/infrastructure/server/server.service.ts diff --git a/apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts b/apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts index 847c376bac..3f12f73cec 100644 --- a/apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts +++ b/apps/server-nestjs/src/modules/infrastructure/infrastructure.module.ts @@ -3,12 +3,11 @@ import { Module } from '@nestjs/common' import { ConfigurationModule } from './configuration/configuration.module' import { DatabaseModule } from './database/database.module' import { LoggerModule } from './logger/logger.module' -import { ServerService } from './server/server.service' import { TelemetryModule } from './telemetry/telemetry.module' @Module({ - providers: [ServerService], + providers: [], imports: [DatabaseModule, LoggerModule, ConfigurationModule, TelemetryModule], - exports: [DatabaseModule, ServerService], + exports: [DatabaseModule], }) export class InfrastructureModule {} diff --git a/apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts b/apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts deleted file mode 100644 index c4af0a9081..0000000000 --- a/apps/server-nestjs/src/modules/infrastructure/server/server.service.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { TestingModule } from '@nestjs/testing' -import { Test } from '@nestjs/testing' -import { beforeEach, describe, expect, it } from 'vitest' - -import { ServerService } from './server.service' - -describe('serverService', () => { - let service: ServerService - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - providers: [ServerService], - }).compile() - - service = module.get(ServerService) - }) - - it('should be defined', () => { - expect(service).toBeDefined() - }) -}) diff --git a/apps/server-nestjs/src/modules/infrastructure/server/server.service.ts b/apps/server-nestjs/src/modules/infrastructure/server/server.service.ts deleted file mode 100644 index e23366018e..0000000000 --- a/apps/server-nestjs/src/modules/infrastructure/server/server.service.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Injectable } from '@nestjs/common' -import { initServer } from '@ts-rest/fastify' - -@Injectable() -// @TODO is this still necessary ? -export class ServerService { - serverInstance!: any - - constructor() { - this.serverInstance = initServer() - } -}