Benjamin Admin
bf5ea860cc
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / test-go-school (push) Successful in 37s
CI / test-go-edu-search (push) Successful in 29s
CI / test-python-klausur (push) Failing after 3m56s
CI / test-python-agent-core (push) Successful in 19s
CI / test-nodejs-website (push) Successful in 23s
Backend (school-service):
- tt_solution gains parent_solution_id (self-FK, ON DELETE SET NULL)
and seconds_limit columns via ALTER TABLE IF NOT EXISTS.
- CreateTimetableSolutionRequest accepts optional parent_solution_id
and seconds_limit (5-600s) with binding validation.
- CreateSolution checks parent ownership before INSERT so users can't
fork another tenant's plan.
- New PUT /timetable/lessons/:id/pin endpoint; ownership enforced via
the lesson's solution.created_by_user_id JOIN.
Solver:
- Lesson.pinned now carries @PlanningPin so Timefold leaves locked
cells untouched during the search.
- build_problem() takes optional parent_solution_id; if set, copies
pinned (class_id, subject_id, day, period, room) tuples onto fresh
Lesson objects via greedy first-fit matching. Surplus pinned rows
from curriculum changes are silently dropped.
- _build_factory(seconds) replaces the module-level factory so each
job honours its tt_solution.seconds_limit override.
- persist_solution writes lesson.pinned back so subsequent re-solves
inherit it.
Frontend (studio-v2):
- SolutionList grows three knobs in the create-form: Basieren auf
(parent dropdown, only completed solutions, disabled when none),
Sekunden-Limit (5-600), and the existing Name.
- PlanView cells get a pin/unpin button with optimistic update and
rollback on error. Pinned cells gain an amber ring.
- types.ts + api.ts mirror the new fields; lessonsApi.pin(id, bool).
- HelpPanel: collapsible 6-step Bedienungsanleitung explaining the
setup-to-plan workflow. Anchored at the top of /stundenplan above
the dev token banner.
- page.tsx switches to the same gradient + animated-blob background
used on /korrektur so /stundenplan stops looking like a slate-900
test page.
- JWT dev banner gets a step-by-step explanation of how to grab the
token from DevTools and a non-blocking success indicator (no more
alert()).
Tests:
- school-service: 6 new validator cases for parent_solution_id +
seconds_limit boundaries. 73 subtests total, all green.
- studio-v2: mockSchoolApi adds PUT /lessons/:id/pin route. 5 new
Playwright tests across two suites (parent-selector visibility +
options, seconds-limit input, pin button render, pin-icon flip).
Existing tests adjusted to the new help panel + JWT banner wording.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
55 lines
2.3 KiB
Go
55 lines
2.3 KiB
Go
package database
|
|
|
|
// TimetableSolutionMigrations creates tt_solution + tt_lesson for the solver
|
|
// pipeline. One run of the solver produces exactly one tt_solution row plus
|
|
// many tt_lesson rows (one per scheduled class-subject hour).
|
|
//
|
|
// Status flow:
|
|
//
|
|
// pending → running → completed | failed | infeasible
|
|
//
|
|
// hard_score / soft_score come straight from Timefold's HardSoftScore. Lower
|
|
// (more negative) hard_score means more hard-constraint violations; the UI
|
|
// only ever offers solutions with hard_score == 0 as "valid".
|
|
func TimetableSolutionMigrations() []string {
|
|
return []string{
|
|
`CREATE TABLE IF NOT EXISTS tt_solution (
|
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
created_by_user_id UUID NOT NULL,
|
|
name VARCHAR(120),
|
|
status VARCHAR(20) NOT NULL DEFAULT 'pending',
|
|
hard_score INT,
|
|
soft_score INT,
|
|
error_message TEXT,
|
|
started_at TIMESTAMPTZ,
|
|
finished_at TIMESTAMPTZ,
|
|
created_at TIMESTAMPTZ DEFAULT NOW()
|
|
)`,
|
|
|
|
`CREATE TABLE IF NOT EXISTS tt_lesson (
|
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
solution_id UUID NOT NULL REFERENCES tt_solution(id) ON DELETE CASCADE,
|
|
class_id UUID NOT NULL REFERENCES tt_class(id) ON DELETE CASCADE,
|
|
subject_id UUID NOT NULL REFERENCES tt_subject(id) ON DELETE CASCADE,
|
|
teacher_id UUID NOT NULL REFERENCES tt_teacher(id) ON DELETE CASCADE,
|
|
room_id UUID REFERENCES tt_room(id) ON DELETE SET NULL,
|
|
day_of_week INT NOT NULL CHECK (day_of_week BETWEEN 1 AND 7),
|
|
period_index INT NOT NULL CHECK (period_index BETWEEN 1 AND 12),
|
|
pinned BOOLEAN NOT NULL DEFAULT false,
|
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
|
UNIQUE(solution_id, class_id, day_of_week, period_index),
|
|
UNIQUE(solution_id, teacher_id, day_of_week, period_index),
|
|
UNIQUE(solution_id, room_id, day_of_week, period_index)
|
|
)`,
|
|
|
|
`CREATE INDEX IF NOT EXISTS idx_tt_solution_user ON tt_solution(created_by_user_id)`,
|
|
`CREATE INDEX IF NOT EXISTS idx_tt_lesson_solution ON tt_lesson(solution_id)`,
|
|
`CREATE INDEX IF NOT EXISTS idx_tt_lesson_class ON tt_lesson(class_id)`,
|
|
`CREATE INDEX IF NOT EXISTS idx_tt_lesson_teacher ON tt_lesson(teacher_id)`,
|
|
|
|
// Phase 7: plan versioning + per-solve solver-timeout override.
|
|
`ALTER TABLE tt_solution ADD COLUMN IF NOT EXISTS parent_solution_id UUID REFERENCES tt_solution(id) ON DELETE SET NULL`,
|
|
`ALTER TABLE tt_solution ADD COLUMN IF NOT EXISTS seconds_limit INT`,
|
|
}
|
|
}
|