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.0 KiB
Go
50 lines
2.0 KiB
Go
package models
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
// TimetableSolution is one run of the solver — exactly one row per solve.
|
|
// Lessons attached via tt_lesson.solution_id.
|
|
type TimetableSolution struct {
|
|
ID uuid.UUID `json:"id" db:"id"`
|
|
CreatedByUserID uuid.UUID `json:"created_by_user_id" db:"created_by_user_id"`
|
|
Name string `json:"name,omitempty" db:"name"`
|
|
Status string `json:"status" db:"status"`
|
|
HardScore *int `json:"hard_score,omitempty" db:"hard_score"`
|
|
SoftScore *int `json:"soft_score,omitempty" db:"soft_score"`
|
|
ErrorMessage string `json:"error_message,omitempty" db:"error_message"`
|
|
StartedAt *time.Time `json:"started_at,omitempty" db:"started_at"`
|
|
FinishedAt *time.Time `json:"finished_at,omitempty" db:"finished_at"`
|
|
CreatedAt time.Time `json:"created_at" db:"created_at"`
|
|
}
|
|
|
|
// TimetableLesson is one scheduled class-period in a solution.
|
|
type TimetableLesson struct {
|
|
ID uuid.UUID `json:"id" db:"id"`
|
|
SolutionID uuid.UUID `json:"solution_id" db:"solution_id"`
|
|
ClassID uuid.UUID `json:"class_id" db:"class_id"`
|
|
SubjectID uuid.UUID `json:"subject_id" db:"subject_id"`
|
|
TeacherID uuid.UUID `json:"teacher_id" db:"teacher_id"`
|
|
RoomID *uuid.UUID `json:"room_id,omitempty" db:"room_id"`
|
|
DayOfWeek int `json:"day_of_week" db:"day_of_week"`
|
|
PeriodIndex int `json:"period_index" db:"period_index"`
|
|
Pinned bool `json:"pinned" db:"pinned"`
|
|
CreatedAt time.Time `json:"created_at" db:"created_at"`
|
|
|
|
// Joined fields for display
|
|
ClassName string `json:"class_name,omitempty"`
|
|
SubjectName string `json:"subject_name,omitempty"`
|
|
TeacherName string `json:"teacher_name,omitempty"`
|
|
RoomName string `json:"room_name,omitempty"`
|
|
}
|
|
|
|
// CreateTimetableSolutionRequest kicks off a solve. The solver-service is
|
|
// invoked async — this endpoint only registers the solution row and queues
|
|
// the job.
|
|
type CreateTimetableSolutionRequest struct {
|
|
Name string `json:"name"`
|
|
}
|