🚀 Complete Topic-Only Flashcard Architecture Migration & 100% Working Workflow

app/Http/Controllers/FlashcardController.php

@@ -964,25 +964,27 @@
     /**
      * Display flashcards list view for HTMX.
      */
-    public function listView(Request $request, int $unitId): View|Response
+    public function listView(Request $request, int $topicId): View|Response
     {
         try {
             if (! auth()->check()) {
                 return response('Unauthorized', 401);
             }
 
-            // Verify unit exists and user has access
-            $unit = Unit::with(['subject'])->findOrFail($unitId);
-            if ((int) $unit->subject->user_id !== auth()->id()) {
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
                 return response('Access denied', 403);
             }
 
             // Get flashcards with pagination
-            $flashcards = $unit->allFlashcards()
+            $flashcards = $topic->flashcards()
                 ->orderBy('created_at', 'desc')
                 ->paginate(20);
 
-            return view('flashcards.partials.flashcard-list', compact('flashcards', 'unit'));
+            $unit = $topic->unit; // For backward compatibility with the template
+
+            return view('flashcards.partials.flashcard-list', compact('flashcards', 'topic', 'unit'));
 
         } catch (\Exception $e) {
             Log::error('Error fetching flashcards for list view: '.$e->getMessage());
@@ -1020,6 +1022,102 @@
         }
     }
 
+    /**
+     * Show the form for creating a new flashcard for a specific topic.
+     */
+    public function createForTopic(Request $request, int $topicId): View|Response
+    {
+        try {
+            if (! auth()->check()) {
+                return response('Unauthorized', 401);
+            }
+
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
+                return response('Access denied', 403);
+            }
+
+            return view('flashcards.partials.flashcard-modal', [
+                'unit' => $topic->unit,
+                'topic' => $topic,
+                'flashcard' => null, // Creating new
+                'isEdit' => false,
+            ]);
+
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+            return response('Topic not found', 404);
+        } catch (\Exception $e) {
+            Log::error('Error loading topic flashcard creation form: '.$e->getMessage());
+
+            return response('Unable to load form', 500);
+        }
+    }
+
+    /**
+     * Store a flashcard for a specific topic and return the updated list view.
+     */
+    public function storeForTopic(FlashcardRequest $request, int $topicId): View|Response
+    {
+        try {
+            if (! auth()->check()) {
+                return response('Unauthorized', 401);
+            }
+
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
+                return response('Access denied', 403);
+            }
+
+            $validated = $request->validated();
+            \Log::info('Topic flashcard validation data:', $validated);
+
+            // Ensure topic_id is set for topic-only architecture
+            $validated['topic_id'] = $topicId;
+
+            $flashcard = new Flashcard($validated);
+
+            // Validate card-specific data
+            $cardErrors = $flashcard->validateCardData();
+            if (! empty($cardErrors)) {
+                return response('<div class="text-red-500">'.implode('<br>', $cardErrors).'</div>', 422);
+            }
+
+            if ($flashcard->save()) {
+                // Return updated topic flashcards list with count update
+                $flashcards = $topic->flashcards()
+                    ->where('is_active', true)
+                    ->orderBy('created_at', 'desc')
+                    ->paginate(20);
+
+                $flashcardCount = $topic->flashcards()->count();
+
+                // Include OOB update for the flashcard count in header
+                $unit = $topic->unit;
+                $listView = view('flashcards.partials.flashcard-list', compact('flashcards', 'topic', 'unit'))->render();
+                $countUpdate = '<span class="ml-2 text-sm font-normal text-gray-600" id="topic-flashcard-count" hx-swap-oob="true">('.$flashcardCount.')</span>';
+
+                return response($listView.$countUpdate)
+                    ->header('HX-Trigger', 'flashcardCreated');
+            }
+
+            return response('Failed to create flashcard', 500);
+
+        } catch (\Illuminate\Validation\ValidationException $e) {
+            $errors = collect($e->validator->errors()->all())->implode('<br>');
+            \Log::error('Topic flashcard validation errors:', $e->validator->errors()->toArray());
+
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+            return response('Topic not found', 404);
+        } catch (\Exception $e) {
+            Log::error('Error creating topic flashcard: '.$e->getMessage());
+
+            return response('Unable to create flashcard', 500);
+        }
+    }
+
     /**
      * Show the form for editing a flashcard.
      */
