dev → uat: GRO-2722 schema-safe reset (TRUNCATE, no DROP)
CI / Test (push) Failing after 3s
CI / Lint & Typecheck (push) Successful in 20s
CI / Build & Push Docker Images (push) Has been skipped
CI / Lint & Typecheck (pull_request) Successful in 17s
CI / Test (pull_request) Successful in 51s
CI / Build & Push Docker Images (pull_request) Successful in 34s
CI / Test (push) Failing after 3s
CI / Lint & Typecheck (push) Successful in 20s
CI / Build & Push Docker Images (push) Has been skipped
CI / Lint & Typecheck (pull_request) Successful in 17s
CI / Test (pull_request) Successful in 51s
CI / Build & Push Docker Images (pull_request) Successful in 34s
Merged after QA (Lint Roller) approval on Gitea. All 6 CI contexts green on 38380d0.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit was merged in pull request #241.
This commit is contained in:
@@ -196,6 +196,7 @@ Geocoding turns a client's street address into `latitude`/`longitude` + `geocode
|
|||||||
| TC-API-3.27 | Verify coat_type enum has all seed values | After UAT seed completes, inspect the coat_type enum on the UAT DB — it must contain: short, medium, long, double, wire, silky, curly, hairless | UAT seed jobs (`reset-demo-data`, `seed-test-data`) complete 1/1 with no `enum_in` error; coat_type includes all 8 values used by seed.ts `coatTypePool` |
|
| TC-API-3.27 | Verify coat_type enum has all seed values | After UAT seed completes, inspect the coat_type enum on the UAT DB — it must contain: short, medium, long, double, wire, silky, curly, hairless | UAT seed jobs (`reset-demo-data`, `seed-test-data`) complete 1/1 with no `enum_in` error; coat_type includes all 8 values used by seed.ts `coatTypePool` |
|
||||||
| TC-API-3.28 | Verify pet_size_category enum has all seed values | After UAT seed completes, inspect the pet_size_category enum on the UAT DB — it must contain: small, medium, large, extra_large | UAT seed jobs (`reset-demo-data`, `seed-test-data`) complete 1/1 with no `enum_in` error; pet_size_category includes all 4 values used by seed.ts `petSizeCategoryPool` (regression for GRO-1999, mirrors TC-API-3.27) |
|
| TC-API-3.28 | Verify pet_size_category enum has all seed values | After UAT seed completes, inspect the pet_size_category enum on the UAT DB — it must contain: small, medium, large, extra_large | UAT seed jobs (`reset-demo-data`, `seed-test-data`) complete 1/1 with no `enum_in` error; pet_size_category includes all 4 values used by seed.ts `petSizeCategoryPool` (regression for GRO-1999, mirrors TC-API-3.27) |
|
||||||
| TC-API-3.29 | Verify `reset-demo-data` CronJob does not fail with FK 23503 on `invoice_tip_splits` (GRO-2123) | Trigger the CronJob manually: `kubectl create job --from=cronjob/reset-demo-data verify-gro2123 -n groombook-uat`. Wait for pod to terminate. Inspect logs: `kubectl logs -n groombook-uat -l job-name=verify-gro2123` | Pod reaches `Completed` state; logs show `✓ Acquired seed advisory lock` and `✓ Released seed advisory lock` from `seed.ts`; no `PostgresError: … violates foreign key constraint "invoice_tip_splits_invoice_id_invoices_id_fk"` (code 23503); final counts unchanged (500 clients, ~4000 invoices) |
|
| TC-API-3.29 | Verify `reset-demo-data` CronJob does not fail with FK 23503 on `invoice_tip_splits` (GRO-2123) | Trigger the CronJob manually: `kubectl create job --from=cronjob/reset-demo-data verify-gro2123 -n groombook-uat`. Wait for pod to terminate. Inspect logs: `kubectl logs -n groombook-uat -l job-name=verify-gro2123` | Pod reaches `Completed` state; logs show `✓ Acquired seed advisory lock` and `✓ Released seed advisory lock` from `seed.ts`; no `PostgresError: … violates foreign key constraint "invoice_tip_splits_invoice_id_invoices_id_fk"` (code 23503); final counts unchanged (500 clients, ~4000 invoices) |
|
||||||
|
| TC-API-3.30 | Verify `reset-demo-data` CronJob is schema-safe — TRUNCATE only, no DDL drops (GRO-2722) | 1. Trigger: `kubectl -n groombook-uat create job --from=cronjob/reset-demo-data reset-verify-$(date +%s) --dry-run=client -o name \| xargs kubectl -n groombook-uat apply -f -` or simply `kubectl -n groombook-uat create job --from=cronjob/reset-demo-data reset-verify-$(date +%s)`. 2. Wait for job completion: `kubectl -n groombook-uat wait job/reset-verify-<ts> --for=condition=complete --timeout=300s`. 3. Check logs: `kubectl -n groombook-uat logs job/reset-verify-<ts>`. 4. Verify schema survival: `kubectl -n groombook-uat exec deploy/api -- psql $DATABASE_URL -c "\dt public.*"` and `kubectl -n groombook-uat exec deploy/api -- psql $DATABASE_URL -c "\dt drizzle.*"`. 5. Verify readyz: `curl -s https://uat.groombook.dev/api/readyz` | Job reaches `Completed` (exit 0); logs show `✓ All public tables truncated, sequences reset` — no `DROP TABLE`/`DROP TYPE`/`DROP SCHEMA` in output; all `public.*` tables still present after reset; `drizzle.__drizzle_migrations` still populated (row count unchanged); `https://uat.groombook.dev/api/readyz` returns HTTP 200; demo data reseeded (500 clients visible via GET /api/clients) |
|
||||||
|
|
||||||
### 4.4 Appointment Scheduling
|
### 4.4 Appointment Scheduling
|
||||||
|
|
||||||
|
|||||||
+30
-36
@@ -1,10 +1,17 @@
|
|||||||
/**
|
/**
|
||||||
* reset.ts — Drop all application tables and re-run migrations + seed.
|
* reset.ts — Truncate all public tables and restart identity sequences.
|
||||||
*
|
*
|
||||||
* Intended for local development only. Never run against production.
|
* Schema-safe: never issues destructive DDL against any schema.
|
||||||
|
* The drizzle schema and __drizzle_migrations table are preserved so
|
||||||
|
* drizzle-kit migrate remains a no-op on an already-migrated DB.
|
||||||
|
*
|
||||||
|
* NOTE: this file is NOT the deployed reset entrypoint — the reset image
|
||||||
|
* builds from packages/db and runs `pnpm --filter @groombook/db reset`.
|
||||||
|
* apps/api db:reset delegates there too (see apps/api/package.json).
|
||||||
|
* Keep in sync with packages/db/src/reset.ts (GRO-2722).
|
||||||
*
|
*
|
||||||
* Usage:
|
* Usage:
|
||||||
* DATABASE_URL=postgres://... npx tsx packages/db/src/reset.ts
|
* DATABASE_URL=postgres://... npx tsx apps/api/src/db/reset.ts
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import postgres from "postgres";
|
import postgres from "postgres";
|
||||||
@@ -23,43 +30,30 @@ async function reset() {
|
|||||||
|
|
||||||
const client = postgres(url, { max: 1 });
|
const client = postgres(url, { max: 1 });
|
||||||
|
|
||||||
console.log("Dropping all application tables...\n");
|
console.log("Truncating all public tables...\n");
|
||||||
|
|
||||||
// Drop in dependency order (children before parents)
|
// Enumerate all base tables in the public schema dynamically, then
|
||||||
await client`
|
// issue a single TRUNCATE with RESTART IDENTITY CASCADE so FK cycles
|
||||||
DO $$ DECLARE
|
// are not a problem. The drizzle schema and __drizzle_migrations are
|
||||||
r RECORD;
|
// intentionally excluded (different schema) so drizzle-kit migrate
|
||||||
BEGIN
|
// stays a no-op on an already-migrated DB.
|
||||||
FOR r IN (
|
const tables = await client<{ tablename: string }[]>`
|
||||||
SELECT tablename FROM pg_tables
|
SELECT tablename FROM pg_tables
|
||||||
WHERE schemaname = 'public'
|
WHERE schemaname = 'public'
|
||||||
) LOOP
|
|
||||||
EXECUTE 'DROP TABLE IF EXISTS public.' || quote_ident(r.tablename) || ' CASCADE';
|
|
||||||
END LOOP;
|
|
||||||
END $$;
|
|
||||||
`;
|
`;
|
||||||
|
|
||||||
// Drop custom enums
|
if (tables.length > 0) {
|
||||||
await client`
|
// Double-quote each identifier (escaping embedded quotes) to handle
|
||||||
DO $$ DECLARE
|
// any table name safely without a pg-specific quote_ident helper.
|
||||||
r RECORD;
|
const tableList = tables
|
||||||
BEGIN
|
.map((t) => `"${t.tablename.replace(/"/g, '""')}"`)
|
||||||
FOR r IN (
|
.join(", ");
|
||||||
SELECT typname FROM pg_type
|
await client.unsafe(
|
||||||
WHERE typtype = 'e' AND typnamespace = (
|
`TRUNCATE ${tableList} RESTART IDENTITY CASCADE`,
|
||||||
SELECT oid FROM pg_namespace WHERE nspname = 'public'
|
);
|
||||||
)
|
}
|
||||||
) LOOP
|
|
||||||
EXECUTE 'DROP TYPE IF EXISTS ' || quote_ident(r.typname) || ' CASCADE';
|
|
||||||
END LOOP;
|
|
||||||
END $$;
|
|
||||||
`;
|
|
||||||
|
|
||||||
// Drop the drizzle migrations tracking table
|
console.log("✓ All public tables truncated, sequences reset\n");
|
||||||
await client`DROP TABLE IF EXISTS drizzle.__drizzle_migrations CASCADE`;
|
|
||||||
await client`DROP SCHEMA IF EXISTS drizzle CASCADE`;
|
|
||||||
|
|
||||||
console.log("✓ All tables and enums dropped\n");
|
|
||||||
|
|
||||||
await client.end();
|
await client.end();
|
||||||
}
|
}
|
||||||
|
|||||||
+32
-42
@@ -1,15 +1,14 @@
|
|||||||
/**
|
/**
|
||||||
* reset.ts — Drop all application tables, re-run migrations, and re-seed.
|
* reset.ts — Truncate all public tables and restart identity sequences.
|
||||||
*
|
*
|
||||||
* Intended for local development only. Never run against production.
|
* Schema-safe: never issues destructive DDL against any schema.
|
||||||
|
* The drizzle schema and __drizzle_migrations table are preserved so
|
||||||
|
* drizzle-kit migrate remains a no-op on an already-migrated DB.
|
||||||
*
|
*
|
||||||
* Usage:
|
* GRO-2139: the entire truncate→migrate→seed chain runs inside a single
|
||||||
* DATABASE_URL=postgres://... npx tsx packages/db/src/reset.ts
|
|
||||||
*
|
|
||||||
* GRO-2139: the entire drop→migrate→seed chain runs inside a single
|
|
||||||
* Postgres advisory lock (SEED_ADVISORY_LOCK_KEY) so a concurrent
|
* Postgres advisory lock (SEED_ADVISORY_LOCK_KEY) so a concurrent
|
||||||
* `seed.ts` (e.g. the dev `seed-test-data-*` Job being recreated at
|
* `seed.ts` (e.g. the dev `seed-test-data-*` Job being recreated at
|
||||||
* the top of the hour) cannot interleave between `reset.ts` (DROP)
|
* the top of the hour) cannot interleave between `reset.ts` (TRUNCATE)
|
||||||
* and `seed.ts` (TRUNCATE+insert) and collide on `invoices_pkey`.
|
* and `seed.ts` (TRUNCATE+insert) and collide on `invoices_pkey`.
|
||||||
*
|
*
|
||||||
* Why this matters: `seed.ts` derives every primary key from a single
|
* Why this matters: `seed.ts` derives every primary key from a single
|
||||||
@@ -22,10 +21,14 @@
|
|||||||
* GRO-2123 added the advisory lock around `runSeedBody` but left
|
* GRO-2123 added the advisory lock around `runSeedBody` but left
|
||||||
* `reset.ts` and `drizzle-kit migrate` outside the lock. This script
|
* `reset.ts` and `drizzle-kit migrate` outside the lock. This script
|
||||||
* now wraps the *whole* chain in the same lock: `withSeedAdvisoryLock`
|
* now wraps the *whole* chain in the same lock: `withSeedAdvisoryLock`
|
||||||
* pins the lock to one reserved session and the DROP → migrate → seed
|
* pins the lock to one reserved session and the TRUNCATE → migrate → seed
|
||||||
* work runs on the rest of the pool, so the lock guarantees mutual
|
* work runs on the rest of the pool, so the lock guarantees mutual
|
||||||
* exclusion against any concurrent seeder for the entire chain.
|
* exclusion against any concurrent seeder for the entire chain.
|
||||||
*
|
*
|
||||||
|
* For a full local schema teardown (nuke tables, enums, drizzle schema)
|
||||||
|
* use `pnpm --filter @groombook/db db:nuke` instead — never change this
|
||||||
|
* script to be destructive (GRO-2722 / GRO-2678 prod incident).
|
||||||
|
*
|
||||||
* See: groombook/infra `apps/base/reset-cronjob.yaml` (CronJob) and
|
* See: groombook/infra `apps/base/reset-cronjob.yaml` (CronJob) and
|
||||||
* `apps/base/seed-job.yaml` (one-shot Job) — both invoke the same
|
* `apps/base/seed-job.yaml` (one-shot Job) — both invoke the same
|
||||||
* `seed.ts` code path on the same database in `groombook-dev`.
|
* `seed.ts` code path on the same database in `groombook-dev`.
|
||||||
@@ -67,7 +70,7 @@ async function reset() {
|
|||||||
// Pool sizing is load-bearing here. `withSeedAdvisoryLock` does
|
// Pool sizing is load-bearing here. `withSeedAdvisoryLock` does
|
||||||
// `pool.reserve()` to pin the advisory lock to one dedicated session
|
// `pool.reserve()` to pin the advisory lock to one dedicated session
|
||||||
// (a session-level lock released on a *different* pooled connection is
|
// (a session-level lock released on a *different* pooled connection is
|
||||||
// a no-op), and the DROP / migrate / seed work then runs on the
|
// a no-op), and the TRUNCATE / migrate / seed work then runs on the
|
||||||
// *remaining* pooled connections. The lock provides mutual exclusion
|
// *remaining* pooled connections. The lock provides mutual exclusion
|
||||||
// across processes regardless of how many connections the work uses —
|
// across processes regardless of how many connections the work uses —
|
||||||
// it does NOT require the work to share the lock's session.
|
// it does NOT require the work to share the lock's session.
|
||||||
@@ -82,43 +85,30 @@ async function reset() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await withSeedAdvisoryLock(client, async () => {
|
await withSeedAdvisoryLock(client, async () => {
|
||||||
console.log("Dropping all application tables...\n");
|
console.log("Truncating all public tables...\n");
|
||||||
|
|
||||||
// Drop dependencies (tables) first
|
// Enumerate all base tables in the public schema dynamically, then
|
||||||
await client`
|
// issue a single TRUNCATE with RESTART IDENTITY CASCADE so FK cycles
|
||||||
DO $$ DECLARE
|
// are not a problem. The drizzle schema and __drizzle_migrations are
|
||||||
r RECORD;
|
// intentionally excluded (different schema) so drizzle-kit migrate
|
||||||
BEGIN
|
// stays a no-op on an already-migrated DB.
|
||||||
FOR r IN (
|
const tables = await client<{ tablename: string }[]>`
|
||||||
SELECT tablename FROM pg_tables
|
SELECT tablename FROM pg_tables
|
||||||
WHERE schemaname = 'public'
|
WHERE schemaname = 'public'
|
||||||
) LOOP
|
|
||||||
EXECUTE 'DROP TABLE IF EXISTS public.' || quote_ident(r.tablename) || ' CASCADE';
|
|
||||||
END LOOP;
|
|
||||||
END $$;
|
|
||||||
`;
|
`;
|
||||||
|
|
||||||
// Drop custom enums
|
if (tables.length > 0) {
|
||||||
await client`
|
// Double-quote each identifier (escaping embedded quotes) to handle
|
||||||
DO $$ DECLARE
|
// any table name safely without a pg-specific quote_ident helper.
|
||||||
r RECORD;
|
const tableList = tables
|
||||||
BEGIN
|
.map((t) => `"${t.tablename.replace(/"/g, '""')}"`)
|
||||||
FOR r IN (
|
.join(", ");
|
||||||
SELECT typname FROM pg_type
|
await client.unsafe(
|
||||||
WHERE typtype = 'e' AND typnamespace = (
|
`TRUNCATE ${tableList} RESTART IDENTITY CASCADE`,
|
||||||
SELECT oid FROM pg_namespace WHERE nspname = 'public'
|
);
|
||||||
)
|
}
|
||||||
) LOOP
|
|
||||||
EXECUTE 'DROP TYPE IF EXISTS ' || quote_ident(r.typname) || ' CASCADE';
|
|
||||||
END LOOP;
|
|
||||||
END $$;
|
|
||||||
`;
|
|
||||||
|
|
||||||
// Drop the drizzle migrations tracking table
|
console.log("✓ All public tables truncated, sequences reset\n");
|
||||||
await client`DROP TABLE IF EXISTS drizzle.__drizzle_migrations CASCADE`;
|
|
||||||
await client`DROP SCHEMA IF EXISTS drizzle CASCADE`;
|
|
||||||
|
|
||||||
console.log("✓ All tables and enums dropped\n");
|
|
||||||
|
|
||||||
console.log("Running migrations...");
|
console.log("Running migrations...");
|
||||||
// GRO-2672: drizzle-orm's migrate() has a high-water-mark bug that skips
|
// GRO-2672: drizzle-orm's migrate() has a high-water-mark bug that skips
|
||||||
|
|||||||
Reference in New Issue
Block a user