Updates to Relations and Scopes

Author: chrisjk123

README.md

@@ -51,6 +51,15 @@ Chrisjk123\Blogger\Post::publishedLastWeek()->get();
 
 // Search by unpublished Posts only
 Chrisjk123\Blogger\Post::notPublished()->get();
+
+// Search by scheduled Posts only
+Chrisjk123\Blogger\Post::scheduled()->get();
+
+// Search by drafted Posts only
+Chrisjk123\Blogger\Post::draft()->get();
+
+// Order by latest published
+Chrisjk123\Blogger\Post::orderByLatest()->get();
 ```
 
 ## Requirements
@@ -106,6 +115,13 @@ class User extends Authenticatable
 
     // ...
 }
+
+
+// Retrieve the posts created by the user(s)
+$user->posts;
+
+// Retrieve the comments created by the user(s)
+$user->comments;
 ```
 ### Changelog
 

config/blogs.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    /*
+     * The default path to the User model in Laravel
+     */
+    'user_class' => \App\User::class,
+    'user_key_name' => 'id',
+];

config/config.php

@@ -22,19 +22,13 @@ public function boot()
         $this->publishes([
             __DIR__.'/../database/seeds/' => database_path('seeds'),
         ], 'seeders');
+
+        $this->publishes([
+            __DIR__.'/../config/blogs.php' => config_path('blogs.php'),
+        ], 'config');
     }
 
-    /**
-     * Register the application services.
-     */
     public function register()
     {
-        // Automatically apply the package configuration
-        $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'blogger');
-
-        // Register the main class to use with the facade
-        $this->app->singleton('blogger', function () {
-            return new Blogger;
-        });
     }
 }

src/BloggerFacade.php

@@ -2,12 +2,16 @@
 
 namespace Chrisjk123\Blogger;
 
+use Chrisjk123\Blogger\Traits\Comment\CommentApproval;
 use Chrisjk123\Blogger\Traits\Comment\CommentScopes;
+use Chrisjk123\Blogger\Traits\IsAuthorable;
 use Illuminate\Database\Eloquent\Model;
 
 class Comment extends Model
 {
-    use CommentScopes;
+    use CommentScopes,
+    CommentApproval,
+    IsAuthorable;
 
     protected $table = 'comments';
 
@@ -21,9 +25,4 @@ public function commentable()
     {
         return $this->morphTo();
     }
-
-    public function author()
-    {
-        return $this->belongsTo(User::class, 'user_id');
-    }
 }

src/BloggerServiceProvider.php

@@ -2,14 +2,18 @@
 
 namespace Chrisjk123\Blogger;
 
-use App\User;
+use Chrisjk123\Blogger\Traits\IsAuthorable;
 use Chrisjk123\Blogger\Traits\Post\PostAttributes;
 use Chrisjk123\Blogger\Traits\Post\PostScopes;
+use Chrisjk123\Blogger\Traits\Post\PostsHaveComments;
 use Illuminate\Database\Eloquent\Model;
 
 class Post extends Model
 {
-    use PostScopes, PostAttributes;
+    use PostScopes,
+    PostAttributes,
+    IsAuthorable,
+    PostsHaveComments;
 
     const PUBLISHED = 'published';
     const DRAFT = 'draft';
@@ -41,9 +45,4 @@ public function tags()
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
-
-    public function author()
-    {
-        return $this->belongsTo(User::class, 'id', 'user_id');
-    }
 }

src/Comment.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Chrisjk123\Blogger\Traits\Comment;
+
+trait CommentApproval
+{
+    public function scopeApproved($query)
+    {
+        return $query->where('is_approved', true);
+    }
+
+    public function scopeUnapproved($query)
+    {
+        return $query->where('is_approved', false);
+    }
+
+    public function approve()
+    {
+        $this->update(['is_approved' => true]);
+
+        return $this;
+    }
+
+    public function disapprove()
+    {
+        $this->update(['is_approved' => false]);
+
+        return $this;
+    }
+}

src/Post.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Chrisjk123\Blogger\Traits;
+
+trait IsAuthorable
+{
+    public function author()
+    {
+        return $this->belongsTo(
+            config('blogs.user_class'),
+            'user_id',
+            config('blogs.user_key_name')
+        );
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(
+            config('blogs.user_class'),
+            'user_id',
+            config('blogs.user_key_name')
+        );
+    }
+}

src/Traits/Comment/CommentApproval.php

@@ -14,7 +14,7 @@ public function isPublished()
         return $this->status == self::PUBLISHED;
     }
 
-    public function notPublished()
+    public function isNotPublished()
     {
         return $this->status == self::DRAFT
         || $this->status == self::SCHEDULED;