@@ -1113,7 +1211,7 @@
             $errors = collect($e->validator->errors()->all())->implode('<br>');
             \Log::error('Flashcard validation errors:', $e->validator->errors()->toArray());
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error creating flashcard: '.$e->getMessage());
 
@@ -1198,7 +1296,7 @@
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error updating flashcard: '.$e->getMessage());
 
@@ -1387,7 +1485,7 @@
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error previewing import: '.$e->getMessage());
 
@@ -1470,7 +1568,7 @@
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error executing import: '.$e->getMessage());
 
@@ -1596,7 +1694,7 @@
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error generating print preview: '.$e->getMessage());
 
@@ -1875,7 +1973,7 @@
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error generating export preview: '.$e->getMessage());
 

app/Http/Controllers/PlanningController.php

@@ -13,6 +13,7 @@
 use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\View\View;
 
 class PlanningController extends Controller
@@ -42,7 +43,7 @@
         }
 
         // Get all sessions for selected child organized by status
-        $allSessions = Session::forChild($selectedChild->id);
+        $allSessions = Session::forChild($selectedChild->id)->with('topic.unit.subject')->get();
         $sessionsByStatus = [
             'backlog' => $allSessions->where('status', 'backlog'),
             'planned' => $allSessions->where('status', 'planned'),
@@ -51,23 +52,24 @@
         ];
 
         // Get catch-up sessions for selected child
-        $catchUpSessions = CatchUpSession::pending($selectedChild->id);
+        $catchUpSessions = CatchUpSession::pending($selectedChild->id)->with('topic.unit.subject')->get();
 
         // Get all topics for this child's subjects that don't have sessions yet
-        $subjects = Subject::where('user_id', $userId)->orderBy('name')->get();
+        $subjects = Subject::where('user_id', $userId)
+            ->with(['units.topics' => function ($query) {
+                $query->with('unit.subject');
+            }])
+            ->orderBy('name')
+            ->get();
+
         $availableTopics = collect([]);
