Post scopes and updated readme

Author: chrisjk123

README.md

@@ -8,6 +8,51 @@
 
 This package offers fully blog database tables as well as preset models with relations, scopes and seeders.
 
+Here are some code examples:
+
+```php
+// Search by the short whereCategories method OR use whereCategory() and specify the field
+$results = Chrisjk123\Blogger\Post::whereCategories($categories = null)->get();
+$results = Chrisjk123\Blogger\Post::whereCategory($field, $operator, $value)->get();
+
+// Search by Category ID OR IDs
+$results = Chrisjk123\Blogger\Post::whereCategories(1)->get();
+$results = Chrisjk123\Blogger\Post::whereCategory('id', 1)->get();
+----------
+$results = Chrisjk123\Blogger\Post::whereCategories([3, 6, 7])->get();
+$results = Chrisjk123\Blogger\Post::whereCategory('id', [3, 6, 7])->get();
+
+// Search by Category name OR names
+$results = Chrisjk123\Blogger\Post::whereCategories('Izabella Bins II')->get();
+$results = Chrisjk123\Blogger\Post::whereCategory('name', 'Izabella Bins II')->get();
+----------
+$results = Chrisjk123\Blogger\Post::whereCategories(['Izabella Bins II', 'Osborne Fay'])->get();
+$results = Chrisjk123\Blogger\Post::whereCategory('name', ['Izabella Bins II', 'Osborne Fay'])->get();
+
+// Search by Category model or a Category Collection
+$category = Chrisjk123\Blogger\Category::where('id', 7)->first();
+$results = Chrisjk123\Blogger\Post::whereCategories($category)->get();
+----------
+$categories = Chrisjk123\Blogger\Category::whereIn('id', [3, 6, 7])->get();
+$results = Chrisjk123\Blogger\Post::whereCategories($categories)->get();
+
+// Search by related Post (tags or category)
+$post = Chrisjk123\Blogger\Post::find(8);
+$results = Chrisjk123\Blogger\Post::relatedByPostTags($post)->get();
+----------
+$results = Chrisjk123\Blogger\Post::relatedByPostCategory($post)->get();
+
+// Search by published Posts only
+Chrisjk123\Blogger\Post::published()->get();
+----------
+Chrisjk123\Blogger\Post::publishedLastMonth()->get();
+----------
+Chrisjk123\Blogger\Post::publishedLastWeek()->get();
+
+// Search by unpublished Posts only
+Chrisjk123\Blogger\Post::notPublished()->get();
+```
+
 ## Requirements
 
 This package requires Laravel 5.8 or higher, PHP 7.2 or higher and a database that supports json fields and MySQL compatible functions.

src/BloggerFacade.php

@@ -29,7 +29,7 @@ class Post extends Model
 
     public function category()
     {
-        return $this->hasOne(Category::class, 'category_id');
+        return $this->hasOne(Category::class, 'id', 'category_id');
     }
 
     public function comments()
@@ -44,6 +44,6 @@ public function tags()
 
     public function author()
     {
-        return $this->belongsTo(User::class, 'user_id');
+        return $this->belongsTo(User::class, 'id', 'user_id');
     }
 }

src/BloggerServiceProvider.php

@@ -12,49 +12,85 @@ trait PostScopes
 {
     public function scopeWhereCategories(Builder $query, $categories = null)
     {
-        if (is_null($categories)) {
-            return $query;
-        }
-
+        // search by category name
         if (is_string($categories)) {
-            return $this->whereCategory($categories, 'name');
+            return $this->whereCategory('name', $categories);
         }
 
+        // search by category id
         if (is_int($categories)) {
-            return $this->whereCategory($categories, 'id');
+            return $this->whereCategory('id', $categories);
         }
 
+        // search by multiple categories
         if (is_array($categories)) {
-            return $query->with('category')
-            ->whereHas('category', function (Builder $query) use ($categories) {
-                return $query->whereIn('id', $categories);
-            });
+            if (is_int($categories[0])) {
+                $field = 'id';
+            } else {
+                $field = 'name';
+            }
+
+            return $this->whereCategory($field, $categories);
         }
 
+        // search by category model
         if ($categories instanceof Category) {
-            return $this->whereCategory($categories->id, 'id');
+            return $this->whereCategory('id', $categories->id);
         }
 
+        // search by categories collection
         if ($categories instanceof Collection) {
-            return $query->with('category')
-            ->whereHas('category', function (Builder $query) use ($categories) {
-                return $query->whereIn(
-                    'id',
-                    $categories->pluck('id')->toArray()
-                );
-            });
+            return $this->whereCategory('id', $categories->pluck('id')->toArray());
         }
 
         return $query;
     }
 
-    public function scopeWhereCategory(Builder $query, $category, $type = 'name')
+    public function scopeWhereCategory(Builder $query, ...$options)
     {
+        $collection = collect([
+            'field' => 'id',
+            'operator' => '=',
+            'value' => null,
+        ]);
+
+        // Search by field and value
+        if (count($options) == 2) {
+            $collection = $collection->replace(['field' => $options[0]])
+            ->replace(['value' => $options[1]]);
+        }
+
+        // Search by field, operator and value
+        if (count($options) == 3) {
+            $collection = $collection->replace(['field' => $options[0]])
+            ->replace(['operator' => $options[1]])
+            ->replace(['value' => $options[2]]);
+        }
+
         $query->with('category');
 
-        return $query->whereHas('category', function (Builder $query) use ($type, $category) {
-            return $query->where($type, $category);
-        });
+        if (is_array($collection['value'])) {
+            return $query->whereHas(
+                'category',
+                function (Builder $query) use ($collection) {
+                    return $query->whereIn(
+                        $collection['field'],
+                        $collection['value']
+                    );
+                }
+            );
+        }
+
+        return $query->whereHas(
+            'category',
+            function (Builder $query) use ($collection) {
+                return $query->where(
+                    $collection['field'],
+                    $collection['operator'],
+                    $collection['value']
+                );
+            }
+        );
     }
 
     public function scopeRelatedByPostTags(Builder $query, Post $post)