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>
148 lines
5.2 KiB
TypeScript
148 lines
5.2 KiB
TypeScript
import type { ExpressionBuilder } from "kysely";
|
||
import type { Tx } from "./db";
|
||
import { jsonArrayFrom } from "./db/json";
|
||
import type { Schema } from "./db/schema";
|
||
import type { Database } from "./types";
|
||
|
||
/**
|
||
* Der Ausdrucksbauer einer Abfrage ohne eigene Tabelle (selectNoFrom) — das
|
||
* ist der Ort, an dem Teilabfragen zusammengehängt werden.
|
||
*/
|
||
export type OrgEb = ExpressionBuilder<Schema, never>;
|
||
|
||
// Die Organisation ist ein Baum, keine drei Tabellen mehr. Alles, was früher
|
||
// aus divisions/departments/teams zusammengesteckt wurde, ergibt sich jetzt
|
||
// aus org_units.parent_id — und damit funktioniert es auch für eine fünfte
|
||
// Ebene, ohne dass hier etwas zu ändern wäre.
|
||
|
||
export type OrgUnitType = "Gesellschaft" | "Bereich" | "Abteilung" | "Team";
|
||
|
||
export type OrgUnit = {
|
||
id: string;
|
||
org_number: string;
|
||
name: string;
|
||
parent_id: string | null;
|
||
unit_type: OrgUnitType;
|
||
};
|
||
|
||
export type Location = Database["public"]["Tables"]["locations"]["Row"];
|
||
|
||
export type OrgMaps = {
|
||
units: Map<string, OrgUnit>;
|
||
/** Tiefensuche ab der Wurzel: eine Einheit steht immer hinter ihrem Elternteil. */
|
||
unitList: OrgUnit[];
|
||
/** Abstand zur Wurzel; die Wurzel selbst hat 0. */
|
||
depthOf: Map<string, number>;
|
||
childrenOf: Map<string | null, OrgUnit[]>;
|
||
locations: Map<string, Location>;
|
||
locationList: Location[];
|
||
};
|
||
|
||
// Die Referenzdaten sind winzig (60 Einheiten, 5 Standorte) — sie werden
|
||
// ganz geladen und im Speicher verknüpft, statt je Zeile nachzuschlagen.
|
||
/**
|
||
* Einheiten und Standorte als *Teilabfragen* — zum Einhängen in die eine
|
||
* Abfrage, die eine Seite ohnehin stellt.
|
||
*
|
||
* Fast jede Seite braucht den Baum. Als eigene Abfrage wäre das je Seitenauf-
|
||
* bau eine zusätzliche Rundreise für 65 Zeilen, die sich selten ändern; als
|
||
* Teilabfrage kostet sie nichts (lib/db/json.ts).
|
||
*/
|
||
export function orgMapsAbfragen(eb: OrgEb) {
|
||
return [
|
||
jsonArrayFrom(
|
||
eb.selectFrom("org_units").select(["id", "org_number", "name", "parent_id", "unit_type"]).orderBy("org_number")
|
||
).as("units"),
|
||
jsonArrayFrom(eb.selectFrom("locations").selectAll().orderBy("name")).as("locations"),
|
||
] as const;
|
||
}
|
||
|
||
export async function loadOrgMaps(tx: Tx): Promise<OrgMaps> {
|
||
// Beides in einer Rundreise. Ein Promise.all wäre hier keine
|
||
// Gleichzeitigkeit gewesen, sondern eine Schlange — der Grund steht in
|
||
// lib/db/json.ts.
|
||
const { units, locations } = await tx
|
||
.selectNoFrom((eb) => [...orgMapsAbfragen(eb)])
|
||
.executeTakeFirstOrThrow();
|
||
|
||
return buildOrgMaps(units as OrgUnit[], locations as Location[]);
|
||
}
|
||
|
||
/** Der reine Teil: aus den Zeilen den Baum bauen, ohne Datenbank. */
|
||
export function buildOrgMaps(units: OrgUnit[], locations: Location[]): OrgMaps {
|
||
const childrenOf = new Map<string | null, OrgUnit[]>();
|
||
for (const u of units) {
|
||
const list = childrenOf.get(u.parent_id) ?? [];
|
||
list.push(u);
|
||
childrenOf.set(u.parent_id, list);
|
||
}
|
||
for (const list of childrenOf.values()) list.sort((a, b) => a.name.localeCompare(b.name, "de"));
|
||
|
||
const unitList: OrgUnit[] = [];
|
||
const depthOf = new Map<string, number>();
|
||
const walk = (parentId: string | null, depth: number) => {
|
||
for (const u of childrenOf.get(parentId) ?? []) {
|
||
unitList.push(u);
|
||
depthOf.set(u.id, depth);
|
||
walk(u.id, depth + 1);
|
||
}
|
||
};
|
||
walk(null, 0);
|
||
|
||
return {
|
||
units: new Map(units.map((u) => [u.id, u])),
|
||
unitList,
|
||
depthOf,
|
||
childrenOf,
|
||
locations: new Map(locations.map((l) => [l.id, l])),
|
||
locationList: locations,
|
||
};
|
||
}
|
||
|
||
/** Wurzel zuerst, die Einheit selbst zuletzt. */
|
||
export function ancestorsOf(maps: OrgMaps, unitId: string | null | undefined): OrgUnit[] {
|
||
const chain: OrgUnit[] = [];
|
||
const seen = new Set<string>();
|
||
let current = unitId ? maps.units.get(unitId) : undefined;
|
||
while (current && !seen.has(current.id)) {
|
||
seen.add(current.id);
|
||
chain.unshift(current);
|
||
current = current.parent_id ? maps.units.get(current.parent_id) : undefined;
|
||
}
|
||
return chain;
|
||
}
|
||
|
||
/** Die Einheit und alles darunter — die Menge, die ein Filter „Bereich X" meint. */
|
||
export function subtreeOf(maps: OrgMaps, unitId: string): string[] {
|
||
const out: string[] = [];
|
||
const queue = [unitId];
|
||
const seen = new Set<string>();
|
||
while (queue.length > 0) {
|
||
const id = queue.shift()!;
|
||
if (seen.has(id)) continue;
|
||
seen.add(id);
|
||
out.push(id);
|
||
for (const child of maps.childrenOf.get(id) ?? []) queue.push(child.id);
|
||
}
|
||
return out;
|
||
}
|
||
|
||
/**
|
||
* „Produktion › Fertigung › Montage". Die Gesellschaft bleibt weg: sie steht
|
||
* über allem und trägt in einer Zeile nichts bei.
|
||
*/
|
||
export function breadcrumbLabel(maps: OrgMaps, unitId: string | null | undefined): string {
|
||
const chain = ancestorsOf(maps, unitId).filter((u) => u.unit_type !== "Gesellschaft");
|
||
return chain.map((u) => u.name).join(" › ") || "–";
|
||
}
|
||
|
||
/** Die oberste Einheit unterhalb der Gesellschaft — das, was früher „Bereich" hiess. */
|
||
export function divisionOf(maps: OrgMaps, unitId: string | null | undefined): OrgUnit | undefined {
|
||
return ancestorsOf(maps, unitId).find((u) => u.unit_type !== "Gesellschaft");
|
||
}
|
||
|
||
/** Die Einheit selbst, wenn sie nicht die Gesellschaft ist. */
|
||
export function unitOf(maps: OrgMaps, unitId: string | null | undefined): OrgUnit | undefined {
|
||
return unitId ? maps.units.get(unitId) : undefined;
|
||
}
|