fix eager loading

fey · Mar 13, 2024 · ce975e1 · ce975e1
1 parent abf4212
commit ce975e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/ExerciseController.php b/app/Http/Controllers/ExerciseController.php
@@ -19,7 +19,7 @@ public function index(): View
 
     public function show(Exercise $exercise): View
     {
-        $exercise->load('chapter', 'users');
+        $exercise->load('chapter', 'users', 'comments');
         /** @var User $authUser */
         $authUser = auth()->user() ?? new User();
         $userCompletedExercise = $authUser->exerciseMembers()

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -36,9 +36,9 @@ public function index(): View
 
         $filter = Request::query('filter', '');
         $statisticTable = $this->getStatisticTable($filter);
-        $logItems = Activity::latest()->has('subject')->has('causer')->with('causer')->limit(10)->get();
+        $logItems = Activity::latest()->has('subject')->has('causer')->with('causer', 'subject')->limit(10)->get();
         $chart = ChartHelper::getChart();
-        $comments = Comment::latest()->has('user')->with('user')->with('commentable')->limit(10)->get();
+        $comments = Comment::latest()->has('user')->with('user')->with('commentable', 'user')->limit(10)->get();
 
         return view('home.index', compact(
             'logItems',

diff --git a/app/Models/Comment.php b/app/Models/Comment.php
@@ -43,7 +43,7 @@ class Comment extends Model
 
     public string $defaultPresenter = CommentPresenter::class;
 
-    protected $with = ['user'];
+    protected $with = ['user', 'commentable', 'parent'];
     protected $fillable = ['content', 'commentable_type', 'commentable_id', 'parent_id'];
 
     public function user(): BelongsTo