Curator-Song-Update: Genre-Zuordnungen auch bei leerem Array korrekt übernehmen

app/[locale]/admin/page.tsx

@@ -786,7 +786,16 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
 
     const handleSaveCurator = async (e: React.FormEvent) => {
         e.preventDefault();
-        if (!curatorUsername.trim()) return;
+        if (!curatorUsername.trim()) {
+            alert('Bitte einen Benutzernamen eingeben.');
+            return;
+        }
+
+        // Beim Anlegen eines neuen Kurators ist ein Passwort Pflicht.
+        if (!editingCuratorId && !curatorPassword.trim()) {
+            alert('Für neue Kuratoren muss ein Passwort gesetzt werden.');
+            return;
+        }
 
         const payload: any = {
             username: curatorUsername.trim(),

app/[locale]/curator/page.tsx

@@ -4,6 +4,7 @@ import CuratorPageInner from '../../curator/page';
 
 export default function CuratorPage() {
     // Wrapper für die lokalisierte Route /[locale]/curator
+    // Hinweis: Pfad '../../curator/page' zeigt von 'app/[locale]/curator' korrekt auf 'app/curator/page'.
     return <CuratorPageInner />;
 }
 

app/api/curators/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { PrismaClient } from '@prisma/client';
+import { PrismaClient, Prisma } from '@prisma/client';
 import bcrypt from 'bcryptjs';
 import { requireAdminAuth } from '@/lib/auth';
 
@@ -69,6 +69,15 @@ export async function POST(request: NextRequest) {
         });
     } catch (error) {
         console.error('Error creating curator:', error);
+
+        // Handle unique username constraint violation explicitly
+        if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002') {
+            return NextResponse.json(
+                { error: 'A curator with this username already exists.' },
+                { status: 409 }
+            );
+        }
+
         return NextResponse.json({ error: 'Internal Server Error' }, { status: 500 });
     }
 }
@@ -153,6 +162,15 @@ export async function PUT(request: NextRequest) {
         });
     } catch (error) {
         console.error('Error updating curator:', error);
+
+        // Handle unique username constraint violation explicitly for updates
+        if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === 'P2002') {
+            return NextResponse.json(
+                { error: 'A curator with this username already exists.' },
+                { status: 409 }
+            );
+        }
+
         return NextResponse.json({ error: 'Internal Server Error' }, { status: 500 });
     }
 }

app/api/songs/route.ts

