From f16034d963ec7eb3bc615d3754902a0ba1896098 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 11 Oct 2017 18:04:05 +0100
Subject: [PATCH] Fix the number of queries being made

---
 app/Http/Controllers/BookmarksController.php | 4 +++-
 resources/views/bookmarks/index.blade.php    | 2 +-
 resources/views/bookmarks/show.blade.php     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/BookmarksController.php b/app/Http/Controllers/BookmarksController.php
index 72112d9b..d2d66888 100644
--- a/app/Http/Controllers/BookmarksController.php
+++ b/app/Http/Controllers/BookmarksController.php
@@ -8,13 +8,15 @@ class BookmarksController extends Controller
 {
     public function index()
     {
-        $bookmarks = Bookmark::with('tags')->latest()->paginate(10);
+        $bookmarks = Bookmark::latest()->with('tags')->withCount('tags')->paginate(10);
 
         return view('bookmarks.index', compact('bookmarks'));
     }
 
     public function show(Bookmark $bookmark)
     {
+        $bookmark->loadMissing('tags');
+
         return view('bookmarks.show', compact('bookmark'));
     }
 }
diff --git a/resources/views/bookmarks/index.blade.php b/resources/views/bookmarks/index.blade.php
index 8ec6c01d..c6a9cb82 100644
--- a/resources/views/bookmarks/index.blade.php
+++ b/resources/views/bookmarks/index.blade.php
@@ -20,7 +20,7 @@ Bookmarks «
     @isset($bookmark->content)
     <p>{{ $bookmark->content }}</p>
     @endisset
-    @if(count($bookmark->tags()->get()) > 0)
+    @if($bookmark->tags_count > 0)
     <ul>
       @foreach($bookmark->tags as $tag)
       <li><a href="/bookmarks/tagged/{{ $tag->tag }}">{{ $tag->tag }}</a></li>
diff --git a/resources/views/bookmarks/show.blade.php b/resources/views/bookmarks/show.blade.php
index 1d186fa2..649afdb5 100644
--- a/resources/views/bookmarks/show.blade.php
+++ b/resources/views/bookmarks/show.blade.php
@@ -18,7 +18,7 @@ Bookmark «
   @isset($bookmark->content)
   <p>{{ $bookmark->content }}</p>
   @endisset
-  @if(count($bookmark->tags()->get()) > 0)
+  @if(count($bookmark->tags) > 0)
     <ul>
       @foreach($bookmark->tags as $tag)
       <li><a href="/bookmarks/tagged/{{ $tag->tag }}">{{ $tag->tag }}</a></li>