Remove Supabase
The database moved to a container of our own; the platform is gone. This takes out what was left of it — and, where the leftovers were load bearing, moves rather than deletes. Moved, not deleted: supabase/migrations/ -> db/migrations/ the schema's source of truth supabase/build-org.ts -> scripts/build-org.ts lib/supabase/types.ts -> lib/types.ts 52 import sites repointed The bookkeeping needed care. It lived in `supabase_migrations.schema_migrations`, and simply renaming the schema would have left the runner facing an empty table: it would have called all 67 migrations pending and replayed them against a database that is long since current. So the runner now creates `migrationen.schema_migrations` and, once, copies the old rows across — guarded so a second run does nothing and a fresh database skips it entirely. Only then does migration 20260907100000 drop the old schema. Deleted: the CLI config, the seed, the historical schema/function dumps (nothing read them), scripts/umzug-von-supabase.sh (the move is done), and both Supabase packages plus the CLI. Nothing in the application imported them — the build now succeeds with no environment variables at all, which is the proof. Integration tests: six of them signed in through Supabase Auth and asserted against the anon key and the service role. That model is gone, so the tests were not portable — they are deleted. session-context and employee-status-filter already ran on pg and are untouched; om-reporting is ported to a direct connection because it guards a real risk (the reporting line rule exists twice, once in SQL and once in TypeScript). CI: the integration job started a Supabase stack. It now runs a postgres service, applies deploy/db-init and every migration to an empty database — that was the valuable part, and it still holds — then checks that a second run is a no-op, which is what proves the bookkeeping works. Docs: security-review.md audited a service-role key, a cookie adapter and auth.users, none of which exist. Restating findings about removed components would suggest today's system had been reviewed; it has not. It now records what was removed and says a fresh review is due. data-model.md was already marked obsolete and described the pre-OM schema; azure-migration.md was a plan for a route not taken. Both deleted. Verified: npm ci, typecheck, lint, 445 tests, build — all clean without the packages. Integration tests skip cleanly with no database. Migration SQL and the runner are reviewed but NOT executed: no Docker here, and the old instance no longer resolves. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,37 +1,64 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { Pool } from "pg";
|
||||
import { afterAll, describe, expect, it } from "vitest";
|
||||
import { todayIso } from "@/lib/format";
|
||||
import { resolveReportingLines, type OmHolder, type OmUnit } from "@/lib/om-reporting";
|
||||
import { adminClient } from "./helpers";
|
||||
|
||||
// Die Berichtslinien-Regel existiert zweimal: als om_reporting_lines() in
|
||||
// der Datenbank und als resolveReportingLines() im Anwendungscode. Zwei
|
||||
// Fassungen derselben Regel driften auseinander, und die Abweichung fällt
|
||||
// niemandem auf — im Organigramm stünde einfach eine andere Führungskraft
|
||||
// als im Export. Also über den gesamten Bestand gegeneinanderhalten.
|
||||
describe("om_reporting_lines stimmt mit resolveReportingLines überein", () => {
|
||||
//
|
||||
// Eigene Verbindung statt der Zugriffsschicht: geprüft wird die Regel, nicht
|
||||
// die Berechtigung. Mit dem Zeilenschutz dazwischen liefe der Vergleich über
|
||||
// eine gefilterte Teilmenge und bewiese nichts.
|
||||
const pool = new Pool({ connectionString: process.env.DATABASE_URL, max: 2 });
|
||||
|
||||
describe.skipIf(!process.env.DATABASE_URL)("om_reporting_lines stimmt mit resolveReportingLines überein", () => {
|
||||
const asOf = todayIso();
|
||||
|
||||
async function fromDatabase() {
|
||||
const { data, error } = await adminClient.rpc("om_reporting_lines", { p_as_of: asOf });
|
||||
if (error) throw new Error(error.message);
|
||||
return data ?? [];
|
||||
afterAll(async () => {
|
||||
await pool.end();
|
||||
});
|
||||
|
||||
type DbZeile = { employee_id: string; formal_manager_id: string | null; acting_manager_id: string | null };
|
||||
|
||||
async function fromDatabase(): Promise<DbZeile[]> {
|
||||
const { rows } = await pool.query<DbZeile>("select * from om_reporting_lines($1)", [asOf]);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function fromTypeScript() {
|
||||
const [{ data: units }, { data: assignments }] = await Promise.all([
|
||||
adminClient.from("org_units").select("id, parent_id"),
|
||||
adminClient
|
||||
.from("position_assignments")
|
||||
.select("employee_id, position_id, valid_from, valid_to, om_positions(org_unit_id, is_chief, valid_from, valid_to)")
|
||||
.lte("valid_from", asOf)
|
||||
.or(`valid_to.is.null,valid_to.gt.${asOf}`),
|
||||
]);
|
||||
const { rows: units } = await pool.query<{ id: string; parent_id: string | null }>(
|
||||
"select id, parent_id from org_units"
|
||||
);
|
||||
|
||||
const { data: employees } = await adminClient
|
||||
.from("employees")
|
||||
.select("id, karenz_start_date, karenz_return_date");
|
||||
const absentById = new Map(
|
||||
(employees ?? []).map((e) => [
|
||||
// Dieselbe Gültigkeitsprüfung wie in der Datenbankfunktion: halboffen,
|
||||
// das Ende ausgeschlossen. Sie steht hier ausgeschrieben und nicht als
|
||||
// Aufruf einer gemeinsamen Hilfsfunktion — sonst prüfte der Test die
|
||||
// Regel gegen sich selbst.
|
||||
const { rows: besetzungen } = await pool.query<{
|
||||
employee_id: string;
|
||||
position_id: string;
|
||||
org_unit_id: string;
|
||||
is_chief: boolean;
|
||||
}>(
|
||||
`select a.employee_id, a.position_id, p.org_unit_id, p.is_chief
|
||||
from position_assignments a
|
||||
join om_positions p on p.id = a.position_id
|
||||
where a.valid_from <= $1 and (a.valid_to is null or a.valid_to > $1)
|
||||
and p.valid_from <= $1 and (p.valid_to is null or p.valid_to > $1)`,
|
||||
[asOf]
|
||||
);
|
||||
|
||||
const { rows: personen } = await pool.query<{
|
||||
id: string;
|
||||
karenz_start_date: string | null;
|
||||
karenz_return_date: string | null;
|
||||
}>("select id, karenz_start_date, karenz_return_date from employees");
|
||||
|
||||
const abwesend = new Map(
|
||||
personen.map((e) => [
|
||||
e.id,
|
||||
Boolean(
|
||||
e.karenz_start_date && e.karenz_start_date <= asOf && (!e.karenz_return_date || asOf < e.karenz_return_date)
|
||||
@@ -39,22 +66,14 @@ describe("om_reporting_lines stimmt mit resolveReportingLines überein", () => {
|
||||
])
|
||||
);
|
||||
|
||||
const omUnits: OmUnit[] = (units ?? []).map((u) => ({ id: u.id, parentId: u.parent_id }));
|
||||
const holders: OmHolder[] = (assignments ?? [])
|
||||
.filter((a) => {
|
||||
const p = a.om_positions as unknown as { valid_from: string; valid_to: string | null } | null;
|
||||
return p && p.valid_from <= asOf && (p.valid_to === null || p.valid_to > asOf);
|
||||
})
|
||||
.map((a) => {
|
||||
const p = a.om_positions as unknown as { org_unit_id: string; is_chief: boolean };
|
||||
return {
|
||||
employeeId: a.employee_id,
|
||||
positionId: a.position_id,
|
||||
orgUnitId: p.org_unit_id,
|
||||
isChief: p.is_chief,
|
||||
absent: absentById.get(a.employee_id) ?? false,
|
||||
};
|
||||
});
|
||||
const omUnits: OmUnit[] = units.map((u) => ({ id: u.id, parentId: u.parent_id }));
|
||||
const holders: OmHolder[] = besetzungen.map((a) => ({
|
||||
employeeId: a.employee_id,
|
||||
positionId: a.position_id,
|
||||
orgUnitId: a.org_unit_id,
|
||||
isChief: a.is_chief,
|
||||
absent: abwesend.get(a.employee_id) ?? false,
|
||||
}));
|
||||
|
||||
return resolveReportingLines(omUnits, holders);
|
||||
}
|
||||
@@ -83,8 +102,7 @@ describe("om_reporting_lines stimmt mit resolveReportingLines überein", () => {
|
||||
|
||||
it("gibt genau einer Person keine Führungskraft — der obersten Leitung", async () => {
|
||||
const db = await fromDatabase();
|
||||
const wurzel = db.filter((r) => r.acting_manager_id === null);
|
||||
expect(wurzel).toHaveLength(1);
|
||||
expect(db.filter((r) => r.acting_manager_id === null)).toHaveLength(1);
|
||||
});
|
||||
|
||||
it("erzeugt keine Berichtslinie auf sich selbst", async () => {
|
||||
|
||||
Reference in New Issue
Block a user