fix: import missing health module

apps/server-nestjs/package.json

@@ -43,6 +43,7 @@
     "@nestjs/config": "^4.0.3",
     "@nestjs/core": "^11.1.16",
     "@nestjs/platform-express": "^11.1.16",
+    "@nestjs/terminus": "^11.1.1",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/auto-instrumentations-node": "^0.70.1",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0.213.0",

apps/server-nestjs/src/cpin-module/application-initialization/application-initialization-service/application-initialization.service.spec.ts

@@ -19,6 +19,7 @@ describe('applicationInitializationServiceService', () => {
         PluginManagementService,
         DatabaseInitializationService,
         DatabaseService,
+        PrismaService,
       ],
     }).compile()
 

apps/server-nestjs/src/cpin-module/application-initialization/database-initialization/database-initialization.service.spec.ts

@@ -2,14 +2,18 @@ import type { TestingModule } from '@nestjs/testing'
 import { Test } from '@nestjs/testing'
 import { beforeEach, describe, expect, it } from 'vitest'
 
+import { PrismaService } from '../../infrastructure/database/prisma.service'
 import { DatabaseInitializationService } from './database-initialization.service'
 
 describe('databaseInitializationService', () => {
   let service: DatabaseInitializationService
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [DatabaseInitializationService],
+      providers: [
+        DatabaseInitializationService,
+        PrismaService,
+      ],
     }).compile()
 
     service = module.get<DatabaseInitializationService>(

apps/server-nestjs/src/cpin-module/application-initialization/database-initialization/database-initialization.service.ts

@@ -1,16 +1,11 @@
-import { Injectable, Logger } from '@nestjs/common'
-import prisma from '../../../prisma'
+import { Inject, Injectable, Logger } from '@nestjs/common'
+import { PrismaService } from '../../infrastructure/database/prisma.service'
 
 import { modelKeys } from './utils'
 
-type ExtractKeysWithFields<T> = {
-  [K in keyof T]: T[K] extends { fields: any } ? K : never;
-}[keyof T]
-
-type Models = ExtractKeysWithFields<typeof prisma>
-
-type Imports = Partial<Record<Models, object[]>> & {
-  associations: [Models, any[]]
+type ModelKey = (typeof modelKeys)[number]
+type Imports = Partial<Record<ModelKey, object[]>> & {
+  associations: [ModelKey, any[]][]
 }
 
 @Injectable()
@@ -19,6 +14,8 @@ export class DatabaseInitializationService {
     DatabaseInitializationService.name,
   )
 
+  constructor(@Inject(PrismaService) private readonly prisma: PrismaService) {}
+
   async initDb(data: Imports) {
     const dataStringified = JSON.stringify(data)
     const dataParsed = JSON.parse(dataStringified, (key, value) => {

apps/server-nestjs/src/cpin-module/infrastructure/database/database-health.service.ts

@@ -0,0 +1,23 @@
+import { Inject, Injectable } from '@nestjs/common'
+import { HealthIndicatorService } from '@nestjs/terminus'
+import { PrismaService } from './prisma.service'
+
+@Injectable()
+export class DatabaseHealthService {
+  constructor(
+    @Inject(PrismaService) private readonly prisma: PrismaService,
+    @Inject(HealthIndicatorService) private readonly healthIndicator: HealthIndicatorService,
+  ) {}
+
+  async check(key: string) {
+    const indicator = this.healthIndicator.check(key)
+    try {
+      await this.prisma.$queryRaw`SELECT 1`
+      return indicator.up()
+    } catch (error) {
+      return indicator.down({
+        message: error instanceof Error ? error.message : String(error),
+      })
+    }
+  }
+}

apps/server-nestjs/src/cpin-module/infrastructure/database/database.module.ts

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common'
+import { HealthIndicatorService } from '@nestjs/terminus'
+import { ConfigurationModule } from '../configuration/configuration.module'
+import { DatabaseHealthService } from './database-health.service'
+import { DatabaseService } from './database.service'
+import { PrismaService } from './prisma.service'
+
+@Module({
+  imports: [ConfigurationModule],
+  providers: [HealthIndicatorService, DatabaseHealthService, DatabaseService, PrismaService],
+  exports: [DatabaseHealthService, DatabaseService, PrismaService],
+})
+export class DatabaseModule {}

apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.spec.ts

@@ -1,17 +1,27 @@
 import type { TestingModule } from '@nestjs/testing'
 import { Test } from '@nestjs/testing'
-import { beforeEach, describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { ConfigurationModule } from '../configuration/configuration.module'
 import { DatabaseService } from './database.service'
+import { PrismaService } from './prisma.service'
 
 describe('databaseService', () => {
   let service: DatabaseService
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       imports: [ConfigurationModule],
-      providers: [DatabaseService],
+      providers: [
+        DatabaseService,
+        {
+          provide: PrismaService,
+          useValue: {
+            $connect: vi.fn().mockResolvedValue(undefined),
+            $disconnect: vi.fn().mockResolvedValue(undefined),
+          },
+        },
+      ],
     }).compile()
 
     service = module.get<DatabaseService>(DatabaseService)

apps/server-nestjs/src/cpin-module/infrastructure/database/database.service.ts

@@ -1,13 +1,16 @@
 import { setTimeout } from 'node:timers/promises'
 import { Inject, Injectable, Logger } from '@nestjs/common'
-import prisma from '../../../prisma'
 import { ConfigurationService } from '../configuration/configuration.service'
+import { PrismaService } from './prisma.service'
 
 @Injectable()
 export class DatabaseService {
   private readonly loggerService = new Logger(DatabaseService.name)
 
-  constructor(@Inject(ConfigurationService) private readonly configurationService: ConfigurationService) {
+  constructor(
+    @Inject(PrismaService) private readonly prisma: PrismaService,
+    @Inject(ConfigurationService) private readonly configurationService: ConfigurationService,
+  ) {
     this.DELAY_BEFORE_RETRY
       = this.configurationService.isTest || this.configurationService.isCI
         ? 1000
@@ -33,7 +36,7 @@ export class DatabaseService {
           `Trying to connect to Postgres with: ${this.configurationService.dbUrl}`,
         )
       }
-      await prisma.$connect()
+      await this.prisma.$connect()
 
       this.loggerService.log('Connected to Postgres!')
     } catch (error) {
@@ -59,7 +62,7 @@ export class DatabaseService {
   async closeConnections() {
     this.closingConnections = true
     try {
-      await prisma.$disconnect()
+      await this.prisma.$disconnect()
     } catch (error) {
       this.loggerService.error(error)
     } finally {

apps/server-nestjs/src/cpin-module/infrastructure/database/prisma.service.ts

@@ -0,0 +1,14 @@
+import type { OnModuleDestroy, OnModuleInit } from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
+import { PrismaClient } from '@prisma/client'
+
+@Injectable()
+export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
+  async onModuleInit() {
+    await this.$connect()
+  }
+
+  async onModuleDestroy() {
+    await this.$disconnect()
+  }
+}

apps/server-nestjs/src/cpin-module/infrastructure/health/health.controller.ts

@@ -0,0 +1,19 @@
+import { Controller, Get, Inject } from '@nestjs/common'
+import { HealthCheck, HealthCheckService } from '@nestjs/terminus'
+import { DatabaseHealthService } from '../database/database-health.service'
+
+@Controller('/api/v1/health')
+export class HealthController {
+  constructor(
+    @Inject(HealthCheckService) private readonly health: HealthCheckService,
+    @Inject(DatabaseHealthService) private readonly database: DatabaseHealthService,
+  ) {}
+
+  @Get()
+  @HealthCheck()
+  check() {
+    return this.health.check([
+      () => this.database.check('database'),
+    ])
+  }
+}

apps/server-nestjs/src/cpin-module/infrastructure/health/health.module.ts

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common'
+import { TerminusModule } from '@nestjs/terminus'
+import { DatabaseModule } from '../database/database.module'
+import { HealthController } from './health.controller'
+
+@Module({
+  imports: [
+    TerminusModule,
+    DatabaseModule,
+  ],
+  controllers: [HealthController],
+})
+export class HealthModule {}

apps/server-nestjs/src/cpin-module/infrastructure/infrastructure.module.ts

@@ -1,15 +1,15 @@
 import { Module } from '@nestjs/common'
 
 import { ConfigurationModule } from './configuration/configuration.module'
-import { DatabaseService } from './database/database.service'
+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: [DatabaseService, HttpClientService, ServerService],
-  imports: [LoggerModule, ConfigurationModule, TelemetryModule],
-  exports: [DatabaseService, HttpClientService, ServerService],
+  providers: [HttpClientService, ServerService],
+  imports: [DatabaseModule, LoggerModule, ConfigurationModule, TelemetryModule],
+  exports: [DatabaseModule, HttpClientService, ServerService],
 })
 export class InfrastructureModule {}

apps/server-nestjs/src/main.module.ts

@@ -1,11 +1,9 @@
 import { Module } from '@nestjs/common'
-
 import { CpinModule } from './cpin-module/cpin.module'
+import { HealthzModule } from './modules/healthz/healthz.module'
 
-// This module only exists to import other module.
-// « One module to rule them all, and in NestJs bind them »
 @Module({
-  imports: [CpinModule],
+  imports: [CpinModule, HealthzModule],
   controllers: [],
   providers: [],
 })

apps/server-nestjs/src/modules/healthz/healthz.controller.ts

@@ -0,0 +1,19 @@
+import { Controller, Get, Inject } from '@nestjs/common'
+import { HealthCheck, HealthCheckService } from '@nestjs/terminus'
+import { DatabaseHealthService } from '../../cpin-module/infrastructure/database/database-health.service'
+
+@Controller('api/v1/healthz')
+export class HealthzController {
+  constructor(
+    @Inject(HealthCheckService) private readonly health: HealthCheckService,
+    @Inject(DatabaseHealthService) private readonly database: DatabaseHealthService,
+  ) {}
+
+  @Get()
+  @HealthCheck()
+  check() {
+    return this.health.check([
+      () => this.database.check('database'),
+    ])
+  }
+}

apps/server-nestjs/src/modules/healthz/healthz.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common'
+import { TerminusModule } from '@nestjs/terminus'
+import { DatabaseModule } from '../../cpin-module/infrastructure/database/database.module'
+import { HealthzController } from './healthz.controller'
+
+@Module({
+  imports: [TerminusModule, DatabaseModule],
+  controllers: [HealthzController],
+})
+export class HealthzModule {}