Updated commentable and commenter type

balajidharma · Dec 8, 2024 · 43f842f · 43f842f
1 parent 9d27943
commit 43f842f
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 22 deletions.
diff --git a/config/comment.php b/config/comment.php
@@ -16,5 +16,5 @@
         'approved' => 1,
         'rejected' => 2,
         'spam' => 3,
-    ]
-];
+    ],
+];
diff --git a/database/migrations/create_comment_tables.php.stub b/database/migrations/create_comment_tables.php.stub
@@ -17,9 +17,9 @@ class CreateCommentTables extends Migration
 
         Schema::create($tableNames['comments'], function (Blueprint $table) {
             $table->id('id');
-            $table->morphs('commenter');
+            $table->uuidMorphs('commenter');
             $table->unsignedBigInteger('parent_id')->nullable()->index();
-            $table->morphs('commentable');
+            $table->uuidMorphs('commentable');
             $table->text('content');
             $table->smallInteger('status')->default(0);
             $table->timestamps();

diff --git a/src/Events/CommentCreated.php b/src/Events/CommentCreated.php
@@ -3,8 +3,8 @@
 namespace BalajiDharma\LaravelComment\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class CommentCreated
 {
@@ -21,4 +21,4 @@ public function __construct($comment)
     {
         $this->comment = $comment;
     }
-}
+}
diff --git a/src/Events/CommentDeleted.php b/src/Events/CommentDeleted.php
@@ -3,8 +3,8 @@
 namespace BalajiDharma\LaravelComment\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class CommentDeleted
 {
@@ -21,4 +21,4 @@ public function __construct($comment)
     {
         $this->comment = $comment;
     }
-}
+}
diff --git a/src/Events/CommentUpdated.php b/src/Events/CommentUpdated.php
@@ -3,8 +3,8 @@
 namespace BalajiDharma\LaravelComment\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class CommentUpdated
 {
@@ -21,4 +21,4 @@ public function __construct($comment)
     {
         $this->comment = $comment;
     }
-}
+}
diff --git a/src/Models/Comment.php b/src/Models/Comment.php
@@ -42,7 +42,7 @@ class Comment extends Model
      * @var array
      */
     protected $with = [
-        'commenter'
+        'commenter',
     ];
 
     /**
@@ -80,5 +80,4 @@ public function parent()
     {
         return $this->belongsTo(config('comment.models.comment'), 'parent_id');
     }
-
 }
diff --git a/src/Traits/HasCommenter.php b/src/Traits/HasCommenter.php
@@ -15,30 +15,40 @@ trait HasCommenter
      */
     public function comments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commenter');
+        return $this->morphMany(Config::get('comment.models.comment'), 'commenter', 'commenter_type', 'commenter_id', $this->getCommenterKey());
     }
 
     /**
      * Returns only approved comments that this user has made.
      */
     public function approvedComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commenter')->where('status', Config::get('comment.status.approved'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commenter', 'commenter_type', 'commenter_id', $this->getCommenterKey())->where('status', Config::get('comment.status.approved'));
     }
 
     /**
      * Returns only pending comments that this user has made.
      */
     public function pendingComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commenter')->where('status', Config::get('comment.status.pending'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commenter', 'commenter_type', 'commenter_id', $this->getCommenterKey())->where('status', Config::get('comment.status.pending'));
     }
 
     /**
      * Returns only rejected comments that this user has made.
      */
     public function rejectedComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commenter')->where('status', Config::get('comment.status.rejected'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commenter', 'commenter_type', 'commenter_id', $this->getCommenterKey())->where('status', Config::get('comment.status.rejected'));
     }
-}
+
+    public function getCommenterKey()
+    {
+        return $this->commenter_key ?? 'id';
+    }
+
+    public function setCommenterKey($key)
+    {
+        $this->commenter_key = $key;
+    }
+}
diff --git a/src/Traits/HasComments.php b/src/Traits/HasComments.php
@@ -9,30 +9,40 @@ trait HasComments
 {
     public function comments(): MorphMany
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commentable');
+        return $this->morphMany(Config::get('comment.models.comment'), 'commentable', 'commentable_type', 'commentable_id', $this->getCommentableKey());
     }
 
     /**
      * Returns only approved comments that this user has made.
      */
     public function approvedComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commentable')->where('status', Config::get('comment.status.approved'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commentable', 'commentable_type', 'commentable_id', $this->getCommentableKey())->where('status', Config::get('comment.status.approved'));
     }
 
     /**
      * Returns only pending comments that this user has made.
      */
     public function pendingComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commentable')->where('status', Config::get('comment.status.pending'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commentable', 'commentable_type', 'commentable_id', $this->getCommentableKey())->where('status', Config::get('comment.status.pending'));
     }
 
     /**
      * Returns only rejected comments that this user has made.
      */
     public function rejectedComments()
     {
-        return $this->morphMany(Config::get('comment.models.comment'), 'commentable')->where('status', Config::get('comment.status.rejected'));
+        return $this->morphMany(Config::get('comment.models.comment'), 'commentable', 'commentable_type', 'commentable_id', $this->getCommentableKey())->where('status', Config::get('comment.status.rejected'));
     }
-}
+
+    public function getCommentableKey()
+    {
+        return $this->commentable_key ?? 'id';
+    }
+
+    public function setCommentableKey($key)
+    {
+        $this->commentable_key = $key;
+    }
+}