chore: migrate duplicate database implementation in package

.vscode/launch.json

@@ -17,6 +17,7 @@
         "integ"
       ],
       "console": "integratedTerminal",
+      "envFile": "${workspaceFolder}/apps/server/.env.integ",
       "restart": true,
       "presentation": {
         "hidden": true
@@ -39,6 +40,7 @@
         "dev"
       ],
       "console": "integratedTerminal",
+      "envFile": "${workspaceFolder}/apps/server/.env",
       "restart": true,
       "presentation": {
         "hidden": true
@@ -100,6 +102,7 @@
         "run",
         "start:dev"
       ],
+      "envFile": "${workspaceFolder}/apps/server-nestjs/.env.integ",
       "console": "integratedTerminal",
       "restart": true,
       "presentation": {
@@ -123,6 +126,7 @@
         "start:dev"
       ],
       "console": "integratedTerminal",
+      "envFile": "${workspaceFolder}/apps/server-nestjs/.env",
       "restart": true,
       "presentation": {
         "hidden": true

AGENTS.md

@@ -35,7 +35,7 @@ Plugins use TS module augmentation to extend `ProjectStore` and `Config` interfa
 
 ## Database (Prisma)
 
-Multi-file schema in `apps/server/src/prisma/schema/*.prisma` (project, user, token, admin, topography).
+Multi-file schema in `packages/database/prisma/schema/*.prisma` (project, user, token, admin, topography).
 Migrations: standard Prisma Migrate. Major version data migrations in `migrations/v9/`.
 
 ## Environment config

README.md

@@ -49,9 +49,6 @@ Maintenant que vous avez les prérequis projets (prérequis techniques et de con
 # Installer toutes les dépendances
 $ pnpm install
 
-# Initialiser la base de données PostgreSQL lancée localement
-$ pnpm db:generate
-
 # Construire les applications client et server
 $ pnpm build
 
@@ -117,9 +114,6 @@ pnpm install
 # Créer les fichiers d'environnement exemples
 ./ci/scripts/init-env.sh
 
-# Générer le client Prisma côté serveur
-pnpm --filter @cpn-console/server run db:generate
-
 # Construire tous les paquets applicatifs
 pnpm build
 ```

apps/client/package.json

@@ -22,7 +22,8 @@
     "lint:ts": "NODE_OPTIONS='--no-warnings=ExperimentalWarning' eslint ./",
     "preview": "vite preview --port 8080",
     "test": "vitest run",
-    "test:cov": "vitest run --coverage",
+    "test:cov": "pnpm run test --coverage",
+    "test:watch": "pnpm run test --watch",
     "type-check": "vue-tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {

apps/server-nestjs/Dockerfile

@@ -18,6 +18,7 @@ COPY --chown=node:root apps/server-nestjs/package.json           ./apps/server-n
 COPY --chown=node:root packages/eslintconfig/package.json        ./packages/eslintconfig/package.json
 COPY --chown=node:root packages/shared/package.json              ./packages/shared/package.json
 COPY --chown=node:root packages/logger/package.json              ./packages/logger/package.json
+COPY --chown=node:root packages/database/package.json            ./packages/database/package.json
 COPY --chown=node:root packages/hooks/package.json               ./packages/hooks/package.json
 COPY --chown=node:root packages/test-utils/package.json          ./packages/test-utils/package.json
 COPY --chown=node:root packages/tsconfig/package.json            ./packages/tsconfig/package.json
@@ -48,18 +49,18 @@ RUN pnpm --filter @cpn-console/hooks run build
 # Réinjecter les libs buildées dans node_modules (injectWorkspacePackages copie au moment de l'install)
 RUN pnpm --filter @cpn-console/server-nestjs install --frozen-lockfile
 
-# Générer le client Prisma (schéma multi-fichiers : pointer sur le dossier)
-RUN pnpm --filter @cpn-console/server-nestjs exec prisma generate \
-      --schema=src/prisma/schema
+# Générer le client Prisma depuis le package partagé
+RUN pnpm --filter @cpn-console/database run generate
 
-ENTRYPOINT ["pnpm", "--filter", "server-nestjs", "run"]
+ENTRYPOINT ["pnpm", "--filter", "@cpn-console/server-nestjs", "run"]
 CMD ["start:dev"]
 
 # Build stage ----------------------------------------------------------------------
 FROM dev AS build
 
 # Build shared (génère dist/ et types/)
 RUN pnpm --filter @cpn-console/logger run build
+RUN pnpm --filter @cpn-console/database run build
 RUN pnpm --filter @cpn-console/shared run build
 
 # Build hooks (génère dist/ et types/ nécessaires aux imports)
@@ -90,10 +91,10 @@ RUN mkdir -p /home/node/logs && chmod 770 -R /home/node/logs \
 # Copier l'artefact de build et les node_modules de production
 COPY --chown=node:root --from=build /app/build .
 COPY --chown=node:root --from=build /app/apps/server-nestjs/dist ./dist
-# COPY --chown=node:root --from=build /app/build/node_modules ./node_modules
 
-# Regénérer le client Prisma dans l'image de production
-RUN npm run db:generate
+# WORKDIR /app/node_modules/@cpn-console/database
+# RUN npm run deploy
+# WORKDIR /app
 
 USER node
 EXPOSE 3001

apps/server-nestjs/documentation/Modularisation-de-console-server/01-MODULARISATION-STRATEGIE.md

@@ -114,7 +114,7 @@ module.exports = { findById, create };
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
 import { CreateUserDto } from './dto/create-user.dto';
-import { User } from '@prisma/client';
+import { User } from '@cpn-console/database';
 
 @Injectable()
 export class UsersService {

apps/server-nestjs/documentation/mise-en-place-nginx-etrangleur/PLAN.md

@@ -62,7 +62,7 @@
 
 - Le nginx existant dans l'image `client` proxifiait directement vers `server:8080` — upstream changé vers `nginx-strangler:8080`
 - `server-nestjs/src/main.ts` utilisait `process.env.PORT ?? 0` au lieu de `ConfigurationService.port` — corrigé
-- Le schéma Prisma de `server-nestjs` est multi-fichiers dans `src/prisma/schema/` — `prisma generate` doit pointer sur le dossier, pas sur `schema.prisma`
+- Le schéma Prisma est multi-fichiers dans `packages/database/prisma/schema/` — `prisma generate` doit pointer sur le dossier, pas sur `schema.prisma`
 - En CI (`job-lint.yml`), `nginx -t` échoue si `apt-get update -qq` n'est pas exécuté avant l'install, et si les chemins `pid`/`error_log`/`access_log` ne sont pas patchés vers `/tmp/` (runner non-root)
 - En CI (`job-playwright.yml`), les images `server-nestjs:ci` et `nginx-strangler:ci` doivent être buildées localement avant le `docker compose up --no-build` (même pattern que `opencds-mockoon`)
 
@@ -134,7 +134,7 @@ location = /api/v1/system/health {
 
 ### Tâche 2.2 : Créer `apps/server-nestjs/Dockerfile` ✅
 
-Multi-stage : `base` → `deps` → `build` → `prod`. `prisma generate --schema=src/prisma/schema` (dossier multi-fichiers). `USER node`, `HEALTHCHECK`, `EXPOSE 3001`.
+Multi-stage : `base` → `deps` → `build` → `prod`. `pnpm --filter @cpn-console/database run generate` (schéma multi-fichiers). `USER node`, `HEALTHCHECK`, `EXPOSE 3001`.
 
 ### Tâche 2.3 : `apps/server-nestjs/.env.docker-example` ✅
 

apps/server-nestjs/package.json

@@ -10,25 +10,23 @@
     "url": "https://github.com/cloud-pi-native/console"
   },
   "scripts": {
+    "prebuild": "pnpm i --frozen-lockfile && pnpm --filter @cpn-console/database run generate",
     "build": "nest build",
-    "db:generate": "prisma generate",
-    "db:migrate": "prisma migrate dev --name dso",
-    "db:reset": "prisma migrate reset",
+    "database:deploy": "pnpm --filter @cpn-console/database run migrate",
     "format": "eslint ./ --fix",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "start": "nest start",
-    "start:debug": "nest start --debug --watch",
-    "start:dev": "nest start --watch",
+    "start:debug": "pnpm run start --debug --watch",
+    "start:dev": "pnpm run start --watch",
     "start:prod": "node dist/main",
-    "pretest": "pnpm run db:generate",
+    "pretest": "pnpm --filter @cpn-console/database run generate",
     "test": "vitest run",
-    "test:watch": "vitest",
-    "pretest:cov": "pnpm run db:generate",
-    "test:cov": "vitest run --coverage",
-    "test:debug": "vitest --inspect"
+    "test:cov": "pnpm run test --coverage",
+    "test:watch": "pnpm run test --watch"
   },
   "dependencies": {
     "@cpn-console/argocd-plugin": "workspace:^",
+    "@cpn-console/database": "workspace:^",
     "@cpn-console/gitlab-plugin": "workspace:^",
     "@cpn-console/harbor-plugin": "workspace:^",
     "@cpn-console/hooks": "workspace:^",
@@ -65,7 +63,6 @@
     "@opentelemetry/sdk-metrics": "^2.5.1",
     "@opentelemetry/sdk-node": "^0.212.0",
     "@opentelemetry/sdk-trace-node": "^2.5.1",
-    "@prisma/client": "^6.19.2",
     "@ts-rest/core": "^3.52.1",
     "@ts-rest/fastify": "^3.52.1",
     "@ts-rest/open-api": "^3.52.1",
@@ -76,7 +73,6 @@
     "mustache": "^4.2.0",
     "nestjs-pino": "^4.6.0",
     "pino-http": "^11.0.0",
-    "prisma": "^6.19.2",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.2",
     "undici": "^7.24.0",

apps/server-nestjs/src/__mocks__/prisma.ts

@@ -1,4 +1,4 @@
-import type { PrismaClient } from '@prisma/client'
+import type { PrismaClient } from '@cpn-console/database'
 import { beforeEach, vi } from 'vitest'
 import { mockDeep, mockReset } from 'vitest-mock-extended'
 

apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 

apps/server-nestjs/src/modules/gitlab/gitlab-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 

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

@@ -1,6 +1,6 @@
 import type { OnModuleDestroy, OnModuleInit } from '@nestjs/common'
+import { PrismaClient } from '@cpn-console/database'
 import { Injectable } from '@nestjs/common'
-import { PrismaClient } from '@prisma/client'
 
 @Injectable()
 export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {

apps/server-nestjs/src/modules/keycloak/keycloak-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 

apps/server-nestjs/src/modules/nexus/nexus-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 import { NEXUS_PLUGIN_NAME } from './nexus.constants'

apps/server-nestjs/src/modules/registry/registry-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 import { REGISTRY_PLUGIN_NAME } from './registry.constants'

apps/server-nestjs/src/modules/vault/vault-datastore.service.ts

@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client'
+import type { Prisma } from '@cpn-console/database'
 import { Inject, Injectable } from '@nestjs/common'
 import { PrismaService } from '../infrastructure/database/prisma.service'
 

apps/server/Dockerfile

@@ -15,6 +15,7 @@ COPY --chown=node:root apps/server/package.json ./apps/server/package.json
 COPY --chown=node:root packages/eslintconfig/package.json ./packages/eslintconfig/package.json
 COPY --chown=node:root packages/shared/package.json ./packages/shared/package.json
 COPY --chown=node:root packages/logger/package.json ./packages/logger/package.json
+COPY --chown=node:root packages/database/package.json ./packages/database/package.json
 COPY --chown=node:root packages/hooks/package.json ./packages/hooks/package.json
 COPY --chown=node:root packages/test-utils/package.json ./packages/test-utils/package.json
 COPY --chown=node:root packages/tsconfig/package.json ./packages/tsconfig/package.json
@@ -33,8 +34,8 @@ COPY --chown=node:root packages/ ./packages/
 
 COPY --chown=node:root apps/server/ ./apps/server/
 # Generate Prisma client
-RUN pnpm --filter server run db:generate
-ENTRYPOINT [ "pnpm", "--filter", "server", "run" ]
+RUN pnpm --filter @cpn-console/database run generate
+ENTRYPOINT [ "pnpm", "--filter", "@cpn-console/server", "run" ]
 CMD [ "dev" ]
 
 
@@ -48,7 +49,6 @@ RUN pnpm --filter @cpn-console/server run build
 # Export @cpn-console/server to target build directory
 RUN pnpm --filter @cpn-console/server --prod deploy build
 
-
 # Prod stage -----------------------------------------------------------------------
 FROM docker.io/node:24.13.1-bullseye-slim AS prod
 
@@ -61,7 +61,11 @@ RUN mkdir -p /home/node/logs && chmod 770 -R /home/node/logs \
   && mkdir -p /home/node/.npm && chmod 770 -R /home/node/.npm \
   && chown node:root /app
 COPY --chown=node:root --from=build /app/build .
-RUN npm run db:generate
+
+# WORKDIR /app/node_modules/@cpn-console/database
+# RUN npm run deploy
+# WORKDIR /app
+
 USER node
 EXPOSE 8080
 ENTRYPOINT ["npm", "start"]

apps/server/package.json

@@ -12,37 +12,30 @@
   "types": "types/bootstrap.d.ts",
   "files": [
     "dist",
-    "prisma.config.ts",
     "src"
   ],
   "scripts": {
+    "prebuild": "pnpm i --frozen-lockfile && pnpm --filter @cpn-console/database run generate",
     "build": "tspc",
     "build:clean": "rimraf ./dist ./types ./tsconfig.tsbuildinfo",
-    "db:deploy": "prisma migrate deploy",
-    "db:diff": "prisma migrate diff",
-    "db:generate": "prisma generate",
-    "db:migrate": "prisma migrate dev --name dso",
-    "db:reset": "prisma migrate reset",
-    "predev": "pnpm run db:deploy",
+    "database:deploy": "pnpm --filter @cpn-console/database run deploy",
+    "predev": "pnpm --filter @cpn-console/database run deploy",
     "dev": "nodemon --exec 'vite-node src/bootstrap.ts'",
-    "predebug": "pnpm run db:migrate",
+    "predebug": "pnpm --filter @cpn-console/database run migrate",
     "debug": "nodemon --exec 'NODE_OPTIONS=\"--inspect-brk=0.0.0.0\" vite-node src/bootstrap.ts'",
     "format": "eslint ./ --fix",
-    "preinteg": "INTEGRATION=true pnpm run db:migrate",
-    "integ": "INTEGRATION=true nodemon --exec 'vite-node src/bootstrap.ts'",
     "lint": "eslint ./",
-    "prepublishOnly": "pnpm run db:generate",
-    "prestart": "npm run db:deploy",
+    "preinteg": "pnpm --filter @cpn-console/database run migrate",
+    "integ": "INTEGRATION=true nodemon --exec 'vite-node src/bootstrap.ts'",
     "start": "node --enable-source-maps dist/bootstrap.js",
-    "pretest": "pnpm run db:generate",
+    "pretest": "pnpm --filter @cpn-console/database run generate",
     "test": "vitest run",
-    "pretest:cov": "pnpm run db:generate",
-    "test:cov": "vitest run --coverage",
-    "test:e2e": "pnpm run dev",
-    "test:e2e-ci": "pnpm run start"
+    "test:cov": "pnpm run test --coverage",
+    "test:watch": "pnpm run test --watch"
   },
   "dependencies": {
     "@cpn-console/argocd-plugin": "workspace:^",
+    "@cpn-console/database": "workspace:^",
     "@cpn-console/gitlab-plugin": "workspace:^",
     "@cpn-console/harbor-plugin": "workspace:^",
     "@cpn-console/hooks": "workspace:^",
@@ -66,7 +59,6 @@
     "@opentelemetry/exporter-trace-otlp-proto": "^0.213.0",
     "@opentelemetry/sdk-metrics": "^2.5.1",
     "@opentelemetry/sdk-node": "^0.212.0",
-    "@prisma/client": "^6.19.2",
     "@ts-rest/core": "^3.52.1",
     "@ts-rest/fastify": "^3.52.1",
     "@ts-rest/open-api": "^3.52.1",
@@ -76,7 +68,6 @@
     "fastify-keycloak-adapter": "2.3.2",
     "json-2-csv": "^5.5.10",
     "mustache": "^4.2.0",
-    "prisma": "^6.19.2",
     "undici": "^7.24.0",
     "vitest-mock-extended": "^2.0.2"
   },