@@ -30,7 +30,19 @@ function curatorCanEditSong(context: StaffContext, song: any, assignments: { gen
     if (context.role === 'admin') return true;
 
     const songGenreIds = (song.genres || []).map((g: any) => g.id);
-    const songSpecialIds = (song.specials || []).map((s: any) => s.specialId ?? s.id);
+    // `song.specials` kann je nach Context entweder ein Array von
+    // - `Special`        (mit `id`)
+    // - `SpecialSong`    (mit `specialId`)
+    // - `SpecialSong`    (mit Relation `special.id`)
+    // sein. Wir normalisieren hier auf reine Zahlen-IDs.
+    const songSpecialIds = (song.specials || [])
+        .map((s: any) => {
+            if (s?.id != null) return s.id;
+            if (s?.specialId != null) return s.specialId;
+            if (s?.special?.id != null) return s.special.id;
+            return undefined;
+        })
+        .filter((id: any): id is number => typeof id === 'number');
 
     // Songs ohne Genres/Specials sind für Kuratoren generell editierbar
     if (songGenreIds.length === 0 && songSpecialIds.length === 0) {
@@ -47,7 +59,14 @@ function curatorCanDeleteSong(context: StaffContext, song: any, assignments: { g
     if (context.role === 'admin') return true;
 
     const songGenreIds = (song.genres || []).map((g: any) => g.id);
-    const songSpecialIds = (song.specials || []).map((s: any) => s.specialId ?? s.id);
+    const songSpecialIds = (song.specials || [])
+        .map((s: any) => {
+            if (s?.id != null) return s.id;
+            if (s?.specialId != null) return s.specialId;
+            if (s?.special?.id != null) return s.special.id;
+            return undefined;
+        })
+        .filter((id: any): id is number => typeof id === 'number');
 
     const allGenresAllowed = songGenreIds.every((id: number) => assignments.genreIds.has(id));
     const allSpecialsAllowed = songSpecialIds.every((id: number) => assignments.specialIds.has(id));
@@ -59,7 +78,11 @@ function curatorCanDeleteSong(context: StaffContext, song: any, assignments: { g
 export const runtime = 'nodejs';
 export const maxDuration = 60; // 60 seconds timeout for uploads
 
-export async function GET() {
+export async function GET(request: NextRequest) {
+    // Alle Zugriffe auf die Songliste erfordern Staff-Auth (Admin oder Kurator)
+    const { error, context } = await requireStaffAuth(request);
+    if (error || !context) return error!;
+
     const songs = await prisma.song.findMany({
         orderBy: { createdAt: 'desc' },
         include: {
@@ -73,8 +96,31 @@ export async function GET() {
         },
     });
 
+    let visibleSongs = songs;
+
+    if (context.role === 'curator') {
+        const assignments = await getCuratorAssignments(context.curator.id);
+
+        visibleSongs = songs.filter(song => {
+            const songGenreIds = song.genres.map(g => g.id);
+            // `song.specials` ist hier ein Array von SpecialSong mit Relation `special`,
+            // wir nutzen konsistent die Special-ID.
+            const songSpecialIds = song.specials.map(ss => ss.special.id);
+
+            // Songs ohne Genres/Specials sind immer sichtbar
+            if (songGenreIds.length === 0 && songSpecialIds.length === 0) {
+                return true;
+            }
+
+            const hasGenre = songGenreIds.some(id => assignments.genreIds.has(id));
+            const hasSpecial = songSpecialIds.some(id => assignments.specialIds.has(id));
+
+            return hasGenre || hasSpecial;
+        });
+    }
+
     // Map to include activation count and flatten specials
-    const songsWithActivations = songs.map(song => ({
+    const songsWithActivations = visibleSongs.map(song => ({
         id: song.id,
         title: song.title,
         artist: song.artist,
@@ -411,7 +457,8 @@ export async function PUT(request: Request) {
             }
         }
 
-        if (effectiveGenreIds && effectiveGenreIds.length > 0) {
+        // Wenn effectiveGenreIds definiert ist, auch leere Arrays übernehmen (löscht alle Zuordnungen).
+        if (effectiveGenreIds !== undefined) {
             data.genres = {
                 set: effectiveGenreIds.map((gId: number) => ({ id: gId }))
             };

app/curator/page.tsx

@@ -332,6 +332,12 @@ export default function CuratorPage() {
                     setPlayingSongId(null);
                     setAudioElement(null);
                 });
+
+            // Reset Zustand, wenn der Track zu Ende gespielt ist
+            audio.onended = () => {
+                setPlayingSongId(null);
+                setAudioElement(null);
+            };
         }
     };
 
@@ -731,7 +737,7 @@ export default function CuratorPage() {
                         <div style={{ fontWeight: 500, marginBottom: '0.25rem' }}>{t('assignGenresLabel')}</div>
                         <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.25rem' }}>
                             {genres
-                                .filter(g => curatorInfo?.genreIds.includes(g.id))
+                                .filter(g => curatorInfo?.genreIds?.includes(g.id))
                                 .map(genre => (
                                     <label
                                         key={genre.id}
@@ -846,7 +852,7 @@ export default function CuratorPage() {
                         <option value="no-global">{t('filterNoGlobal')}</option>
                         <optgroup label="Genres">
                             {genres
-                                .filter(g => curatorInfo?.genreIds.includes(g.id))
+                                .filter(g => curatorInfo?.genreIds?.includes(g.id))
                                 .map(genre => (
                                     <option key={genre.id} value={`genre:${genre.id}`}>
                                         {typeof genre.name === 'string'
@@ -857,7 +863,7 @@ export default function CuratorPage() {
                         </optgroup>
                         <optgroup label="Specials">
                             {specials
-                                .filter(s => curatorInfo?.specialIds.includes(s.id))
+                                .filter(s => curatorInfo?.specialIds?.includes(s.id))
                                 .map(special => (
                                     <option key={special.id} value={`special:${special.id}`}>
                                         ★{' '}