From 61ac2993dba1d34ee27e8f4161dc0afe5ff0a1b3 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 20 Aug 2026 19:51:21 +0200 Subject: [PATCH 1/2] fix(api): isole la base de test de la base de dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Incident : lancer `pnpm test` (apps/api) truncait la vraie base de dev locale — `test-support/reset-db.ts`'s `resetDatabase()` fait un `TRUNCATE ... CASCADE` sur quasiment tout le schéma (dont `house`/`house_source`) avant *chaque* test, et `.env`/tests partageaient le même `DATABASE_URL` (un seul fichier `.env`, `NODE_ENV=test` ne changeait rien). Deux lancements du test suite cette session ont ainsi effacé le foyer, le compte et les activations de sources d'un utilisateur en train de tester l'app en local — perte réelle, aucune récupération possible (TRUNCATE, pas de sauvegarde). - `config/env.ts` charge désormais `.env.test` (pas `.env`) quand `NODE_ENV=test` — `.env.test` (local, non commité, comme `.env`) pointe vers une base Postgres séparée (`batchcooking_test`, même serveur/identifiants que la base de dev, juste une base différente). `.env.test.example` documente comment la créer. - `resetDatabase()` refuse maintenant de tourner si `NODE_ENV !== "test"` ou si `DATABASE_URL` ne contient pas "test" — garde-fou supplémentaire si `.env.test` est un jour absent/mal configuré, pour ne plus jamais reproduire cet incident même en cas d'erreur de configuration. - `.gitignore` autorise `.env.test.example` (déjà ignoré via `.env.*`, comme `.env.example` l'est déjà pour `.env`). Vérifié : snapshot de la base de dev (houses/house_sources/users) avant/ après un lancement complet de `pnpm test` — identique, base de dev intacte. 282 tests toujours au vert, contre la nouvelle base de test. Co-Authored-By: Claude Sonnet 5 --- .gitignore | 1 + apps/api/.env.test.example | 15 +++++++++++++++ apps/api/src/config/env.ts | 14 +++++++++++++- apps/api/test-support/reset-db.ts | 24 ++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 apps/api/.env.test.example diff --git a/.gitignore b/.gitignore index bf8131d..6d92b7c 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,7 @@ web_modules/ .env .env.* !.env.example +!.env.test.example # parcel-bundler cache (https://parceljs.org/) .cache diff --git a/apps/api/.env.test.example b/apps/api/.env.test.example new file mode 100644 index 0000000..2d467ad --- /dev/null +++ b/apps/api/.env.test.example @@ -0,0 +1,15 @@ +NODE_ENV=test +PORT=3000 +# Must point at a *different* database than your `.env`'s — `pnpm test` +# (test-support/reset-db.ts's `resetDatabase()`) TRUNCATEs almost every +# table before each test. Pointing this at the same database `pnpm dev` +# uses will wipe real local data on every test run. Easiest setup: same +# Postgres server/credentials as `.env`, just a different database name — +# create it once with e.g.: +# pnpm exec prisma db execute --url "postgresql://USER:PASSWORD@localhost:PORT/postgres?schema=public" --file - <<< "CREATE DATABASE batchcooking_test;" +# DATABASE_URL="postgresql://USER:PASSWORD@localhost:PORT/batchcooking_test?schema=public" pnpm exec prisma migrate deploy +DATABASE_URL="postgresql://changeme:changeme@localhost:5432/batchcooking_test?schema=public" + +# Required, no default on purpose — generate your own, e.g.: +# node -e "console.log(require('crypto').randomBytes(48).toString('hex'))" +JWT_SECRET=changeme-generate-a-real-random-secret-at-least-32-chars diff --git a/apps/api/src/config/env.ts b/apps/api/src/config/env.ts index 037ad71..7f52193 100644 --- a/apps/api/src/config/env.ts +++ b/apps/api/src/config/env.ts @@ -1,6 +1,18 @@ -import "dotenv/config"; +import dotenv from "dotenv"; import { z } from "zod"; +// Loads `.env.test` instead of `.env` when running the test suite +// (NODE_ENV=test, set by `cross-env` in package.json's `test` script — +// already present in `process.env` by the time this module runs, since +// `cross-env` sets it before invoking node/tsx at all). Keeps +// `resetDatabase()` (test-support/reset-db.ts, which TRUNCATEs almost +// every table before each test) pointed at a dedicated test database, +// never whatever `pnpm dev` actually uses — running the test suite once +// already wiped a real local dev database this way (`.env`/`.env.test` +// sharing one `DATABASE_URL`), see `.env.test.example` for how to set the +// separate test database this now requires. +dotenv.config({ path: process.env.NODE_ENV === "test" ? ".env.test" : ".env" }); + /** * Schema for every environment variable the API reads. Parsing (below) * fails fast at startup if something required is missing/invalid, instead diff --git a/apps/api/test-support/reset-db.ts b/apps/api/test-support/reset-db.ts index 81f235a..93217b5 100644 --- a/apps/api/test-support/reset-db.ts +++ b/apps/api/test-support/reset-db.ts @@ -1,7 +1,30 @@ +import { env } from "../src/config/env.js"; import { prisma } from "../src/db/prisma.js"; import { syncRecipeSources } from "../src/db/recipe-source-sync.js"; import { seedReferenceData } from "../src/db/reference-seed-data.js"; +/** + * Refuses to run outside a database that's obviously a test one — belt and + * braces alongside `config/env.ts` loading `.env.test` (not `.env`) under + * `NODE_ENV=test`: this already wiped a real local dev database once, when + * both env files shared one `DATABASE_URL`. `resetDatabase()` below + * TRUNCATEs almost the entire schema before every single test, so a + * misconfigured/missing `.env.test` must fail loudly here rather than + * silently truncate whatever `DATABASE_URL` happens to be set. + */ +function assertRunningAgainstTestDatabase() { + if (env.NODE_ENV !== "test") { + throw new Error( + `resetDatabase() TRUNCATEs almost the whole schema — refusing to run outside NODE_ENV=test (currently "${env.NODE_ENV}").`, + ); + } + if (!env.DATABASE_URL?.includes("test")) { + throw new Error( + `resetDatabase() refuses to run against a DATABASE_URL that doesn't look like a test database (got "${env.DATABASE_URL}", expected it to contain "test") — see .env.test.example.`, + ); + } +} + // Single TRUNCATE ... CASCADE covers FK ordering and resets identity // sequences — used between tests/scenarios to start from a clean slate. // Re-seeds the Diet/Category/Allergy/Unit reference data right after @@ -12,6 +35,7 @@ import { seedReferenceData } from "../src/db/reference-seed-data.js"; // reflect whatever adapters this test run happens to have registered // (usually none — see recipe-source-registry.ts). export async function resetDatabase() { + assertRunningAgainstTestDatabase(); await prisma.$executeRawUnsafe(` TRUNCATE TABLE "user_profile_allergy", "user_preference", "allergy", "category", From 17b6b9151a4234c58a9a855bf0fc2f5fc46d89fb Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 20 Aug 2026 19:59:16 +0200 Subject: [PATCH 2/2] fix(api): la garde resetDatabase() accepte aussi la base CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DATABASE_URL en CI (ci.yml) pointe vers "batchcooking_ci", pas "batchcooking_test" — la garde ne cherchait que "test" et rejetait donc la base CI légitime, faisant échouer les 282 tests. Accepte "test" ou "ci" désormais ; seul le nom réel de la base de dev ("batchcooking") ne matche toujours ni l'un ni l'autre, ce qui reste le seul cas que cette garde doit effectivement bloquer. Co-Authored-By: Claude Sonnet 5 --- apps/api/test-support/reset-db.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/api/test-support/reset-db.ts b/apps/api/test-support/reset-db.ts index 93217b5..cdf8e04 100644 --- a/apps/api/test-support/reset-db.ts +++ b/apps/api/test-support/reset-db.ts @@ -18,9 +18,14 @@ function assertRunningAgainstTestDatabase() { `resetDatabase() TRUNCATEs almost the whole schema — refusing to run outside NODE_ENV=test (currently "${env.NODE_ENV}").`, ); } - if (!env.DATABASE_URL?.includes("test")) { + // "test" covers a local `.env.test` (`batchcooking_test`); "ci" covers + // CI's own service database (`batchcooking_ci`, set directly via the + // workflow's `env:`, not a `.env.test` file — see ci.yml). Neither + // matches the real dev database's name (`batchcooking`), which is the + // one case this must actually catch. + if (!env.DATABASE_URL?.includes("test") && !env.DATABASE_URL?.includes("ci")) { throw new Error( - `resetDatabase() refuses to run against a DATABASE_URL that doesn't look like a test database (got "${env.DATABASE_URL}", expected it to contain "test") — see .env.test.example.`, + `resetDatabase() refuses to run against a DATABASE_URL that doesn't look like a test database (got "${env.DATABASE_URL}", expected it to contain "test" or "ci") — see .env.test.example.`, ); } }