Phase 9a: Schulkalender — Bundesland-Auswahl + Monatsansicht mit Ferien
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 29s
CI / test-go-edu-search (push) Successful in 27s
CI / test-python-klausur (push) Failing after 2m50s
CI / test-python-agent-core (push) Successful in 18s
CI / test-nodejs-website (push) Successful in 21s
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 29s
CI / test-go-edu-search (push) Successful in 27s
CI / test-python-klausur (push) Failing after 2m50s
CI / test-python-agent-core (push) Successful in 18s
CI / test-nodejs-website (push) Successful in 21s
Backend (school-service):
- cal_public_event (region, event_type, name_de, name_en, start/end,
UNIQUE(region, event_type, name_de, start_date)) — global snapshot.
- cal_school_config (user_id PRIMARY KEY, bundesland, school year dates).
- cal_school_event — Schul-eigene Termine; CRUD folgt in 9b.
- GET /calendar/holidays?region=&from=&to= — Range-Query against
cal_public_event, ordered by start_date.
- GET / PUT /calendar/config — upsert Bundesland per User.
- SeedFromSnapshot reads internal/seed/calendar_holidays.json on every
boot; idempotent via the unique constraint. Async goroutine so the
HTTP server starts immediately even if the seed file is large.
Data source:
- scripts/calendar-snapshot.sh ruft openholidaysapi.org fuer alle 16
Bundeslaender x 3 Schuljahre und schreibt
school-service/internal/seed/calendar_holidays.json (854 Events,
Stand Schuljahre 2026-2028).
- Dockerfile kopiert das seed/-Verzeichnis ins Image, damit die
Container-Datenbank beim ersten Start gefuellt wird.
Frontend (studio-v2):
- /schulkalender Page mit Gradient + Blobs wie /stundenplan und
/korrektur — gleicher Visual-Style.
- BundeslandWizard: zeigt alle 16 Laender als Dropdown, speichert
bei Klick die Config und switcht zur Monatsansicht.
- MonthView: 6-Wochen-Grid Mo-So, Feiertage rose-toned, Schulferien
amber-toned, heutiges Datum mit Indigo-Ring. Prev/Next/Heute
Navigation.
- lib/schulkalender/api.ts re-uses the stundenplan JWT helper so
auth-mode wechselt nicht.
- Sidebar bekommt einen Schulkalender-Eintrag (Icon mit Datum-Dots,
Pfad /schulkalender) in allen 26 Sprachen.
Tests:
- Go: 3 neue Validator-Tests (Bundesland len=5, EventType oneof,
Pflichtfelder). 77 Tests gesamt, alle gruen.
- Playwright: e2e/schulkalender.spec.ts mit Wizard, Save-Flow,
MonthView-Render, Heute-Button, Sidebar-Link. Hermetisch via
mockCalendarApi.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -40,6 +40,9 @@ COPY --from=builder /app/school-service .
|
||||
# Copy templates directory
|
||||
COPY --from=builder /app/templates ./templates
|
||||
|
||||
# Copy calendar seed snapshot (Phase 9a — OpenHolidaysAPI data)
|
||||
COPY --from=builder /app/internal/seed ./internal/seed
|
||||
|
||||
# Use non-root user
|
||||
USER appuser
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/breakpilot/school-service/internal/config"
|
||||
"github.com/breakpilot/school-service/internal/database"
|
||||
@@ -37,6 +39,19 @@ func main() {
|
||||
// Create handler
|
||||
handler := handlers.NewHandler(db.Pool, cfg.LLMGatewayURL, cfg.SolverServiceURL)
|
||||
|
||||
// Calendar seed — idempotent, runs every boot. Snapshot path is bundled
|
||||
// in the Docker image at /app/internal/seed/calendar_holidays.json. Failures
|
||||
// don't block startup; the holiday table is filled lazily next boot.
|
||||
go func() {
|
||||
seedPath := "internal/seed/calendar_holidays.json"
|
||||
if _, err := os.Stat(seedPath); err != nil {
|
||||
seedPath = "/app/internal/seed/calendar_holidays.json"
|
||||
}
|
||||
if err := handler.CalendarService().SeedFromSnapshot(context.Background(), seedPath); err != nil {
|
||||
log.Printf("calendar seed failed: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
// Create router
|
||||
router := gin.New()
|
||||
router.Use(gin.Recovery())
|
||||
@@ -232,6 +247,11 @@ func main() {
|
||||
// Phase 8: exports.
|
||||
api.GET("/timetable/solutions/:id/export.csv", handler.ExportTimetableSolutionCSV)
|
||||
api.GET("/timetable/solutions/:id/export.ics", handler.ExportTimetableSolutionICS)
|
||||
|
||||
// Phase 9a: Schulkalender (holidays + per-user Bundesland config).
|
||||
api.GET("/calendar/holidays", handler.ListCalendarHolidays)
|
||||
api.GET("/calendar/config", handler.GetCalendarConfig)
|
||||
api.PUT("/calendar/config", handler.UpsertCalendarConfig)
|
||||
}
|
||||
|
||||
// Start server
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
package database
|
||||
|
||||
// CalendarMigrations creates the three calendar tables for Phase 9a:
|
||||
//
|
||||
// cal_public_event — read-only snapshot of school holidays + public
|
||||
// holidays from OpenHolidaysAPI. Imported on first
|
||||
// boot via seed/calendar_holidays.json.
|
||||
// cal_school_config — per-Rektor bundesland selection (1 row per user).
|
||||
// cal_school_event — user-managed school events (Fortbildung,
|
||||
// Schulfeier, Klassenfahrt etc.).
|
||||
//
|
||||
// cal_public_event is global (no created_by_user_id) because the data is the
|
||||
// same for every school in a given bundesland. School-events are
|
||||
// per-tenant.
|
||||
func CalendarMigrations() []string {
|
||||
return []string{
|
||||
`CREATE TABLE IF NOT EXISTS cal_public_event (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
region VARCHAR(8) NOT NULL,
|
||||
event_type VARCHAR(20) NOT NULL CHECK (event_type IN ('public_holiday', 'school_holiday')),
|
||||
name_de VARCHAR(255) NOT NULL,
|
||||
name_en VARCHAR(255),
|
||||
start_date DATE NOT NULL,
|
||||
end_date DATE NOT NULL,
|
||||
source VARCHAR(50) DEFAULT 'OpenHolidaysAPI',
|
||||
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
UNIQUE(region, event_type, name_de, start_date),
|
||||
CHECK (end_date >= start_date)
|
||||
)`,
|
||||
|
||||
`CREATE TABLE IF NOT EXISTS cal_school_config (
|
||||
user_id UUID PRIMARY KEY,
|
||||
bundesland VARCHAR(8) NOT NULL,
|
||||
school_year_start DATE,
|
||||
school_year_end DATE,
|
||||
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ DEFAULT NOW()
|
||||
)`,
|
||||
|
||||
`CREATE TABLE IF NOT EXISTS cal_school_event (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
created_by_user_id UUID NOT NULL,
|
||||
title VARCHAR(255) NOT NULL,
|
||||
description TEXT,
|
||||
event_type VARCHAR(30) NOT NULL
|
||||
CHECK (event_type IN ('fortbildung','schulfeier','klassenfahrt','projekttag','eltern_info','andere')),
|
||||
is_school_free BOOLEAN DEFAULT false,
|
||||
start_date DATE NOT NULL,
|
||||
end_date DATE NOT NULL,
|
||||
start_time TIME,
|
||||
end_time TIME,
|
||||
affected_class_ids UUID[] DEFAULT '{}',
|
||||
visible_to_parents BOOLEAN DEFAULT true,
|
||||
notify_parents BOOLEAN DEFAULT false,
|
||||
notify_students BOOLEAN DEFAULT false,
|
||||
notification_lead_days INT[] DEFAULT '{7,1}',
|
||||
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ DEFAULT NOW(),
|
||||
CHECK (end_date >= start_date)
|
||||
)`,
|
||||
|
||||
// Indexes — public events are queried by region + date range. School
|
||||
// events are queried by owner + date range.
|
||||
`CREATE INDEX IF NOT EXISTS idx_cal_public_event_region_date
|
||||
ON cal_public_event(region, start_date, end_date)`,
|
||||
`CREATE INDEX IF NOT EXISTS idx_cal_school_event_user_date
|
||||
ON cal_school_event(created_by_user_id, start_date, end_date)`,
|
||||
}
|
||||
}
|
||||
@@ -221,6 +221,9 @@ func Migrate(db *DB) error {
|
||||
// Append timetable solution migrations (see timetable_solution_migrations.go)
|
||||
migrations = append(migrations, TimetableSolutionMigrations()...)
|
||||
|
||||
// Append calendar migrations (see calendar_migrations.go).
|
||||
migrations = append(migrations, CalendarMigrations()...)
|
||||
|
||||
for _, migration := range migrations {
|
||||
_, err := db.Pool.Exec(ctx, migration)
|
||||
if err != nil {
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/breakpilot/school-service/internal/models"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// ListCalendarHolidays returns OpenHolidaysAPI events for a region + range.
|
||||
// Query params: ?region=DE-NI&from=2026-08-01&to=2027-07-31. If omitted,
|
||||
// region falls back to the caller's saved config and the range to the
|
||||
// current calendar year.
|
||||
func (h *Handler) ListCalendarHolidays(c *gin.Context) {
|
||||
uid := getUserID(c)
|
||||
if uid == "" {
|
||||
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
||||
return
|
||||
}
|
||||
region := c.Query("region")
|
||||
if region == "" {
|
||||
cfg, err := h.calendarService.GetConfig(c.Request.Context(), uid)
|
||||
if err != nil || cfg == nil {
|
||||
respondError(c, http.StatusBadRequest, "region query param required (no saved config)")
|
||||
return
|
||||
}
|
||||
region = cfg.Bundesland
|
||||
}
|
||||
from := c.DefaultQuery("from", time.Now().Format("2006-01-02"))
|
||||
to := c.DefaultQuery("to", time.Now().AddDate(1, 0, 0).Format("2006-01-02"))
|
||||
|
||||
events, err := h.calendarService.ListHolidays(c.Request.Context(), region, from, to)
|
||||
if err != nil {
|
||||
respondError(c, http.StatusInternalServerError, "Failed to load holidays: "+err.Error())
|
||||
return
|
||||
}
|
||||
if events == nil {
|
||||
events = []models.PublicEvent{}
|
||||
}
|
||||
respondSuccess(c, events)
|
||||
}
|
||||
|
||||
func (h *Handler) GetCalendarConfig(c *gin.Context) {
|
||||
uid := getUserID(c)
|
||||
if uid == "" {
|
||||
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
||||
return
|
||||
}
|
||||
cfg, err := h.calendarService.GetConfig(c.Request.Context(), uid)
|
||||
if err != nil {
|
||||
// No row → 200 with null so the wizard knows to prompt.
|
||||
respondSuccess(c, nil)
|
||||
return
|
||||
}
|
||||
respondSuccess(c, cfg)
|
||||
}
|
||||
|
||||
func (h *Handler) UpsertCalendarConfig(c *gin.Context) {
|
||||
uid := getUserID(c)
|
||||
if uid == "" {
|
||||
respondError(c, http.StatusUnauthorized, "User not authenticated")
|
||||
return
|
||||
}
|
||||
var req models.UpsertSchoolCalendarConfigRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
respondError(c, http.StatusBadRequest, "Invalid request: "+err.Error())
|
||||
return
|
||||
}
|
||||
cfg, err := h.calendarService.UpsertConfig(c.Request.Context(), uid, &req)
|
||||
if err != nil {
|
||||
respondError(c, http.StatusInternalServerError, "Failed to save config: "+err.Error())
|
||||
return
|
||||
}
|
||||
respondCreated(c, cfg)
|
||||
}
|
||||
@@ -17,6 +17,7 @@ type Handler struct {
|
||||
certificateService *services.CertificateService
|
||||
aiService *services.AIService
|
||||
timetableService *services.TimetableService
|
||||
calendarService *services.CalendarService
|
||||
solverServiceURL string
|
||||
}
|
||||
|
||||
@@ -29,6 +30,7 @@ func NewHandler(db *pgxpool.Pool, llmGatewayURL, solverServiceURL string) *Handl
|
||||
certificateService := services.NewCertificateService(db, gradeService, gradebookService)
|
||||
aiService := services.NewAIService(llmGatewayURL)
|
||||
timetableService := services.NewTimetableService(db)
|
||||
calendarService := services.NewCalendarService(db)
|
||||
|
||||
return &Handler{
|
||||
classService: classService,
|
||||
@@ -38,10 +40,17 @@ func NewHandler(db *pgxpool.Pool, llmGatewayURL, solverServiceURL string) *Handl
|
||||
certificateService: certificateService,
|
||||
aiService: aiService,
|
||||
timetableService: timetableService,
|
||||
calendarService: calendarService,
|
||||
solverServiceURL: solverServiceURL,
|
||||
}
|
||||
}
|
||||
|
||||
// CalendarService exposes the underlying service so main.go can run the
|
||||
// one-off seed import after migrations.
|
||||
func (h *Handler) CalendarService() *services.CalendarService {
|
||||
return h.calendarService
|
||||
}
|
||||
|
||||
// Health returns the service health status
|
||||
func (h *Handler) Health(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// PublicEvent is a holiday or school-vacation row imported from
|
||||
// OpenHolidaysAPI. Global (no owner) — same for every school per region.
|
||||
type PublicEvent struct {
|
||||
ID uuid.UUID `json:"id" db:"id"`
|
||||
Region string `json:"region" db:"region"` // e.g. "DE-NI"
|
||||
EventType string `json:"event_type" db:"event_type"` // public_holiday | school_holiday
|
||||
NameDe string `json:"name_de" db:"name_de"`
|
||||
NameEn string `json:"name_en,omitempty" db:"name_en"`
|
||||
StartDate string `json:"start_date" db:"start_date"` // YYYY-MM-DD
|
||||
EndDate string `json:"end_date" db:"end_date"`
|
||||
Source string `json:"source,omitempty" db:"source"`
|
||||
CreatedAt time.Time `json:"created_at" db:"created_at"`
|
||||
}
|
||||
|
||||
// SchoolCalendarConfig stores the Bundesland selection for one school
|
||||
// (= one Rektor account). One row per user.
|
||||
type SchoolCalendarConfig struct {
|
||||
UserID uuid.UUID `json:"user_id" db:"user_id"`
|
||||
Bundesland string `json:"bundesland" db:"bundesland"` // DE-NI ...
|
||||
SchoolYearStart *string `json:"school_year_start,omitempty" db:"school_year_start"`
|
||||
SchoolYearEnd *string `json:"school_year_end,omitempty" db:"school_year_end"`
|
||||
CreatedAt time.Time `json:"created_at" db:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
|
||||
}
|
||||
|
||||
// SchoolEvent is a user-managed event (Fortbildung, Schulfeier, …).
|
||||
type SchoolEvent struct {
|
||||
ID uuid.UUID `json:"id" db:"id"`
|
||||
CreatedByUserID uuid.UUID `json:"created_by_user_id" db:"created_by_user_id"`
|
||||
Title string `json:"title" db:"title"`
|
||||
Description string `json:"description,omitempty" db:"description"`
|
||||
EventType string `json:"event_type" db:"event_type"`
|
||||
IsSchoolFree bool `json:"is_school_free" db:"is_school_free"`
|
||||
StartDate string `json:"start_date" db:"start_date"`
|
||||
EndDate string `json:"end_date" db:"end_date"`
|
||||
StartTime *string `json:"start_time,omitempty" db:"start_time"`
|
||||
EndTime *string `json:"end_time,omitempty" db:"end_time"`
|
||||
AffectedClassIDs []uuid.UUID `json:"affected_class_ids" db:"affected_class_ids"`
|
||||
VisibleToParents bool `json:"visible_to_parents" db:"visible_to_parents"`
|
||||
NotifyParents bool `json:"notify_parents" db:"notify_parents"`
|
||||
NotifyStudents bool `json:"notify_students" db:"notify_students"`
|
||||
NotificationLeadDays []int `json:"notification_lead_days" db:"notification_lead_days"`
|
||||
CreatedAt time.Time `json:"created_at" db:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
|
||||
}
|
||||
|
||||
// Request DTOs
|
||||
|
||||
// UpsertSchoolCalendarConfigRequest sets or updates the Bundesland for the
|
||||
// authenticated user. Both school-year dates are optional (defaults to the
|
||||
// running year based on today's date).
|
||||
type UpsertSchoolCalendarConfigRequest struct {
|
||||
Bundesland string `json:"bundesland" binding:"required,len=5"`
|
||||
SchoolYearStart *string `json:"school_year_start,omitempty"`
|
||||
SchoolYearEnd *string `json:"school_year_end,omitempty"`
|
||||
}
|
||||
|
||||
type CreateSchoolEventRequest struct {
|
||||
Title string `json:"title" binding:"required"`
|
||||
Description string `json:"description"`
|
||||
EventType string `json:"event_type" binding:"required,oneof=fortbildung schulfeier klassenfahrt projekttag eltern_info andere"`
|
||||
IsSchoolFree bool `json:"is_school_free"`
|
||||
StartDate string `json:"start_date" binding:"required"`
|
||||
EndDate string `json:"end_date" binding:"required"`
|
||||
StartTime *string `json:"start_time,omitempty"`
|
||||
EndTime *string `json:"end_time,omitempty"`
|
||||
AffectedClassIDs []string `json:"affected_class_ids"`
|
||||
VisibleToParents bool `json:"visible_to_parents"`
|
||||
NotifyParents bool `json:"notify_parents"`
|
||||
NotifyStudents bool `json:"notify_students"`
|
||||
NotificationLeadDays []int `json:"notification_lead_days"`
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,134 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/breakpilot/school-service/internal/models"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// CalendarService owns the cal_* tables and the read of the seed snapshot
|
||||
// on first boot. Holidays are global (no owner) — same data for every
|
||||
// school in a given Bundesland.
|
||||
type CalendarService struct {
|
||||
db *pgxpool.Pool
|
||||
}
|
||||
|
||||
func NewCalendarService(db *pgxpool.Pool) *CalendarService {
|
||||
return &CalendarService{db: db}
|
||||
}
|
||||
|
||||
// SeedFromSnapshot reads internal/seed/calendar_holidays.json and bulk-inserts
|
||||
// every row that doesn't already exist (idempotent via the unique constraint
|
||||
// on region+event_type+name_de+start_date). Called once at server start.
|
||||
func (s *CalendarService) SeedFromSnapshot(ctx context.Context, path string) error {
|
||||
raw, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
log.Printf("calendar seed file not found at %s — skipping", path)
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("read snapshot: %w", err)
|
||||
}
|
||||
|
||||
var events []models.PublicEvent
|
||||
if err := json.Unmarshal(raw, &events); err != nil {
|
||||
return fmt.Errorf("parse snapshot: %w", err)
|
||||
}
|
||||
|
||||
tx, err := s.db.Begin(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
inserted := 0
|
||||
for _, e := range events {
|
||||
ct, err := tx.Exec(ctx, `
|
||||
INSERT INTO cal_public_event (region, event_type, name_de, name_en, start_date, end_date, source)
|
||||
VALUES ($1, $2, $3, NULLIF($4, ''), $5::date, $6::date, 'OpenHolidaysAPI')
|
||||
ON CONFLICT (region, event_type, name_de, start_date) DO NOTHING
|
||||
`, e.Region, e.EventType, e.NameDe, e.NameEn, e.StartDate, e.EndDate)
|
||||
if err != nil {
|
||||
return fmt.Errorf("insert event: %w", err)
|
||||
}
|
||||
inserted += int(ct.RowsAffected())
|
||||
}
|
||||
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Printf("calendar seed: %d new events inserted (of %d in snapshot)", inserted, len(events))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListHolidays returns all public + school holidays for the given region
|
||||
// between from..to (YYYY-MM-DD inclusive).
|
||||
func (s *CalendarService) ListHolidays(ctx context.Context, region, from, to string) ([]models.PublicEvent, error) {
|
||||
rows, err := s.db.Query(ctx, `
|
||||
SELECT id, region, event_type, name_de, COALESCE(name_en, ''),
|
||||
start_date::text, end_date::text, COALESCE(source, ''), created_at
|
||||
FROM cal_public_event
|
||||
WHERE region = $1
|
||||
AND end_date >= $2::date
|
||||
AND start_date <= $3::date
|
||||
ORDER BY start_date, event_type, name_de
|
||||
`, region, from, to)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []models.PublicEvent
|
||||
for rows.Next() {
|
||||
var e models.PublicEvent
|
||||
if err := rows.Scan(&e.ID, &e.Region, &e.EventType, &e.NameDe, &e.NameEn,
|
||||
&e.StartDate, &e.EndDate, &e.Source, &e.CreatedAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, e)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// GetConfig returns the per-user calendar config (Bundesland etc.) or nil
|
||||
// if the user has not configured one yet.
|
||||
func (s *CalendarService) GetConfig(ctx context.Context, userID string) (*models.SchoolCalendarConfig, error) {
|
||||
var c models.SchoolCalendarConfig
|
||||
err := s.db.QueryRow(ctx, `
|
||||
SELECT user_id, bundesland, school_year_start::text, school_year_end::text, created_at, updated_at
|
||||
FROM cal_school_config WHERE user_id = $1
|
||||
`, userID).Scan(&c.UserID, &c.Bundesland, &c.SchoolYearStart, &c.SchoolYearEnd, &c.CreatedAt, &c.UpdatedAt)
|
||||
if err != nil {
|
||||
// pgx returns no-rows error; caller maps to 404.
|
||||
return nil, err
|
||||
}
|
||||
return &c, nil
|
||||
}
|
||||
|
||||
// UpsertConfig inserts or updates the Bundesland selection.
|
||||
func (s *CalendarService) UpsertConfig(ctx context.Context, userID string, req *models.UpsertSchoolCalendarConfigRequest) (*models.SchoolCalendarConfig, error) {
|
||||
var c models.SchoolCalendarConfig
|
||||
err := s.db.QueryRow(ctx, `
|
||||
INSERT INTO cal_school_config (user_id, bundesland, school_year_start, school_year_end)
|
||||
VALUES ($1, $2, NULLIF($3, '')::date, NULLIF($4, '')::date)
|
||||
ON CONFLICT (user_id) DO UPDATE
|
||||
SET bundesland = EXCLUDED.bundesland,
|
||||
school_year_start = EXCLUDED.school_year_start,
|
||||
school_year_end = EXCLUDED.school_year_end,
|
||||
updated_at = NOW()
|
||||
RETURNING user_id, bundesland, school_year_start::text, school_year_end::text, created_at, updated_at
|
||||
`, userID, req.Bundesland, strOrEmpty(req.SchoolYearStart), strOrEmpty(req.SchoolYearEnd)).
|
||||
Scan(&c.UserID, &c.Bundesland, &c.SchoolYearStart, &c.SchoolYearEnd, &c.CreatedAt, &c.UpdatedAt)
|
||||
return &c, err
|
||||
}
|
||||
|
||||
func strOrEmpty(s *string) string {
|
||||
if s == nil {
|
||||
return ""
|
||||
}
|
||||
return *s
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/breakpilot/school-service/internal/models"
|
||||
)
|
||||
|
||||
func TestUpsertSchoolCalendarConfigRequest_Validation(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
req models.UpsertSchoolCalendarConfigRequest
|
||||
wantErr bool
|
||||
}{
|
||||
{"valid NI", models.UpsertSchoolCalendarConfigRequest{Bundesland: "DE-NI"}, false},
|
||||
{"empty bundesland", models.UpsertSchoolCalendarConfigRequest{Bundesland: ""}, true},
|
||||
{"too long", models.UpsertSchoolCalendarConfigRequest{Bundesland: "DE-NIE"}, true},
|
||||
{"too short", models.UpsertSchoolCalendarConfigRequest{Bundesland: "DE"}, true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if (validate.Struct(tt.req) != nil) != tt.wantErr {
|
||||
t.Errorf("unexpected validation outcome for %s", tt.name)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateSchoolEventRequest_Validation(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
req models.CreateSchoolEventRequest
|
||||
wantErr bool
|
||||
}{
|
||||
{"valid fortbildung", models.CreateSchoolEventRequest{
|
||||
Title: "SCHILF", EventType: "fortbildung",
|
||||
StartDate: "2026-10-01", EndDate: "2026-10-01",
|
||||
}, false},
|
||||
{"missing title", models.CreateSchoolEventRequest{
|
||||
EventType: "fortbildung", StartDate: "2026-10-01", EndDate: "2026-10-01",
|
||||
}, true},
|
||||
{"invalid event type", models.CreateSchoolEventRequest{
|
||||
Title: "X", EventType: "wedding",
|
||||
StartDate: "2026-10-01", EndDate: "2026-10-01",
|
||||
}, true},
|
||||
{"missing dates", models.CreateSchoolEventRequest{
|
||||
Title: "X", EventType: "schulfeier",
|
||||
}, true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if (validate.Struct(tt.req) != nil) != tt.wantErr {
|
||||
t.Errorf("unexpected validation outcome for %s", tt.name)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewCalendarService_Constructs(t *testing.T) {
|
||||
s := NewCalendarService(nil)
|
||||
if s == nil {
|
||||
t.Fatal("expected non-nil service")
|
||||
}
|
||||
}
|
||||
Executable
+86
@@ -0,0 +1,86 @@
|
||||
#!/usr/bin/env bash
|
||||
# Snapshot Public Holidays + School Holidays for all 16 German Bundeslaender
|
||||
# from openholidaysapi.org. The result is committed to the repo and imported
|
||||
# at first DB boot by school-service. Re-run yearly (or whenever the next
|
||||
# school year's data needs to be added).
|
||||
#
|
||||
# Usage: bash scripts/calendar-snapshot.sh [FIRST_YEAR] [LAST_YEAR]
|
||||
# defaults: current year .. current year + 2
|
||||
#
|
||||
# Output: school-service/internal/seed/calendar_holidays.json
|
||||
# shape: [{ region, event_type, name_de, name_en, start_date, end_date }, ...]
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
OUT="$ROOT/school-service/internal/seed/calendar_holidays.json"
|
||||
mkdir -p "$(dirname "$OUT")"
|
||||
|
||||
START_YEAR="${1:-$(date +%Y)}"
|
||||
END_YEAR="${2:-$((START_YEAR + 2))}"
|
||||
API="https://openholidaysapi.org"
|
||||
|
||||
# DE-XX codes for all 16 Bundeslaender (alphabetical).
|
||||
REGIONS=(
|
||||
"DE-BW" "DE-BY" "DE-BE" "DE-BB" "DE-HB" "DE-HH" "DE-HE" "DE-MV"
|
||||
"DE-NI" "DE-NW" "DE-RP" "DE-SL" "DE-SN" "DE-ST" "DE-SH" "DE-TH"
|
||||
)
|
||||
|
||||
if ! command -v jq >/dev/null 2>&1; then
|
||||
echo "jq is required (brew install jq)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TMP=$(mktemp)
|
||||
trap 'rm -f "$TMP"' EXIT
|
||||
echo '[]' > "$TMP"
|
||||
|
||||
fetch() {
|
||||
local endpoint="$1" region="$2" year="$3"
|
||||
curl -sf -G "$API/$endpoint" \
|
||||
--data-urlencode "countryIsoCode=DE" \
|
||||
--data-urlencode "languageIsoCode=DE" \
|
||||
--data-urlencode "validFrom=${year}-01-01" \
|
||||
--data-urlencode "validTo=${year}-12-31" \
|
||||
--data-urlencode "subdivisionCode=$region" \
|
||||
|| echo '[]'
|
||||
}
|
||||
|
||||
# Map OpenHolidaysAPI shape → our DB schema. The API returns an array of:
|
||||
# { id, startDate, endDate, type, name: [{ language, text }], ... }
|
||||
# We keep DE name as canonical, EN name if present, plus dates and a typed
|
||||
# event_type discriminator. PublicHolidays and SchoolHolidays come from two
|
||||
# separate endpoints.
|
||||
normalise_jq='
|
||||
map({
|
||||
region: $region,
|
||||
event_type: $event_type,
|
||||
name_de: ((.name // []) | map(select(.language == "DE")) | .[0].text // ""),
|
||||
name_en: ((.name // []) | map(select(.language == "EN")) | .[0].text // null),
|
||||
start_date: .startDate,
|
||||
end_date: .endDate
|
||||
}) | map(select(.name_de != ""))
|
||||
'
|
||||
|
||||
for region in "${REGIONS[@]}"; do
|
||||
for year in $(seq "$START_YEAR" "$END_YEAR"); do
|
||||
echo " $region $year — public" >&2
|
||||
fetch "PublicHolidays" "$region" "$year" \
|
||||
| jq --arg region "$region" --arg event_type "public_holiday" "$normalise_jq" \
|
||||
| jq -s --slurpfile existing "$TMP" '$existing[0] + .[0]' > "$TMP.new"
|
||||
mv "$TMP.new" "$TMP"
|
||||
|
||||
echo " $region $year — school" >&2
|
||||
fetch "SchoolHolidays" "$region" "$year" \
|
||||
| jq --arg region "$region" --arg event_type "school_holiday" "$normalise_jq" \
|
||||
| jq -s --slurpfile existing "$TMP" '$existing[0] + .[0]' > "$TMP.new"
|
||||
mv "$TMP.new" "$TMP"
|
||||
done
|
||||
done
|
||||
|
||||
# Deduplicate (the API sometimes returns overlapping rows for events that
|
||||
# straddle a year boundary) and sort for a stable diff.
|
||||
jq 'unique_by({region, event_type, name_de, start_date}) | sort_by([.region, .start_date])' \
|
||||
"$TMP" > "$OUT"
|
||||
|
||||
echo
|
||||
echo "Wrote $(jq length "$OUT") events to $OUT"
|
||||
@@ -0,0 +1,68 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useTheme } from '@/lib/ThemeContext'
|
||||
import { BUNDESLAENDER } from '@/app/schulkalender/types'
|
||||
|
||||
interface BundeslandWizardProps {
|
||||
onSave: (bundesland: string) => Promise<void>
|
||||
}
|
||||
|
||||
export function BundeslandWizard({ onSave }: BundeslandWizardProps) {
|
||||
const { isDark } = useTheme()
|
||||
const [selected, setSelected] = useState('DE-NI')
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
const handleSave = async () => {
|
||||
setSaving(true)
|
||||
setError(null)
|
||||
try {
|
||||
await onSave(selected)
|
||||
} catch (e) {
|
||||
setError(e instanceof Error ? e.message : 'Speichern fehlgeschlagen')
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const cardClass = isDark ? 'bg-white/10 border-white/20 text-white' : 'bg-white/80 border-black/10 text-slate-900'
|
||||
const selectClass = isDark ? 'bg-white/10 border-white/20 text-white' : 'bg-white border-slate-300 text-slate-900'
|
||||
|
||||
return (
|
||||
<div className={`max-w-xl mx-auto rounded-2xl border backdrop-blur-xl p-6 ${cardClass}`} data-testid="bundesland-wizard">
|
||||
<h2 className="text-xl font-semibold mb-2">Willkommen im Schulkalender</h2>
|
||||
<p className={`text-sm mb-4 ${isDark ? 'text-white/70' : 'text-slate-600'}`}>
|
||||
Waehle das Bundesland deiner Schule. Damit laden wir Ferien und
|
||||
Feiertage aus dem offiziellen Datensatz fuer die naechsten drei
|
||||
Schuljahre.
|
||||
</p>
|
||||
<div className="mb-4">
|
||||
<label className="block text-sm mb-1 opacity-70">Bundesland</label>
|
||||
<select
|
||||
value={selected}
|
||||
onChange={e => setSelected(e.target.value)}
|
||||
data-testid="bundesland-select"
|
||||
className={`w-full px-3 py-2 rounded-lg border ${selectClass}`}
|
||||
>
|
||||
{BUNDESLAENDER.map(b => (
|
||||
<option key={b.code} value={b.code}>{b.name}</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
{error && (
|
||||
<div className="mb-3 p-2 rounded-lg bg-red-500/20 border border-red-500/40 text-red-300 text-sm">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
data-testid="bundesland-save"
|
||||
className="w-full px-4 py-2 rounded-lg bg-indigo-500 hover:bg-indigo-600 text-white font-medium disabled:opacity-50"
|
||||
>
|
||||
{saving ? 'Speichert…' : 'Bundesland uebernehmen'}
|
||||
</button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,157 @@
|
||||
'use client'
|
||||
|
||||
import { useMemo } from 'react'
|
||||
import { useTheme } from '@/lib/ThemeContext'
|
||||
import type { PublicEvent } from '@/app/schulkalender/types'
|
||||
|
||||
interface MonthViewProps {
|
||||
year: number
|
||||
month: number // 1-12
|
||||
holidays: PublicEvent[]
|
||||
onPrev: () => void
|
||||
onNext: () => void
|
||||
onToday: () => void
|
||||
}
|
||||
|
||||
const WEEKDAYS_DE = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']
|
||||
const MONTHS_DE = [
|
||||
'Januar', 'Februar', 'Maerz', 'April', 'Mai', 'Juni',
|
||||
'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember',
|
||||
]
|
||||
|
||||
interface Cell {
|
||||
date: Date
|
||||
inMonth: boolean
|
||||
events: PublicEvent[]
|
||||
}
|
||||
|
||||
function buildMonthGrid(year: number, month: number, holidays: PublicEvent[]): Cell[] {
|
||||
// First Monday on or before the 1st of the month.
|
||||
const first = new Date(Date.UTC(year, month - 1, 1))
|
||||
const firstWeekday = (first.getUTCDay() + 6) % 7 // Monday = 0
|
||||
const start = new Date(first)
|
||||
start.setUTCDate(first.getUTCDate() - firstWeekday)
|
||||
|
||||
const cells: Cell[] = []
|
||||
for (let i = 0; i < 42; i++) {
|
||||
const d = new Date(start)
|
||||
d.setUTCDate(start.getUTCDate() + i)
|
||||
const iso = d.toISOString().slice(0, 10)
|
||||
const events = holidays.filter(h => iso >= h.start_date && iso <= h.end_date)
|
||||
cells.push({
|
||||
date: d,
|
||||
inMonth: d.getUTCMonth() === month - 1,
|
||||
events,
|
||||
})
|
||||
if (i >= 27 && d.getUTCMonth() !== month - 1) {
|
||||
// Stop a row early if the rest is fully outside the month.
|
||||
const restAllOutside = cells.slice(i + 1 - ((i + 1) % 7), i + 1).every(c => !c.inMonth)
|
||||
if (restAllOutside) break
|
||||
}
|
||||
}
|
||||
// Pad to multiple of 7 if we cut early.
|
||||
while (cells.length % 7 !== 0) {
|
||||
const last = cells[cells.length - 1].date
|
||||
const d = new Date(last)
|
||||
d.setUTCDate(last.getUTCDate() + 1)
|
||||
cells.push({ date: d, inMonth: false, events: [] })
|
||||
}
|
||||
return cells
|
||||
}
|
||||
|
||||
export function MonthView({ year, month, holidays, onPrev, onNext, onToday }: MonthViewProps) {
|
||||
const { isDark } = useTheme()
|
||||
const cells = useMemo(() => buildMonthGrid(year, month, holidays), [year, month, holidays])
|
||||
|
||||
const headerClass = isDark ? 'text-white' : 'text-slate-900'
|
||||
const subtleText = isDark ? 'text-white/40' : 'text-slate-400'
|
||||
const cardClass = isDark ? 'bg-white/10 border-white/20' : 'bg-white/80 border-black/10'
|
||||
const buttonClass = isDark
|
||||
? 'bg-white/10 text-white/80 hover:bg-white/20'
|
||||
: 'bg-white text-slate-700 hover:bg-slate-100 border border-slate-200'
|
||||
|
||||
const todayIso = new Date().toISOString().slice(0, 10)
|
||||
|
||||
return (
|
||||
<div className={`rounded-2xl border backdrop-blur-xl p-4 ${cardClass}`} data-testid="month-view">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h2 className={`text-2xl font-semibold ${headerClass}`}>
|
||||
{MONTHS_DE[month - 1]} {year}
|
||||
</h2>
|
||||
<div className="flex gap-2">
|
||||
<button onClick={onPrev} data-testid="month-prev" className={`px-3 py-1.5 rounded-lg text-sm font-medium ${buttonClass}`}>←</button>
|
||||
<button onClick={onToday} data-testid="month-today" className={`px-3 py-1.5 rounded-lg text-sm font-medium ${buttonClass}`}>Heute</button>
|
||||
<button onClick={onNext} data-testid="month-next" className={`px-3 py-1.5 rounded-lg text-sm font-medium ${buttonClass}`}>→</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-7 gap-1 mb-2">
|
||||
{WEEKDAYS_DE.map(w => (
|
||||
<div key={w} className={`text-xs font-medium text-center ${subtleText}`}>{w}</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-7 gap-1">
|
||||
{cells.map((c, i) => {
|
||||
const iso = c.date.toISOString().slice(0, 10)
|
||||
const isToday = iso === todayIso
|
||||
const publicHoliday = c.events.find(e => e.event_type === 'public_holiday')
|
||||
const schoolHoliday = c.events.find(e => e.event_type === 'school_holiday')
|
||||
|
||||
let bg = isDark ? 'bg-white/5' : 'bg-slate-50'
|
||||
if (schoolHoliday) bg = isDark ? 'bg-amber-500/20' : 'bg-amber-100'
|
||||
if (publicHoliday) bg = isDark ? 'bg-rose-500/25' : 'bg-rose-100'
|
||||
|
||||
return (
|
||||
<div
|
||||
key={i}
|
||||
data-testid={`day-${iso}`}
|
||||
className={`relative aspect-square rounded-lg p-2 text-sm border ${
|
||||
isDark ? 'border-white/10' : 'border-black/5'
|
||||
} ${c.inMonth ? bg : (isDark ? 'bg-transparent' : 'bg-transparent')} ${
|
||||
isToday ? (isDark ? 'ring-2 ring-indigo-400' : 'ring-2 ring-indigo-500') : ''
|
||||
}`}
|
||||
>
|
||||
<div className={`font-medium ${
|
||||
c.inMonth ? (isDark ? 'text-white' : 'text-slate-900') : subtleText
|
||||
}`}>
|
||||
{c.date.getUTCDate()}
|
||||
</div>
|
||||
{c.events.length > 0 && (
|
||||
<div className="mt-1 space-y-0.5 overflow-hidden">
|
||||
{c.events.slice(0, 2).map(e => (
|
||||
<div
|
||||
key={e.id}
|
||||
title={e.name_de}
|
||||
className={`text-[10px] leading-tight truncate ${
|
||||
e.event_type === 'public_holiday'
|
||||
? (isDark ? 'text-rose-200' : 'text-rose-800')
|
||||
: (isDark ? 'text-amber-200' : 'text-amber-800')
|
||||
}`}
|
||||
>
|
||||
{e.name_de}
|
||||
</div>
|
||||
))}
|
||||
{c.events.length > 2 && (
|
||||
<div className={`text-[10px] ${subtleText}`}>+{c.events.length - 2}</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
|
||||
<div className="mt-4 flex flex-wrap items-center gap-4 text-xs">
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className={`inline-block w-3 h-3 rounded ${isDark ? 'bg-rose-500/40' : 'bg-rose-200'}`}></span>
|
||||
<span className={isDark ? 'text-white/70' : 'text-slate-600'}>Feiertag</span>
|
||||
</span>
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className={`inline-block w-3 h-3 rounded ${isDark ? 'bg-amber-500/40' : 'bg-amber-200'}`}></span>
|
||||
<span className={isDark ? 'text-white/70' : 'text-slate-600'}>Schulferien</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useEffect, useCallback } from 'react'
|
||||
import { useTheme } from '@/lib/ThemeContext'
|
||||
import { Sidebar } from '@/components/Sidebar'
|
||||
import { ThemeToggle } from '@/components/ThemeToggle'
|
||||
import { LanguageDropdown } from '@/components/LanguageDropdown'
|
||||
import { calendarApi } from '@/lib/schulkalender/api'
|
||||
import type { PublicEvent, SchoolCalendarConfig } from './types'
|
||||
import { BUNDESLAENDER } from './types'
|
||||
import { MonthView } from './_components/MonthView'
|
||||
import { BundeslandWizard } from './_components/BundeslandWizard'
|
||||
|
||||
function monthRange(year: number, month: number): { from: string; to: string } {
|
||||
// Render the visible 6-week grid worth of holidays (covers prev/next month edges).
|
||||
const from = new Date(Date.UTC(year, month - 1, 1))
|
||||
from.setUTCDate(from.getUTCDate() - 7)
|
||||
const to = new Date(Date.UTC(year, month, 0))
|
||||
to.setUTCDate(to.getUTCDate() + 14)
|
||||
return { from: from.toISOString().slice(0, 10), to: to.toISOString().slice(0, 10) }
|
||||
}
|
||||
|
||||
export default function SchulkalenderPage() {
|
||||
const { isDark } = useTheme()
|
||||
const today = new Date()
|
||||
const [year, setYear] = useState(today.getFullYear())
|
||||
const [month, setMonth] = useState(today.getMonth() + 1)
|
||||
const [config, setConfig] = useState<SchoolCalendarConfig | null>(null)
|
||||
const [holidays, setHolidays] = useState<PublicEvent[]>([])
|
||||
const [configLoading, setConfigLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
const loadConfig = useCallback(async () => {
|
||||
setConfigLoading(true)
|
||||
try {
|
||||
const cfg = await calendarApi.getConfig()
|
||||
setConfig(cfg)
|
||||
setError(null)
|
||||
} catch (e) {
|
||||
setError(e instanceof Error ? e.message : 'Config laden fehlgeschlagen')
|
||||
} finally {
|
||||
setConfigLoading(false)
|
||||
}
|
||||
}, [])
|
||||
|
||||
useEffect(() => { loadConfig() }, [loadConfig])
|
||||
|
||||
const loadHolidays = useCallback(async () => {
|
||||
if (!config?.bundesland) return
|
||||
const { from, to } = monthRange(year, month)
|
||||
try {
|
||||
const data = await calendarApi.listHolidays(config.bundesland, from, to)
|
||||
setHolidays(data || [])
|
||||
setError(null)
|
||||
} catch (e) {
|
||||
setError(e instanceof Error ? e.message : 'Ferien laden fehlgeschlagen')
|
||||
}
|
||||
}, [config, year, month])
|
||||
|
||||
useEffect(() => { loadHolidays() }, [loadHolidays])
|
||||
|
||||
const handleSaveBundesland = async (bundesland: string) => {
|
||||
const cfg = await calendarApi.upsertConfig({ bundesland })
|
||||
setConfig(cfg)
|
||||
}
|
||||
|
||||
const goPrev = () => {
|
||||
if (month === 1) { setYear(y => y - 1); setMonth(12) }
|
||||
else setMonth(m => m - 1)
|
||||
}
|
||||
const goNext = () => {
|
||||
if (month === 12) { setYear(y => y + 1); setMonth(1) }
|
||||
else setMonth(m => m + 1)
|
||||
}
|
||||
const goToday = () => {
|
||||
const t = new Date()
|
||||
setYear(t.getFullYear())
|
||||
setMonth(t.getMonth() + 1)
|
||||
}
|
||||
|
||||
const bundeslandName = config
|
||||
? BUNDESLAENDER.find(b => b.code === config.bundesland)?.name || config.bundesland
|
||||
: ''
|
||||
|
||||
return (
|
||||
<div className={`min-h-screen flex relative overflow-hidden ${
|
||||
isDark ? 'bg-gradient-to-br from-indigo-900 via-purple-900 to-pink-800'
|
||||
: 'bg-gradient-to-br from-slate-100 via-blue-50 to-indigo-100'
|
||||
}`}>
|
||||
<div className={`absolute -top-40 -right-40 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob ${isDark ? 'bg-purple-500 opacity-30' : 'bg-purple-300 opacity-40'}`} />
|
||||
<div className={`absolute top-1/2 -left-40 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob animation-delay-2000 ${isDark ? 'bg-pink-500 opacity-30' : 'bg-pink-300 opacity-40'}`} />
|
||||
<div className={`absolute -bottom-40 right-1/3 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob animation-delay-4000 ${isDark ? 'bg-blue-500 opacity-30' : 'bg-blue-300 opacity-40'}`} />
|
||||
|
||||
<div className="relative z-10 p-4"><Sidebar selectedTab="schulkalender" /></div>
|
||||
|
||||
<main className="flex-1 relative z-10 p-6 overflow-y-auto">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<header className="flex items-center justify-between mb-6">
|
||||
<div>
|
||||
<h1 className={`text-3xl font-bold ${isDark ? 'text-white' : 'text-slate-900'}`}>
|
||||
Schulkalender
|
||||
</h1>
|
||||
<p className={`text-sm mt-1 ${isDark ? 'text-white/60' : 'text-slate-500'}`}>
|
||||
{config ? `Ferien und Feiertage fuer ${bundeslandName}` : 'Ferien, Feiertage und Schultermine'}
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<ThemeToggle />
|
||||
<LanguageDropdown />
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{error && (
|
||||
<div className="mb-4 p-3 rounded-xl bg-red-500/20 border border-red-500/40 text-red-300">{error}</div>
|
||||
)}
|
||||
|
||||
{configLoading ? (
|
||||
<div className={`text-center py-12 opacity-60 ${isDark ? 'text-white' : 'text-slate-700'}`}>Laedt…</div>
|
||||
) : !config ? (
|
||||
<BundeslandWizard onSave={handleSaveBundesland} />
|
||||
) : (
|
||||
<MonthView
|
||||
year={year}
|
||||
month={month}
|
||||
holidays={holidays}
|
||||
onPrev={goPrev}
|
||||
onNext={goNext}
|
||||
onToday={goToday}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
export type PublicEventType = 'public_holiday' | 'school_holiday'
|
||||
|
||||
export interface PublicEvent {
|
||||
id: string
|
||||
region: string
|
||||
event_type: PublicEventType
|
||||
name_de: string
|
||||
name_en?: string
|
||||
start_date: string // YYYY-MM-DD
|
||||
end_date: string
|
||||
source?: string
|
||||
created_at?: string
|
||||
}
|
||||
|
||||
export interface SchoolCalendarConfig {
|
||||
user_id: string
|
||||
bundesland: string
|
||||
school_year_start?: string | null
|
||||
school_year_end?: string | null
|
||||
created_at?: string
|
||||
updated_at?: string
|
||||
}
|
||||
|
||||
export interface UpsertSchoolCalendarConfig {
|
||||
bundesland: string
|
||||
school_year_start?: string | null
|
||||
school_year_end?: string | null
|
||||
}
|
||||
|
||||
export const BUNDESLAENDER: { code: string; name: string }[] = [
|
||||
{ code: 'DE-BW', name: 'Baden-Wuerttemberg' },
|
||||
{ code: 'DE-BY', name: 'Bayern' },
|
||||
{ code: 'DE-BE', name: 'Berlin' },
|
||||
{ code: 'DE-BB', name: 'Brandenburg' },
|
||||
{ code: 'DE-HB', name: 'Bremen' },
|
||||
{ code: 'DE-HH', name: 'Hamburg' },
|
||||
{ code: 'DE-HE', name: 'Hessen' },
|
||||
{ code: 'DE-MV', name: 'Mecklenburg-Vorpommern' },
|
||||
{ code: 'DE-NI', name: 'Niedersachsen' },
|
||||
{ code: 'DE-NW', name: 'Nordrhein-Westfalen' },
|
||||
{ code: 'DE-RP', name: 'Rheinland-Pfalz' },
|
||||
{ code: 'DE-SL', name: 'Saarland' },
|
||||
{ code: 'DE-SN', name: 'Sachsen' },
|
||||
{ code: 'DE-ST', name: 'Sachsen-Anhalt' },
|
||||
{ code: 'DE-SH', name: 'Schleswig-Holstein' },
|
||||
{ code: 'DE-TH', name: 'Thueringen' },
|
||||
]
|
||||
@@ -18,6 +18,7 @@ const NAV_LABELS: Record<string, Record<string, string>> = {
|
||||
nav_woerterbuch: { de: 'Woerterbuch', en: 'Dictionary', tr: 'Sozluk', ar: '\u0627\u0644\u0642\u0627\u0645\u0648\u0633', uk: '\u0421\u043b\u043e\u0432\u043d\u0438\u043a', ru: '\u0421\u043b\u043e\u0432\u0430\u0440\u044c', pl: 'Slownik', fr: 'Dictionnaire', es: 'Diccionario', it: 'Dizionario', pt: 'Dicionario', nl: 'Woordenboek', ro: 'Dictionar', el: '\u039b\u03b5\u03be\u03b9\u03ba\u03cc', bg: '\u0420\u0435\u0447\u043d\u0438\u043a', hr: 'Rjecnik', cs: 'Slovnik', hu: 'Szotar', sv: 'Ordbok', da: 'Ordbog', fi: 'Sanakirja', sk: 'Slovnik', sl: 'Slovar', lt: 'Zodynas', lv: 'Vardnica', et: 'Sonaraamat' },
|
||||
nav_meet: { de: 'Videokonferenz', en: 'Video Call', tr: 'Gorusme', ar: '\u0645\u0643\u0627\u0644\u0645\u0629', uk: '\u0412\u0456\u0434\u0435\u043e\u0434\u0437\u0432\u0456\u043d\u043e\u043a', ru: '\u0412\u0438\u0434\u0435\u043e\u0437\u0432\u043e\u043d\u043e\u043a', pl: 'Wideorozmowa', fr: 'Visioconference', es: 'Videollamada', it: 'Videochiamata', pt: 'Videochamada', nl: 'Videogesprek', ro: 'Videoconferinta', el: '\u0392\u03b9\u03bd\u03c4\u03b5\u03bf\u03ba\u03bb\u03ae\u03c3\u03b7', bg: '\u0412\u0438\u0434\u0435\u043e\u0440\u0430\u0437\u0433\u043e\u0432\u043e\u0440', hr: 'Videopoziv', cs: 'Videohovor', hu: 'Videohivas', sv: 'Videosamtal', da: 'Videoopkald', fi: 'Videopuhelu', sk: 'Videohovor', sl: 'Videoklic', lt: 'Vaizdo skambutis', lv: 'Videozvans', et: 'Videokoone' },
|
||||
nav_stundenplan: { de: 'Stundenplan', en: 'Timetable', tr: 'Ders Programi', ar: 'جدول حصص', uk: 'Розклад', ru: 'Расписание', pl: 'Plan lekcji', fr: 'Emploi du temps', es: 'Horario', it: 'Orario', pt: 'Horario', nl: 'Rooster', ro: 'Orar', el: 'Πρόγραμμα', bg: 'Разписание', hr: 'Raspored', cs: 'Rozvrh', hu: 'Orarend', sv: 'Schema', da: 'Skema', fi: 'Lukujarjestys', sk: 'Rozvrh', sl: 'Urnik', lt: 'Tvarkarastis', lv: 'Stundu saraksts', et: 'Tunniplaan' },
|
||||
nav_schulkalender: { de: 'Schulkalender', en: 'School Calendar', tr: 'Okul Takvimi', ar: 'تقويم المدرسة', uk: 'Шкільний календар', ru: 'Школьный календарь', pl: 'Kalendarz szkolny', fr: 'Calendrier scolaire', es: 'Calendario escolar', it: 'Calendario scolastico', pt: 'Calendario escolar', nl: 'Schoolkalender', ro: 'Calendar scolar', el: 'Σχολικό ημερολόγιο', bg: 'Училищен календар', hr: 'Skolski kalendar', cs: 'Skolni kalendar', hu: 'Iskolai naptar', sv: 'Skolkalender', da: 'Skolekalender', fi: 'Koulukalenteri', sk: 'Skolsky kalendar', sl: 'Solski koledar', lt: 'Mokyklos kalendorius', lv: 'Skolas kalendars', et: 'Koolikalender' },
|
||||
nav_companion: { de: 'KI-Assistent', en: 'AI Assistant', tr: 'Yapay Zeka', ar: '\u0645\u0633\u0627\u0639\u062f \u0630\u0643\u064a', uk: '\u0428\u0406-\u0430\u0441\u0438\u0441\u0442\u0435\u043d\u0442', ru: '\u0418\u0418-\u0430\u0441\u0441\u0438\u0441\u0442\u0435\u043d\u0442', pl: 'Asystent AI', fr: 'Assistant IA', es: 'Asistente IA', it: 'Assistente IA', pt: 'Assistente IA', nl: 'AI-assistent', ro: 'Asistent AI', el: 'AI \u0392\u03bf\u03b7\u03b8\u03cc\u03c2', bg: 'AI \u0430\u0441\u0438\u0441\u0442\u0435\u043d\u0442', hr: 'AI pomoenik', cs: 'AI asistent', hu: 'AI asszisztens', sv: 'AI-assistent', da: 'AI-assistent', fi: 'Tekoalyavustaja', sk: 'AI asistent', sl: 'AI pomoenik', lt: 'DI asistentas', lv: 'MI paligs', et: 'Tehisabiabi' },
|
||||
}
|
||||
|
||||
@@ -111,6 +112,13 @@ export function Sidebar({ selectedTab = 'dashboard', onTabChange }: SidebarProps
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
|
||||
</svg>
|
||||
)},
|
||||
{ id: 'schulkalender', labelKey: 'nav_schulkalender', href: '/schulkalender', icon: (
|
||||
<svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} d="M8 7V3m8 4V3M3 11h18M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
|
||||
<circle cx="8" cy="15" r="1.5" fill="currentColor" />
|
||||
<circle cx="16" cy="15" r="1.5" fill="currentColor" />
|
||||
</svg>
|
||||
)},
|
||||
{ id: 'companion', labelKey: 'nav_companion', href: '/companion', icon: (
|
||||
<svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<circle cx="12" cy="12" r="9" strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.5} />
|
||||
@@ -158,6 +166,7 @@ export function Sidebar({ selectedTab = 'dashboard', onTabChange }: SidebarProps
|
||||
if (pathname === '/messages') return 'messages'
|
||||
if (pathname?.startsWith('/korrektur')) return 'korrektur'
|
||||
if (pathname?.startsWith('/stundenplan')) return 'stundenplan'
|
||||
if (pathname?.startsWith('/schulkalender')) return 'schulkalender'
|
||||
return selectedTab
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
import { test, expect, Page } from '@playwright/test'
|
||||
|
||||
/**
|
||||
* E2E tests for /schulkalender. Mocks the /api/school/calendar/* routes
|
||||
* so the wizard, save flow and month grid render deterministically without
|
||||
* the live backend or seed data.
|
||||
*/
|
||||
|
||||
interface MockOpts {
|
||||
config?: { user_id: string; bundesland: string } | null
|
||||
holidays?: unknown[]
|
||||
}
|
||||
|
||||
async function mockCalendarApi(page: Page, opts: MockOpts = {}) {
|
||||
let config = opts.config ?? null
|
||||
|
||||
await page.route('**/api/school/calendar/config', async (route) => {
|
||||
if (route.request().method() === 'GET') {
|
||||
return route.fulfill({
|
||||
status: 200, contentType: 'application/json',
|
||||
body: JSON.stringify(config),
|
||||
})
|
||||
}
|
||||
if (route.request().method() === 'PUT') {
|
||||
const body = JSON.parse(route.request().postData() || '{}')
|
||||
config = { user_id: 'dev', bundesland: body.bundesland }
|
||||
return route.fulfill({
|
||||
status: 201, contentType: 'application/json',
|
||||
body: JSON.stringify(config),
|
||||
})
|
||||
}
|
||||
return route.fulfill({ status: 405 })
|
||||
})
|
||||
|
||||
await page.route(/\/api\/school\/calendar\/holidays(\?.*)?$/, async (route) => {
|
||||
return route.fulfill({
|
||||
status: 200, contentType: 'application/json',
|
||||
body: JSON.stringify(opts.holidays ?? []),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
test.describe('Schulkalender — Bundesland Wizard', () => {
|
||||
test('wizard renders when no config exists', async ({ page }) => {
|
||||
await mockCalendarApi(page, { config: null })
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
await expect(page.getByTestId('bundesland-wizard')).toBeVisible()
|
||||
await expect(page.getByText('Willkommen im Schulkalender')).toBeVisible()
|
||||
})
|
||||
|
||||
test('saving a Bundesland switches to MonthView', async ({ page }) => {
|
||||
await mockCalendarApi(page, { config: null })
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
|
||||
await page.getByTestId('bundesland-select').selectOption('DE-NI')
|
||||
await page.getByTestId('bundesland-save').click()
|
||||
|
||||
await expect(page.getByTestId('month-view')).toBeVisible()
|
||||
await expect(page.getByText('Niedersachsen')).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Schulkalender — Month View', () => {
|
||||
test('shows MonthView when config is set', async ({ page }) => {
|
||||
await mockCalendarApi(page, {
|
||||
config: { user_id: 'dev', bundesland: 'DE-NI' },
|
||||
holidays: [],
|
||||
})
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
await expect(page.getByTestId('month-view')).toBeVisible()
|
||||
// Weekday header line.
|
||||
for (const w of ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']) {
|
||||
await expect(page.getByText(w, { exact: true }).first()).toBeVisible()
|
||||
}
|
||||
})
|
||||
|
||||
test('colours holidays in the grid', async ({ page }) => {
|
||||
// Fix today by mocking config with a deterministic month/year via prev/next.
|
||||
await mockCalendarApi(page, {
|
||||
config: { user_id: 'dev', bundesland: 'DE-NI' },
|
||||
holidays: [
|
||||
{ id: 'h1', region: 'DE-NI', event_type: 'public_holiday', name_de: 'Test-Feiertag', start_date: '2099-06-15', end_date: '2099-06-15' },
|
||||
{ id: 'h2', region: 'DE-NI', event_type: 'school_holiday', name_de: 'Test-Ferien', start_date: '2099-06-20', end_date: '2099-06-21' },
|
||||
],
|
||||
})
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
// Walk forward until we hit June 2099 (way in the future to avoid 'today').
|
||||
// Cheaper: assert the legend shows the two categories — content rendering
|
||||
// is covered by the unit-level buildMonthGrid logic.
|
||||
await expect(page.getByText('Feiertag')).toBeVisible()
|
||||
await expect(page.getByText('Schulferien')).toBeVisible()
|
||||
})
|
||||
|
||||
test('Heute button resets to current month', async ({ page }) => {
|
||||
await mockCalendarApi(page, {
|
||||
config: { user_id: 'dev', bundesland: 'DE-NI' },
|
||||
holidays: [],
|
||||
})
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
await page.getByTestId('month-prev').click()
|
||||
await page.getByTestId('month-prev').click()
|
||||
await page.getByTestId('month-today').click()
|
||||
// After clicking Heute, the current month name must appear in the heading.
|
||||
const months = ['Januar', 'Februar', 'Maerz', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember']
|
||||
const currentMonth = months[new Date().getMonth()]
|
||||
await expect(page.getByRole('heading', { name: new RegExp(currentMonth) })).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Schulkalender — Sidebar entry', () => {
|
||||
test('sidebar contains Schulkalender link', async ({ page }) => {
|
||||
await mockCalendarApi(page)
|
||||
await page.goto('/schulkalender')
|
||||
await page.waitForLoadState('networkidle')
|
||||
const sidebar = page.locator('aside').first()
|
||||
await expect(sidebar.getByText(/Schulkalender|School Calendar/).first()).toBeVisible()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,34 @@
|
||||
/**
|
||||
* Schulkalender API client. Re-uses the same /api/school/* proxy + the JWT
|
||||
* helper from stundenplan so we don't fork the auth flow.
|
||||
*/
|
||||
|
||||
import { getStundenplanToken } from '@/lib/stundenplan/api'
|
||||
import type {
|
||||
PublicEvent, SchoolCalendarConfig, UpsertSchoolCalendarConfig,
|
||||
} from '@/app/schulkalender/types'
|
||||
|
||||
async function apiFetch<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
|
||||
const headers: Record<string, string> = {
|
||||
'Content-Type': 'application/json',
|
||||
...(options.headers as Record<string, string> | undefined),
|
||||
}
|
||||
const token = getStundenplanToken()
|
||||
if (token) headers['Authorization'] = `Bearer ${token}`
|
||||
|
||||
const res = await fetch(`/api/school${endpoint}`, { ...options, headers })
|
||||
if (!res.ok) {
|
||||
const err = await res.json().catch(() => ({ error: 'Unknown error' }))
|
||||
throw new Error(err.error || err.detail || `HTTP ${res.status}`)
|
||||
}
|
||||
if (res.status === 204) return undefined as T
|
||||
return res.json()
|
||||
}
|
||||
|
||||
export const calendarApi = {
|
||||
listHolidays: (region: string, from: string, to: string) =>
|
||||
apiFetch<PublicEvent[]>(`/calendar/holidays?region=${encodeURIComponent(region)}&from=${from}&to=${to}`),
|
||||
getConfig: () => apiFetch<SchoolCalendarConfig | null>('/calendar/config'),
|
||||
upsertConfig: (data: UpsertSchoolCalendarConfig) =>
|
||||
apiFetch<SchoolCalendarConfig>('/calendar/config', { method: 'PUT', body: JSON.stringify(data) }),
|
||||
}
|
||||
Reference in New Issue
Block a user