Fixes an issue with handling of large image files.

[bookstack] / app / Repos / CommentRepo.php

diff --git a/app/Repos/CommentRepo.php b/app/Repos/CommentRepo.php
index c2a19ec0b06bddf478d710ff34b68c92d8139dc9..7f89e7f8dfb3011eabbf60aca05c8fd5b5c3451d 100644 (file)
--- a/app/Repos/CommentRepo.php
+++ b/app/Repos/CommentRepo.php
@@ -1,51 +1,90 @@
 <?php namespace BookStack\Repos;
 
 use BookStack\Comment;
-use BookStack\Page;
+use BookStack\Entity;
 
 /**
- * Class TagRepo
+ * Class CommentRepo
  * @package BookStack\Repos
  */
-class CommentRepo {
+class CommentRepo
+{
+
     /**
-     *
-     * @var Comment $comment 
+     * @var Comment $comment
      */
     protected $comment;
 
+    /**
+     * CommentRepo constructor.
+     * @param Comment $comment
+     */
     public function __construct(Comment $comment)
     {
         $this->comment = $comment;
     }
 
-    public function create (Page $page, $data = []) {
-        $userId = user()->id;
-        $comment = $this->comment->newInstance();
-        $comment->fill($data);
-        // new comment
-        $comment->page_id = $page->id;
-        $comment->created_by = $userId;        
-        $comment->save();
-        return $comment;
+    /**
+     * Get a comment by ID.
+     * @param $id
+     * @return Comment|\Illuminate\Database\Eloquent\Model
+     */
+    public function getById($id)
+    {
+        return $this->comment->newQuery()->findOrFail($id);
     }
 
-    public function update($comment, $input) {
+    /**
+     * Create a new comment on an entity.
+     * @param Entity $entity
+     * @param array $data
+     * @return Comment
+     */
+    public function create(Entity $entity, $data = [])
+    {
         $userId = user()->id;
+        $comment = $this->comment->newInstance($data);
+        $comment->created_by = $userId;
         $comment->updated_by = $userId;
-        $comment->fill($input);
-        $comment->save();
+        $comment->local_id = $this->getNextLocalId($entity);
+        $entity->comments()->save($comment);
+        return $comment;
+    }
+
+    /**
+     * Update an existing comment.
+     * @param Comment $comment
+     * @param array $input
+     * @return mixed
+     */
+    public function update($comment, $input)
+    {
+        $comment->updated_by = user()->id;
+        $comment->update($input);
         return $comment;
     }
-    
-    public function getCommentsForPage($pageId, $commentId, $count = 20) {
-        if (empty($commentId)) {
-            // requesting parent comments
-            $query = $this->comment->getParentCommentsByPage($pageId);
-            return $query->paginate($count);
-        } else {
-            // requesting the child comments.
-            return Comment::whereRaw("page_id = $pageId AND parent_id = $commentId")->get();
-        }        
+
+    /**
+     * Delete a comment from the system.
+     * @param Comment $comment
+     * @return mixed
+     */
+    public function delete($comment)
+    {
+        return $comment->delete();
+    }
+
+    /**
+     * Get the next local ID relative to the linked entity.
+     * @param Entity $entity
+     * @return int
+     */
+    protected function getNextLocalId(Entity $entity)
+    {
+        $comments = $entity->comments(false)->orderBy('local_id', 'desc')->first();
+        if ($comments === null) {
+            return 1;
+        }
+        return $comments->local_id + 1;
     }
-}
\ No newline at end of file
+}