+        $existingTopicIds = $allSessions->pluck('topic_id')->toArray();
 
         foreach ($subjects as $subject) {
-            /** @var \App\Models\Subject $subject */
-            $units = $subject->units;
-            foreach ($units as $unit) {
-                /** @var \App\Models\Unit $unit */
-                $topics = $unit->topics;
-                foreach ($topics as $topic) {
-                    /** @var \App\Models\Topic $topic */
+            foreach ($subject->units as $unit) {
+                foreach ($unit->topics as $topic) {
                     // Check if topic already has sessions for this child
-                    $existingSession = $allSessions->where('topic_id', $topic->id)->first();
-                    if (! $existingSession) {
+                    if (! in_array($topic->id, $existingTopicIds)) {
                         $availableTopics->push($topic);
                     }
                 }
@@ -157,7 +159,7 @@
         }
 
         // Verify topic belongs to user's subjects (through unit -> subject)
-        $subject = $topic->subject;
+        $subject = $topic->unit->subject;
         if (! $subject || $subject->user_id != auth()->id()) {
             abort(403, 'Topic does not belong to user');
         }
@@ -666,5 +668,25 @@
         $days = ['', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
 
         return $days[$day] ?? '';
     }
+
+    public function destroySession(int $sessionId): Response
+    {
+        $session = Session::find($sessionId);
+        if (! $session) {
+            abort(404);
+        }
+
+        // Verify session belongs to user's child
+        $child = $session->child;
+        if (! $child || $child->user_id != auth()->id()) {
+            abort(403);
+        }
+
+        // Delete the session
+        $session->delete();
+
+        // Return empty content to remove the session card from the UI
+        return response('')->header('HX-Trigger', 'sessionDeleted');
+    }
 }

app/Http/Controllers/SubjectController.php

@@ -39,7 +39,7 @@ public function index(Request $request)
 
             // Get subjects for the selected child or show empty state
             if ($selectedChild) {
-                $subjects = $selectedChild->subjects()->orderBy('name')->get();
+                $subjects = $selectedChild->subjects()->withCount('units')->orderBy('name')->get();
             } else {
                 $subjects = collect([]);
             }

app/Http/Controllers/TopicController.php

@@ -131,7 +131,7 @@
         }
 
         $validated = $request->validate([
-            'name' => 'required|string|max:255',
+            'title' => 'required|string|max:255',
             'description' => 'nullable|string|max:10000',
             'estimated_minutes' => 'required|integer|min:5|max:480',
             'required' => 'boolean',
@@ -148,10 +148,10 @@
                 $contentMetadata = $richContent['metadata'];
             }
 
             // Use 'name' field but store as 'title' in the model
             $topic = Topic::create([
                 'unit_id' => $unitId,
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,
@@ -202,7 +202,7 @@
             }
 
             $validated = $request->validate([
-                'name' => 'required|string|max:255',
+                'title' => 'required|string|max:255',
                 'description' => 'nullable|string',
                 'content_format' => 'nullable|in:plain,markdown,html',
                 'estimated_minutes' => 'required|integer|min:5|max:480',
@@ -222,7 +222,7 @@
             // Use 'name' field but store as 'title' in the model
             $topic = Topic::create([
                 'unit_id' => $unitId,
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,
@@ -354,7 +354,7 @@
             }
 
             $validated = $request->validate([
-                'name' => 'required|string|max:255',
+                'title' => 'required|string|max:255',
                 'description' => 'nullable|string',
                 'content_format' => 'nullable|in:plain,markdown,html',
                 'estimated_minutes' => 'required|integer|min:5|max:480',
@@ -373,7 +373,7 @@
 
             // Use 'name' field but store as 'title' in the model
             $topic->update([
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,

app/Models/Child.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Services\SupabaseClient;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -96,7 +95,7 @@ public function scopeForUser($query, int|string $userId)
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, Child>
      */
-    public static function forUser(int|string $userId, ?SupabaseClient $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forUser(int|string $userId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('user_id', $userId)->orderBy('name')->get();
     }

app/Models/Flashcard.php

@@ -302,7 +302,7 @@ public function canBeAccessedBy(string $userId): bool
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>
      */
-    public static function forUnit(int $unitId, $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forUnit(int $unitId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('unit_id', $unitId)
             ->whereNull('topic_id') // Only unit-scoped flashcards
@@ -316,7 +316,7 @@ public static function forUnit(int $unitId, $supabase = null): \Illuminate\Datab
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>
      */
-    public static function forTopic(int $topicId, $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forTopic(int $topicId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('topic_id', $topicId)->where('is_active', true)->orderBy('created_at')->get();
     }

app/Models/Subject.php

@@ -102,12 +102,12 @@ public function scopeForChild($query, int $childId)
      * Compatibility methods for existing controllers that expect SupabaseClient
      * These maintain API compatibility during migration
      */
-    public static function forUser(string $userId, $supabase = null): Collection
+    public static function forUser(string $userId): Collection
     {
         return self::where('user_id', $userId)->orderBy('name')->get();
     }
 
-    public static function forChild(int $childId, $supabase = null): Collection
+    public static function forChild(int $childId): Collection
     {
         return self::where('child_id', $childId)->orderBy('name')->get();
     }
@@ -129,7 +129,7 @@ public function getUnitCount(): int
     /**
      * Compatibility method for controllers that still pass SupabaseClient
      */
-    public function getUnitCount_compat($supabase = null): int
+    public function getUnitCount_compat(): int
     {
         return $this->getUnitCount();
     }