Maximilian Stubhan
b87c8ad64c
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>
80 lines
3.3 KiB
TypeScript
80 lines
3.3 KiB
TypeScript
import type { Expression, ExpressionBuilder, SqlBool } from "kysely";
|
|
import type { Schema } from "./db/schema";
|
|
import type { EmploymentStatus } from "./types";
|
|
|
|
// The SQL counterpart of deriveStatusAsOf() in lib/reports.ts.
|
|
//
|
|
// The employee list is paged in the database, so it cannot derive status in
|
|
// JavaScript the way the reports and the dashboard do — it has to filter on
|
|
// the server. Filtering on the `employees.status` column instead was the
|
|
// reason a dashboard tile and the list it links to could disagree: that
|
|
// column holds whatever the last mutation or cron run wrote, while every
|
|
// other surface computes status from entry/exit/karenz dates.
|
|
//
|
|
// Kept deliberately close to deriveStatusAsOf, clause for clause:
|
|
//
|
|
// entry_date > asOf -> Geplant
|
|
// exit_date <= asOf -> Ausgetreten
|
|
// karenz window covers asOf -> Karenz
|
|
// otherwise -> Aktiv
|
|
//
|
|
// tests/integration/employee-status-filter.test.ts asserts the two agree
|
|
// against a real database, which is the only place that can prove it.
|
|
|
|
type Eb = ExpressionBuilder<Schema, "employees">;
|
|
|
|
/** True once the person has started and has not left yet. */
|
|
function employed(eb: Eb, asOf: string): Expression<SqlBool> {
|
|
return eb.and([eb("entry_date", "<=", asOf), eb.or([eb("exit_date", "is", null), eb("exit_date", ">", asOf)])]);
|
|
}
|
|
|
|
/**
|
|
* Die Bedingung für die Menge, deren *abgeleiteter* Status am Stichtag einer
|
|
* der genannten ist — oder null, wenn nicht eingeschränkt werden soll.
|
|
*
|
|
* Nur die Kombinationen, die die Oberfläche anbietet, sind abgedeckt. Für
|
|
* alles andere kommt null zurück: lieber nicht filtern als falsch filtern.
|
|
*/
|
|
export function derivedStatusFilter(eb: Eb, statuses: EmploymentStatus[], asOf: string): Expression<SqlBool> | null {
|
|
const wanted = new Set(statuses);
|
|
if (wanted.size === 0) return null;
|
|
|
|
// A single non-employed status is a straight date comparison.
|
|
if (wanted.size === 1 && wanted.has("Geplant")) return eb("entry_date", ">", asOf);
|
|
if (wanted.size === 1 && wanted.has("Ausgetreten")) {
|
|
return eb.and([eb("exit_date", "is not", null), eb("exit_date", "<=", asOf)]);
|
|
}
|
|
|
|
const wantsAktiv = wanted.has("Aktiv");
|
|
const wantsKarenz = wanted.has("Karenz");
|
|
|
|
// Everyone employed today, whether or not they are on leave.
|
|
if (wantsAktiv && wantsKarenz && wanted.size === 2) return employed(eb, asOf);
|
|
|
|
if (wantsKarenz && !wantsAktiv && wanted.size === 1) {
|
|
return eb.and([
|
|
employed(eb, asOf),
|
|
eb("karenz_start_date", "is not", null),
|
|
eb("karenz_start_date", "<=", asOf),
|
|
eb.or([eb("karenz_return_date", "is", null), eb("karenz_return_date", ">", asOf)]),
|
|
]);
|
|
}
|
|
|
|
if (wantsAktiv && !wantsKarenz && wanted.size === 1) {
|
|
// Employed but *not* inside a karenz window: either no start date, a
|
|
// start still ahead, or a return that has already happened.
|
|
return eb.and([
|
|
employed(eb, asOf),
|
|
eb.or([
|
|
eb("karenz_start_date", "is", null),
|
|
eb("karenz_start_date", ">", asOf),
|
|
eb("karenz_return_date", "<=", asOf),
|
|
]),
|
|
]);
|
|
}
|
|
|
|
// Mixed selections spanning employed and non-employed states have no UI
|
|
// path today; filtering on a guess would be worse than not filtering.
|
|
return null;
|
|
}
|