feat(wiring): GlobalOverrideStore in Router, App und Scheduler-Goroutinen

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jesko Anschütz 2026-03-27 20:19:03 +01:00
parent 42458e68ff
commit 9aabf18aa2
2 changed files with 27 additions and 10 deletions

View file

@ -27,6 +27,7 @@ type App struct {
notifier *mqttnotifier.Notifier
authStore *store.AuthStore
scheduleStore *store.ScreenScheduleStore
globalOverrideStore *store.GlobalOverrideStore
screenStore *store.ScreenStore
dbPool *db.Pool // V7: für db.Close() im Shutdown
logger *log.Logger
@ -62,6 +63,7 @@ func New() (*App, error) {
playlists := store.NewPlaylistStore(pool.Pool)
authStore := store.NewAuthStore(pool.Pool)
schedules := store.NewScreenScheduleStore(pool.Pool)
globalOverrides := store.NewGlobalOverrideStore(pool.Pool)
// Ensure admin user exists — generate a random password if none is configured.
adminPassword := cfg.AdminPassword
@ -101,6 +103,7 @@ func New() (*App, error) {
Notifier: notifier,
ScreenshotStore: ss,
ScheduleStore: schedules,
GlobalOverrideStore: globalOverrides,
Config: cfg,
UploadDir: cfg.UploadDir,
Logger: logger,
@ -112,6 +115,7 @@ func New() (*App, error) {
notifier: notifier,
authStore: authStore,
scheduleStore: schedules,
globalOverrideStore: globalOverrides,
screenStore: screens,
dbPool: pool, // V7: Referenz für Shutdown
logger: logger,
@ -145,8 +149,8 @@ func (a *App) Run() error {
}()
// Display-Zeitplan-Scheduler
go scheduler.Run(ctx, a.scheduleStore, a.screenStore, a.notifier)
go scheduler.Reconcile(ctx, a.scheduleStore, a.screenStore, a.screenStore, a.notifier)
go scheduler.Run(ctx, a.scheduleStore, a.screenStore, a.globalOverrideStore, a.notifier)
go scheduler.Reconcile(ctx, a.scheduleStore, a.screenStore, a.screenStore, a.globalOverrideStore, a.notifier)
// W2: Signal-Handler für Graceful Shutdown.
sigCh := make(chan os.Signal, 1)

View file

@ -22,6 +22,7 @@ type RouterDeps struct {
Notifier *mqttnotifier.Notifier
ScreenshotStore *ScreenshotStore
ScheduleStore *store.ScreenScheduleStore
GlobalOverrideStore *store.GlobalOverrideStore
Config config.Config
UploadDir string
Logger *log.Logger
@ -192,6 +193,18 @@ func registerManageRoutes(mux *http.ServeMux, d RouterDeps) {
mux.Handle("POST /api/v1/screens/{screenSlug}/schedule",
authScreen(http.HandlerFunc(manage.HandleUpdateSchedule(d.ScreenStore, d.ScheduleStore))))
// ── Globaler Override ────────────────────────────────────────────────
mux.Handle("GET /api/v1/global-override",
authOnly(http.HandlerFunc(manage.HandleGetGlobalOverride(d.GlobalOverrideStore))))
mux.Handle("POST /api/v1/global-override",
authOnly(http.HandlerFunc(manage.HandleSetGlobalOverride(d.GlobalOverrideStore, d.ScreenStore, notifier))))
mux.Handle("DELETE /api/v1/global-override",
authOnly(http.HandlerFunc(manage.HandleDeleteGlobalOverride(d.GlobalOverrideStore))))
// ── Per-Screen Override ───────────────────────────────────────────────
mux.Handle("POST /api/v1/screens/{screenSlug}/override",
authScreen(http.HandlerFunc(manage.HandleSetScreenOverride(d.ScreenStore, d.ScheduleStore))))
// ── JSON API — screens ────────────────────────────────────────────────
// Self-registration: no auth (player calls this on startup).
mux.HandleFunc("POST /api/v1/screens/register",