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>
239 lines
11 KiB
Go
239 lines
11 KiB
Go
package main
|
|
|
|
import (
|
|
"log"
|
|
|
|
"github.com/breakpilot/school-service/internal/config"
|
|
"github.com/breakpilot/school-service/internal/database"
|
|
"github.com/breakpilot/school-service/internal/handlers"
|
|
"github.com/breakpilot/school-service/internal/middleware"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func main() {
|
|
// Load configuration
|
|
cfg, err := config.Load()
|
|
if err != nil {
|
|
log.Fatalf("Failed to load configuration: %v", err)
|
|
}
|
|
|
|
// Set Gin mode based on environment
|
|
if cfg.Environment == "production" {
|
|
gin.SetMode(gin.ReleaseMode)
|
|
}
|
|
|
|
// Connect to database
|
|
db, err := database.Connect(cfg.DatabaseURL)
|
|
if err != nil {
|
|
log.Fatalf("Failed to connect to database: %v", err)
|
|
}
|
|
defer db.Close()
|
|
|
|
// Run migrations
|
|
if err := database.Migrate(db); err != nil {
|
|
log.Fatalf("Failed to run migrations: %v", err)
|
|
}
|
|
|
|
// Create handler
|
|
handler := handlers.NewHandler(db.Pool, cfg.LLMGatewayURL, cfg.SolverServiceURL)
|
|
|
|
// Create router
|
|
router := gin.New()
|
|
router.Use(gin.Recovery())
|
|
router.Use(middleware.RequestLogger())
|
|
router.Use(middleware.CORS())
|
|
router.Use(middleware.RateLimiter())
|
|
|
|
// Health endpoint (no auth required)
|
|
router.GET("/health", handler.Health)
|
|
|
|
// API routes (auth required)
|
|
api := router.Group("/api/v1/school")
|
|
api.Use(middleware.AuthMiddleware(cfg.JWTSecret))
|
|
{
|
|
// School Years
|
|
api.GET("/years", handler.GetSchoolYears)
|
|
api.POST("/years", handler.CreateSchoolYear)
|
|
|
|
// Classes
|
|
api.GET("/classes", handler.GetClasses)
|
|
api.POST("/classes", handler.CreateClass)
|
|
api.GET("/classes/:id", handler.GetClass)
|
|
api.DELETE("/classes/:id", handler.DeleteClass)
|
|
|
|
// Students (nested under classes)
|
|
api.GET("/classes/:id/students", handler.GetStudents)
|
|
api.POST("/classes/:id/students", handler.CreateStudent)
|
|
api.POST("/classes/:id/students/import", handler.ImportStudents)
|
|
api.DELETE("/classes/:id/students/:studentId", handler.DeleteStudent)
|
|
|
|
// Subjects
|
|
api.GET("/subjects", handler.GetSubjects)
|
|
api.POST("/subjects", handler.CreateSubject)
|
|
api.DELETE("/subjects/:id", handler.DeleteSubject)
|
|
|
|
// Exams
|
|
api.GET("/exams", handler.GetExams)
|
|
api.POST("/exams", handler.CreateExam)
|
|
api.GET("/exams/:id", handler.GetExam)
|
|
api.PUT("/exams/:id", handler.UpdateExam)
|
|
api.DELETE("/exams/:id", handler.DeleteExam)
|
|
api.POST("/exams/:id/generate-variant", handler.GenerateExamVariant)
|
|
api.GET("/exams/:id/results", handler.GetExamResults)
|
|
api.POST("/exams/:id/results", handler.SaveExamResults)
|
|
api.PUT("/exams/:id/results/:studentId/approve", handler.ApproveExamResult)
|
|
api.GET("/exams/:id/needs-rewrite", handler.GetStudentsNeedingRewrite)
|
|
|
|
// Grades
|
|
api.GET("/grades/:classId", handler.GetClassGrades)
|
|
api.GET("/grades/student/:studentId", handler.GetStudentGrades)
|
|
api.PUT("/grades/:studentId/:subjectId/oral", handler.UpdateOralGrade)
|
|
api.POST("/grades/calculate", handler.CalculateFinalGrades)
|
|
api.POST("/grades/transfer", handler.TransferApprovedGrades)
|
|
api.PUT("/grades/:studentId/:subjectId/lock", handler.LockFinalGrade)
|
|
api.PUT("/grades/:studentId/:subjectId/weights", handler.UpdateGradeWeights)
|
|
|
|
// Statistics
|
|
api.GET("/statistics/:classId", handler.GetClassStatistics)
|
|
api.GET("/statistics/:classId/subject/:subjectId", handler.GetSubjectStatistics)
|
|
api.GET("/statistics/student/:studentId", handler.GetStudentStatistics)
|
|
api.GET("/statistics/:classId/notenspiegel", handler.GetNotenspiegel)
|
|
|
|
// Attendance
|
|
api.GET("/attendance/:classId", handler.GetClassAttendance)
|
|
api.GET("/attendance/student/:studentId", handler.GetStudentAttendance)
|
|
api.POST("/attendance", handler.CreateAttendance)
|
|
api.POST("/attendance/:classId/bulk", handler.BulkCreateAttendance)
|
|
api.DELETE("/attendance/:id", handler.DeleteAttendance)
|
|
|
|
// Gradebook Entries
|
|
api.GET("/gradebook/:classId", handler.GetGradebookEntries)
|
|
api.GET("/gradebook/student/:studentId", handler.GetStudentEntries)
|
|
api.POST("/gradebook", handler.CreateGradebookEntry)
|
|
api.DELETE("/gradebook/:id", handler.DeleteGradebookEntry)
|
|
|
|
// Certificates
|
|
api.GET("/certificates/templates", handler.GetCertificateTemplates)
|
|
api.GET("/certificates/class/:classId", handler.GetClassCertificates)
|
|
api.GET("/certificates/feedback/:studentId", handler.GenerateGradeFeedback)
|
|
api.POST("/certificates/generate", handler.GenerateCertificate)
|
|
api.POST("/certificates/generate-bulk", handler.BulkGenerateCertificates)
|
|
api.GET("/certificates/detail/:id", handler.GetCertificate)
|
|
api.PUT("/certificates/detail/:id", handler.UpdateCertificate)
|
|
api.PUT("/certificates/detail/:id/finalize", handler.FinalizeCertificate)
|
|
api.GET("/certificates/detail/:id/pdf", handler.GetCertificatePDF)
|
|
api.DELETE("/certificates/detail/:id", handler.DeleteCertificate)
|
|
|
|
// Timetable Scheduler — Stammdaten
|
|
api.GET("/timetable/classes", handler.ListTimetableClasses)
|
|
api.POST("/timetable/classes", handler.CreateTimetableClass)
|
|
api.DELETE("/timetable/classes/:id", handler.DeleteTimetableClass)
|
|
|
|
api.GET("/timetable/periods", handler.ListTimetablePeriods)
|
|
api.POST("/timetable/periods", handler.CreateTimetablePeriod)
|
|
api.DELETE("/timetable/periods/:id", handler.DeleteTimetablePeriod)
|
|
|
|
api.GET("/timetable/rooms", handler.ListTimetableRooms)
|
|
api.POST("/timetable/rooms", handler.CreateTimetableRoom)
|
|
api.DELETE("/timetable/rooms/:id", handler.DeleteTimetableRoom)
|
|
|
|
api.GET("/timetable/subjects", handler.ListTimetableSubjects)
|
|
api.POST("/timetable/subjects", handler.CreateTimetableSubject)
|
|
api.DELETE("/timetable/subjects/:id", handler.DeleteTimetableSubject)
|
|
|
|
api.GET("/timetable/teachers", handler.ListTimetableTeachers)
|
|
api.POST("/timetable/teachers", handler.CreateTimetableTeacher)
|
|
api.DELETE("/timetable/teachers/:id", handler.DeleteTimetableTeacher)
|
|
|
|
// Timetable Scheduler — Relations
|
|
api.GET("/timetable/curriculum", handler.ListTimetableCurriculum)
|
|
api.POST("/timetable/curriculum", handler.CreateTimetableCurriculum)
|
|
api.DELETE("/timetable/curriculum/:id", handler.DeleteTimetableCurriculum)
|
|
|
|
api.GET("/timetable/assignments", handler.ListTimetableAssignments)
|
|
api.POST("/timetable/assignments", handler.CreateTimetableAssignment)
|
|
api.DELETE("/timetable/assignments/:id", handler.DeleteTimetableAssignment)
|
|
|
|
// Timetable Scheduler — Constraints (15 typed tables)
|
|
// Teacher
|
|
api.GET("/timetable/constraints/teacher/unavailable-day", handler.ListTeacherUnavailableDays)
|
|
api.POST("/timetable/constraints/teacher/unavailable-day", handler.CreateTeacherUnavailableDay)
|
|
api.DELETE("/timetable/constraints/teacher/unavailable-day/:id", handler.DeleteTeacherUnavailableDay)
|
|
|
|
api.GET("/timetable/constraints/teacher/unavailable-window", handler.ListTeacherUnavailableWindows)
|
|
api.POST("/timetable/constraints/teacher/unavailable-window", handler.CreateTeacherUnavailableWindow)
|
|
api.DELETE("/timetable/constraints/teacher/unavailable-window/:id", handler.DeleteTeacherUnavailableWindow)
|
|
|
|
api.GET("/timetable/constraints/teacher/max-hours-day", handler.ListTeacherMaxHoursDay)
|
|
api.POST("/timetable/constraints/teacher/max-hours-day", handler.CreateTeacherMaxHoursDay)
|
|
api.DELETE("/timetable/constraints/teacher/max-hours-day/:id", handler.DeleteTeacherMaxHoursDay)
|
|
|
|
api.GET("/timetable/constraints/teacher/max-hours-week", handler.ListTeacherMaxHoursWeek)
|
|
api.POST("/timetable/constraints/teacher/max-hours-week", handler.CreateTeacherMaxHoursWeek)
|
|
api.DELETE("/timetable/constraints/teacher/max-hours-week/:id", handler.DeleteTeacherMaxHoursWeek)
|
|
|
|
api.GET("/timetable/constraints/teacher/excluded-subject", handler.ListTeacherExcludedSubjects)
|
|
api.POST("/timetable/constraints/teacher/excluded-subject", handler.CreateTeacherExcludedSubject)
|
|
api.DELETE("/timetable/constraints/teacher/excluded-subject/:id", handler.DeleteTeacherExcludedSubject)
|
|
|
|
api.GET("/timetable/constraints/teacher/excluded-room", handler.ListTeacherExcludedRooms)
|
|
api.POST("/timetable/constraints/teacher/excluded-room", handler.CreateTeacherExcludedRoom)
|
|
api.DELETE("/timetable/constraints/teacher/excluded-room/:id", handler.DeleteTeacherExcludedRoom)
|
|
|
|
// Subject
|
|
api.GET("/timetable/constraints/subject/min-day-gap", handler.ListSubjectMinDayGaps)
|
|
api.POST("/timetable/constraints/subject/min-day-gap", handler.CreateSubjectMinDayGap)
|
|
api.DELETE("/timetable/constraints/subject/min-day-gap/:id", handler.DeleteSubjectMinDayGap)
|
|
|
|
api.GET("/timetable/constraints/subject/max-consecutive", handler.ListSubjectMaxConsecutives)
|
|
api.POST("/timetable/constraints/subject/max-consecutive", handler.CreateSubjectMaxConsecutive)
|
|
api.DELETE("/timetable/constraints/subject/max-consecutive/:id", handler.DeleteSubjectMaxConsecutive)
|
|
|
|
api.GET("/timetable/constraints/subject/contiguous-when-repeated", handler.ListSubjectContiguousWhenRepeated)
|
|
api.POST("/timetable/constraints/subject/contiguous-when-repeated", handler.CreateSubjectContiguousWhenRepeated)
|
|
api.DELETE("/timetable/constraints/subject/contiguous-when-repeated/:id", handler.DeleteSubjectContiguousWhenRepeated)
|
|
|
|
api.GET("/timetable/constraints/subject/preferred-period", handler.ListSubjectPreferredPeriods)
|
|
api.POST("/timetable/constraints/subject/preferred-period", handler.CreateSubjectPreferredPeriod)
|
|
api.DELETE("/timetable/constraints/subject/preferred-period/:id", handler.DeleteSubjectPreferredPeriod)
|
|
|
|
api.GET("/timetable/constraints/subject/double-lesson", handler.ListSubjectDoubleLessons)
|
|
api.POST("/timetable/constraints/subject/double-lesson", handler.CreateSubjectDoubleLesson)
|
|
api.DELETE("/timetable/constraints/subject/double-lesson/:id", handler.DeleteSubjectDoubleLesson)
|
|
|
|
// Class
|
|
api.GET("/timetable/constraints/class/max-hours-day", handler.ListClassMaxHoursDay)
|
|
api.POST("/timetable/constraints/class/max-hours-day", handler.CreateClassMaxHoursDay)
|
|
api.DELETE("/timetable/constraints/class/max-hours-day/:id", handler.DeleteClassMaxHoursDay)
|
|
|
|
api.GET("/timetable/constraints/class/no-gaps", handler.ListClassNoGaps)
|
|
api.POST("/timetable/constraints/class/no-gaps", handler.CreateClassNoGaps)
|
|
api.DELETE("/timetable/constraints/class/no-gaps/:id", handler.DeleteClassNoGaps)
|
|
|
|
// Room
|
|
api.GET("/timetable/constraints/room/requires-type", handler.ListRoomRequiresTypes)
|
|
api.POST("/timetable/constraints/room/requires-type", handler.CreateRoomRequiresType)
|
|
api.DELETE("/timetable/constraints/room/requires-type/:id", handler.DeleteRoomRequiresType)
|
|
|
|
api.GET("/timetable/constraints/room/unavailable", handler.ListRoomUnavailable)
|
|
api.POST("/timetable/constraints/room/unavailable", handler.CreateRoomUnavailable)
|
|
api.DELETE("/timetable/constraints/room/unavailable/:id", handler.DeleteRoomUnavailable)
|
|
|
|
// Timetable Solver — Solutions
|
|
api.GET("/timetable/solutions", handler.ListTimetableSolutions)
|
|
api.POST("/timetable/solutions", handler.CreateTimetableSolution)
|
|
api.GET("/timetable/solutions/:id", handler.GetTimetableSolution)
|
|
api.DELETE("/timetable/solutions/:id", handler.DeleteTimetableSolution)
|
|
api.GET("/timetable/solutions/:id/lessons", handler.ListTimetableLessons)
|
|
|
|
// Phase 7: pin/unpin individual lessons for the next re-solve.
|
|
api.PUT("/timetable/lessons/:id/pin", handler.UpdateTimetableLessonPin)
|
|
}
|
|
|
|
// Start server
|
|
log.Printf("School Service starting on port %s", cfg.Port)
|
|
if err := router.Run(":" + cfg.Port); err != nil {
|
|
log.Fatalf("Failed to start server: %v", err)
|
|
}
|
|
}
|