Benjamin Admin
f042f2896b
school-service additions:
- tt_solution + tt_lesson migration. tt_lesson carries three UNIQUEs
(solution+class, solution+teacher, solution+room per slot) so the
DB itself rejects any double-booking the solver might emit by
mistake.
- Solution CRUD + GET solutions/:id/lessons endpoint with joined
class/subject/teacher/room names for display.
- POST /timetable/solutions creates the row then fires off the
solver-service via HTTP (5s timeout, mark failed if unreachable).
- SOLVER_SERVICE_URL config wired through main.go/handlers.
New service timetable-solver-service:
- Python 3.11 + FastAPI + Timefold Solver 1.21 (Apache-2.0). Dockerfile
bundles OpenJDK 17 since Timefold for Python is a JPype bridge.
- app/domain.py — Timefold @planning_entity Lesson with timeslot+room
as PlanningVariables; @planning_solution Timetable holds problem
facts (rooms/teachers/etc.) AND rule-fact collections.
- app/rules.py — frozen dataclasses mirroring 6 of the 15 tt_
constraint_* tables initially.
- app/constraints.py — ConstraintProvider with 3 universal hard
constraints (no double-booking) + 5 DB-driven constraints
(teacher_unavailable_day/window, teacher_excluded_room,
room_unavailable, room_requires_type) + 1 quality soft constraint
(subject_preferred_period). Remaining 9 constraint types ready to
plug in via the same join pattern.
- app/repository.py — async loaders for stammdaten + rules; builds
one Lesson per (curriculum row × weekly_hours), skipping rows
without a tt_assignment teacher.
- app/runner.py — runs solver in ThreadPoolExecutor so the FastAPI
event loop stays responsive. Updates tt_solution status
pending→running→completed|infeasible|failed.
- app/main.py — POST /api/v1/solve (202 Accepted, background task),
GET /api/v1/jobs/{id}, /health. School-service polls tt_solution
directly instead of GET /jobs for the typical case.
- docker-compose.yml adds the service on port 8095, depending on
core-health-check.
Tests:
- school-service: validator test for CreateTimetableSolutionRequest
(allows empty name).
- solver-service: tests/test_domain.py + tests/test_rules.py cover
construction + hashability of the planning facts. Full solve flow
deferred to Phase 8 integration with seed data.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
50 lines
2.1 KiB
Go
50 lines
2.1 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)`,
|
|
}
|
|
}
|