fix(profile-chapters): change chapters tree render

Hexlet · Sep 10, 2019 · dc6877b · dc6877b
1 parent d904f58
commit dc6877b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -11,11 +11,16 @@ public function show(string $name)
     {
         $user = User::where('name', $name)->firstOrFail();
 
-        $allChapters = Chapter::with('user')->get();
+        $allChapters = Chapter::all();
+        $userReadChapters = $user->readChapters;
+
+        $chaptersTree = $allChapters->each(function ($chapter) use ($userReadChapters) {
+            $chapter->is_read = $userReadChapters->contains('id', $chapter->id);
+        })->pluck('is_read', 'path');
 
         return view('user.index', [
             'user' => $user,
-            'allChapters' => $allChapters
+            'chaptersTree' => $chaptersTree
         ]);
     }
 }
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
@@ -11,13 +11,13 @@
         </div>
         <div class="col-12 col-md-9 my-4 d-flex flex-column">
             <ul class="chapters-tree">
-                @foreach($allChapters as $chapter)
+                @foreach($chaptersTree as $path => $is_read)
 
                     <li class="chapters-tree-item">
                         <label>
-                            <input type="checkbox" {{ $chapter->is_read ? 'checked' : '' }}>
+                            <input type="checkbox" {{ $is_read ? 'checked' : '' }}>
                         </label>
-                        {{ $chapter->path }}
+                        {{ $path }}
                     </li>
 
                 @endforeach

diff --git a/tests/Unit/Model/ChapterTest.php b/tests/Unit/Model/ChapterTest.php