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>
142 lines
5.1 KiB
TypeScript
142 lines
5.1 KiB
TypeScript
import { Page } from '@playwright/test'
|
|
|
|
/**
|
|
* Shared mock helper for the /stundenplan suite. Intercepts every endpoint
|
|
* the school-service proxy serves so tests stay hermetic.
|
|
*/
|
|
|
|
export const MOCK_TEACHER_ID = '11111111-1111-1111-1111-111111111111'
|
|
export const MOCK_SUBJECT_ID = '22222222-2222-2222-2222-222222222222'
|
|
export const MOCK_CLASS_ID = '33333333-3333-3333-3333-333333333333'
|
|
|
|
export interface MockClass {
|
|
id: string
|
|
name: string
|
|
grade_level: number
|
|
student_count: number
|
|
notes?: string
|
|
created_by_user_id: string
|
|
created_at: string
|
|
}
|
|
|
|
export interface MockOpts {
|
|
classes?: MockClass[]
|
|
teachers?: unknown[]
|
|
subjects?: unknown[]
|
|
rooms?: unknown[]
|
|
periods?: unknown[]
|
|
curriculum?: unknown[]
|
|
assignments?: unknown[]
|
|
solutions?: unknown[]
|
|
lessons?: unknown[]
|
|
}
|
|
|
|
export async function mockSchoolApi(page: Page, opts: MockOpts = {}) {
|
|
const classes = opts.classes ?? []
|
|
const teachers = opts.teachers ?? []
|
|
const subjects = opts.subjects ?? []
|
|
const rooms = opts.rooms ?? []
|
|
const periods = opts.periods ?? []
|
|
const curriculum = opts.curriculum ?? []
|
|
const assignments = opts.assignments ?? []
|
|
const solutions = opts.solutions ?? []
|
|
const lessons = opts.lessons ?? []
|
|
|
|
await page.route('**/api/school/timetable/classes', async (route) => {
|
|
if (route.request().method() === 'GET') {
|
|
return route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(classes) })
|
|
}
|
|
if (route.request().method() === 'POST') {
|
|
const body = JSON.parse(route.request().postData() || '{}')
|
|
const created: MockClass = {
|
|
id: 'new-class-id',
|
|
name: body.name,
|
|
grade_level: body.grade_level,
|
|
student_count: body.student_count ?? 0,
|
|
notes: body.notes,
|
|
created_by_user_id: 'test-user',
|
|
created_at: new Date().toISOString(),
|
|
}
|
|
classes.push(created)
|
|
return route.fulfill({ status: 201, contentType: 'application/json', body: JSON.stringify(created) })
|
|
}
|
|
return route.fulfill({ status: 405 })
|
|
})
|
|
|
|
const staticList = (path: string, data: unknown) =>
|
|
page.route(`**/api/school/timetable/${path}`, async (route) =>
|
|
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(data) }))
|
|
|
|
await staticList('teachers', teachers)
|
|
await staticList('subjects', subjects)
|
|
await staticList('rooms', rooms)
|
|
await staticList('periods', periods)
|
|
await staticList('curriculum', curriculum)
|
|
await staticList('assignments', assignments)
|
|
|
|
for (const path of [
|
|
'constraints/teacher/unavailable-day',
|
|
'constraints/teacher/unavailable-window',
|
|
'constraints/teacher/max-hours-day',
|
|
'constraints/teacher/max-hours-week',
|
|
'constraints/teacher/excluded-subject',
|
|
'constraints/teacher/excluded-room',
|
|
'constraints/subject/max-consecutive',
|
|
'constraints/subject/preferred-period',
|
|
'constraints/subject/min-day-gap',
|
|
'constraints/subject/contiguous-when-repeated',
|
|
'constraints/subject/double-lesson',
|
|
'constraints/class/max-hours-day',
|
|
'constraints/class/no-gaps',
|
|
'constraints/room/requires-type',
|
|
'constraints/room/unavailable',
|
|
]) {
|
|
await staticList(path, [])
|
|
}
|
|
|
|
await page.route('**/api/school/timetable/solutions', async (route) => {
|
|
if (route.request().method() === 'GET') {
|
|
return route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(solutions) })
|
|
}
|
|
if (route.request().method() === 'POST') {
|
|
const body = JSON.parse(route.request().postData() || '{}')
|
|
const created = {
|
|
id: 'new-solution-id',
|
|
created_by_user_id: 'test-user',
|
|
name: body.name || 'Plan',
|
|
status: 'pending',
|
|
hard_score: null,
|
|
soft_score: null,
|
|
created_at: new Date().toISOString(),
|
|
}
|
|
;(solutions as unknown[]).push(created)
|
|
return route.fulfill({ status: 201, contentType: 'application/json', body: JSON.stringify(created) })
|
|
}
|
|
return route.fulfill({ status: 405 })
|
|
})
|
|
|
|
await page.route(/\/api\/school\/timetable\/solutions\/[^/]+\/lessons$/, async (route) => {
|
|
return route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(lessons) })
|
|
})
|
|
|
|
// Phase 7: lesson-level pin toggle.
|
|
await page.route(/\/api\/school\/timetable\/lessons\/[^/]+\/pin$/, async (route) => {
|
|
if (route.request().method() !== 'PUT') return route.fulfill({ status: 405 })
|
|
const body = JSON.parse(route.request().postData() || '{}')
|
|
return route.fulfill({
|
|
status: 200, contentType: 'application/json',
|
|
body: JSON.stringify({ message: 'ok', pinned: body.pinned ?? false }),
|
|
})
|
|
})
|
|
await page.route(/\/api\/school\/timetable\/solutions\/[^/]+$/, async (route) => {
|
|
if (route.request().method() === 'DELETE') {
|
|
return route.fulfill({ status: 200, contentType: 'application/json', body: '{"message":"deleted"}' })
|
|
}
|
|
const url = route.request().url()
|
|
const id = url.split('/').pop() ?? ''
|
|
const sol = (solutions as Array<{ id: string }>).find(s => s.id === id)
|
|
if (!sol) return route.fulfill({ status: 404 })
|
|
return route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(sol) })
|
|
})
|
|
}
|