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>
72 lines
2.1 KiB
Go
72 lines
2.1 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/breakpilot/school-service/internal/services"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
// Handler holds all the service dependencies
|
|
type Handler struct {
|
|
classService *services.ClassService
|
|
examService *services.ExamService
|
|
gradeService *services.GradeService
|
|
gradebookService *services.GradebookService
|
|
certificateService *services.CertificateService
|
|
aiService *services.AIService
|
|
timetableService *services.TimetableService
|
|
solverServiceURL string
|
|
}
|
|
|
|
// NewHandler creates a new Handler with all services
|
|
func NewHandler(db *pgxpool.Pool, llmGatewayURL, solverServiceURL string) *Handler {
|
|
classService := services.NewClassService(db)
|
|
examService := services.NewExamService(db)
|
|
gradeService := services.NewGradeService(db)
|
|
gradebookService := services.NewGradebookService(db)
|
|
certificateService := services.NewCertificateService(db, gradeService, gradebookService)
|
|
aiService := services.NewAIService(llmGatewayURL)
|
|
timetableService := services.NewTimetableService(db)
|
|
|
|
return &Handler{
|
|
classService: classService,
|
|
examService: examService,
|
|
gradeService: gradeService,
|
|
gradebookService: gradebookService,
|
|
certificateService: certificateService,
|
|
aiService: aiService,
|
|
timetableService: timetableService,
|
|
solverServiceURL: solverServiceURL,
|
|
}
|
|
}
|
|
|
|
// Health returns the service health status
|
|
func (h *Handler) Health(c *gin.Context) {
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"status": "healthy",
|
|
"service": "school-service",
|
|
})
|
|
}
|
|
|
|
// getUserID extracts the user ID from the context (set by auth middleware)
|
|
func getUserID(c *gin.Context) string {
|
|
return c.GetString("user_id")
|
|
}
|
|
|
|
// respondError sends an error response
|
|
func respondError(c *gin.Context, status int, message string) {
|
|
c.JSON(status, gin.H{"error": message})
|
|
}
|
|
|
|
// respondSuccess sends a success response with data
|
|
func respondSuccess(c *gin.Context, data interface{}) {
|
|
c.JSON(http.StatusOK, data)
|
|
}
|
|
|
|
// respondCreated sends a created response with data
|
|
func respondCreated(c *gin.Context, data interface{}) {
|
|
c.JSON(http.StatusCreated, data)
|
|
}
|