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>
112 lines
3.5 KiB
Go
112 lines
3.5 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/breakpilot/school-service/internal/models"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// ---------- Solutions ----------
|
|
|
|
func (h *Handler) CreateTimetableSolution(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
var req models.CreateTimetableSolutionRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
respondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
sol, err := h.timetableService.CreateSolution(c.Request.Context(), uid, &req)
|
|
if err != nil {
|
|
respondError(c, http.StatusInternalServerError, "Failed to create solution: "+err.Error())
|
|
return
|
|
}
|
|
// Fire-and-forget the solver invocation; the row is persisted regardless.
|
|
if err := h.timetableService.TriggerSolve(c.Request.Context(), h.solverServiceURL, sol.ID.String(), uid); err != nil {
|
|
// Don't fail the request — the solution row already shows status=failed.
|
|
// The client will see error_message via GET /solutions/:id.
|
|
respondCreated(c, sol)
|
|
return
|
|
}
|
|
respondCreated(c, sol)
|
|
}
|
|
|
|
func (h *Handler) ListTimetableSolutions(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
out, err := h.timetableService.ListSolutions(c.Request.Context(), uid)
|
|
if err != nil {
|
|
respondError(c, http.StatusInternalServerError, "Failed to list solutions: "+err.Error())
|
|
return
|
|
}
|
|
respondSuccess(c, out)
|
|
}
|
|
|
|
func (h *Handler) GetTimetableSolution(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
sol, err := h.timetableService.GetSolution(c.Request.Context(), c.Param("id"), uid)
|
|
if err != nil {
|
|
respondError(c, http.StatusNotFound, "Solution not found")
|
|
return
|
|
}
|
|
respondSuccess(c, sol)
|
|
}
|
|
|
|
func (h *Handler) ListTimetableLessons(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
out, err := h.timetableService.ListLessons(c.Request.Context(), c.Param("id"), uid)
|
|
if err != nil {
|
|
respondError(c, http.StatusInternalServerError, "Failed to list lessons: "+err.Error())
|
|
return
|
|
}
|
|
respondSuccess(c, out)
|
|
}
|
|
|
|
func (h *Handler) DeleteTimetableSolution(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
if err := h.timetableService.DeleteSolution(c.Request.Context(), c.Param("id"), uid); err != nil {
|
|
respondError(c, http.StatusInternalServerError, "Failed to delete solution: "+err.Error())
|
|
return
|
|
}
|
|
c.JSON(http.StatusOK, gin.H{"message": "Solution deleted"})
|
|
}
|
|
|
|
// UpdateTimetableLessonPin flips the pinned flag on a single lesson.
|
|
// The solver respects pinned cells via @PlanningPin when this user re-solves.
|
|
func (h *Handler) UpdateTimetableLessonPin(c *gin.Context) {
|
|
uid := getUserID(c)
|
|
if uid == "" {
|
|
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
|
return
|
|
}
|
|
var req models.UpdateLessonPinRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
respondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
if err := h.timetableService.UpdateLessonPin(c.Request.Context(), c.Param("id"), uid, req.Pinned); err != nil {
|
|
respondError(c, http.StatusInternalServerError, "Failed to update lesson pin: "+err.Error())
|
|
return
|
|
}
|
|
c.JSON(http.StatusOK, gin.H{"message": "Lesson pin updated", "pinned": req.Pinned})
|
|
}
|