Queries enhancement for better performance

YasserElgammal · Jan 21, 2023 · 2c0f0f2 · 2c0f0f2
1 parent 6c40d62
commit 2c0f0f2
Show file tree

Hide file tree

Showing 16 changed files with 181 additions and 22 deletions.
diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php
@@ -7,7 +7,6 @@
 use App\Models\Post;
 use App\Models\Tag;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 
 class AdminController extends Controller
 {

diff --git a/app/Http/Controllers/Admin/CategoryController.php b/app/Http/Controllers/Admin/CategoryController.php
@@ -19,7 +19,7 @@ class CategoryController extends Controller
      */
     public function index()
     {
-        $categories = Category::all();
+        $categories = Category::with('user')->get();
         return view('admin.category.index', compact('categories'));
     }
 

diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
@@ -12,7 +12,7 @@ class PageController extends Controller
 {
     public function index(){
 
-        $pages = Page::orderBy('id', 'desc')->paginate(15);
+        $pages = Page::with('user')->orderBy('id', 'desc')->paginate(15);
         return view('admin.page.index', compact('pages'));
     }
 

diff --git a/app/Http/Controllers/Admin/PostController.php b/app/Http/Controllers/Admin/PostController.php
@@ -26,7 +26,7 @@ public function __construct()
      */
     public function index()
     {
-        $posts = Post::orderBy('id', 'desc')->paginate(15);
+        $posts = Post::with(['category', 'user', 'tags'])->orderByDesc('id')->paginate(15);
         return view('admin.post.index', compact('posts'));
     }
 

diff --git a/app/Http/Controllers/Admin/TagController.php b/app/Http/Controllers/Admin/TagController.php
@@ -17,7 +17,7 @@ class TagController extends Controller
      */
     public function index()
     {
-        $tags = Tag::all();
+        $tags = Tag::with('posts')->get();
         return view('admin.tag.index', compact('tags'));
     }
 

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -18,7 +18,7 @@ class UserController extends Controller
      */
     public function index()
     {
-        $users = User::orderBy('id', 'desc')->paginate(15);
+        $users = User::with('role')->orderBy('id', 'desc')->paginate(15);
         return view('admin.user.index', compact('users'));
     }
 

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -4,6 +4,7 @@
 
 use App\Models\Category;
 use App\Models\Post;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cookie;
 
@@ -14,7 +15,6 @@ public function index()
     {
         // Get the active posts with (Category and User) details
         $posts = Post::whereStatus(true)->with(['category', 'user'])->orderBy('id','desc')->paginate(10);
-
         return view('index', compact('posts'));
     }
 

diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php
@@ -11,7 +11,7 @@ class PostController extends Controller
     public function getPostBySlug($slug)
     {
         // I've Pass Slug to Get the Category per it's Slug
-        $post = Post::with('category')->whereStatus(true)->whereSlug($slug)->firstOrFail();
+        $post = Post::with(['category', 'user'])->whereStatus(true)->whereSlug($slug)->firstOrFail();
 
         return view('post', compact('post'));
     }

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
@@ -10,11 +10,7 @@ class TagController extends Controller
 {
     public function getPostsPerTags($tag)
     {
-        // $posts = $tag->posts();
         $tags = Tag::whereName($tag)->firstOrFail()->publishedPosts();
-        // $tag = Tag::whereName($tag)->firstOrFail();
-
-        //  dd($tags);
 
         return view('tag', compact('tags'));
     }

diff --git a/app/Models/Category.php b/app/Models/Category.php
@@ -25,6 +25,6 @@ public function user()
     // I use this function to get Active Posts in the current category
     public function publishedPosts()
     {
-        return SELF::posts()->whereStatus(true)->orderBy('id','desc')->paginate(10);
+        return SELF::posts()->with('user')->whereStatus(true)->orderBy('id','desc')->paginate(10);
     }
 }
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
@@ -18,11 +18,11 @@ public function posts()
     // I use this function to get Active Posts in the current Tag
     public function publishedPosts()
     {
-        return SELF::posts()->whereStatus(true)->orderBy('id', 'desc')->paginate(10);
+        return SELF::posts()->with(['user', 'category'])->whereStatus(true)->orderBy('id','desc')->paginate(10);
     }
 
     public function countTagsForPublishedPosts()
     {
-        return SELF::publishedPosts()->count();
+        return SELF::posts()->whereStatus(true)->count();
     }
 }
diff --git a/app/Policies/PostPolicy.php b/app/Policies/PostPolicy.php
@@ -12,7 +12,7 @@ class PostPolicy
 
     public function viewAny(User $user)
     {
-        return ($user->getRole('Writer') || $user->getRole('Admin'));
+        return $user->getRole('Writer');
     }
     /**
      * Determine whether the user can create models.
@@ -22,7 +22,7 @@ public function viewAny(User $user)
      */
     public function create(User $user)
     {
-        return ($user->getRole('Writer') || $user->getRole('Admin'));
+        return $user->getRole('Writer');
     }
 
     /**
@@ -34,7 +34,7 @@ public function create(User $user)
      */
     public function update(User $user, Post $post)
     {
-        return (($user->id == $post->user->id) || $user->getRole('Admin'));
+        return $user->id == $post->user->id;
     }
 
     /**
@@ -46,6 +46,6 @@ public function update(User $user, Post $post)
      */
     public function delete(User $user, Post $post)
     {
-        return (($user->id == $post->user->id) || $user->getRole('Admin'));
+        return $user->id == $post->user->id;
     }
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -28,11 +28,22 @@ public function boot()
     {
         $this->registerPolicies();
 
+        Gate::before(function ($user) {
+            if ($user->role->name == 'Admin') {
+                return true;
+            }
+        });
+
         Gate::define('admin-login', function (User $user) {
-            return $user->getRole('Admin') || $user->getRole('Writer');
+            if ($user->role->name == 'Writer') {
+                return true;
+            }
         });
+
         Gate::define('admin-only', function (User $user) {
-            return $user->getRole('Admin');
+            if ($user->role->name == 'Admin') {
+                return true;
+            }
         });
     }
 }
diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         "laravel/tinker": "^2.7"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.7",
         "fakerphp/faker": "^1.9.1",
         "laravel/breeze": "^1.16",
         "laravel/pint": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore