Prevent duplicate slugs on sort

[bookstack] / app / Repos / ChapterRepo.php

diff --git a/app/Repos/ChapterRepo.php b/app/Repos/ChapterRepo.php
index db2a72d96b49ee525bd537672a6edebfbf93e95e..c3d75ca9d8a829b001a50af6874994988f9c5f7c 100644 (file)
--- a/app/Repos/ChapterRepo.php
+++ b/app/Repos/ChapterRepo.php
@@ -96,7 +96,7 @@ class ChapterRepo
     public function doesSlugExist($slug, $bookId, $currentId = false)
     {
         $query = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId);
     public function doesSlugExist($slug, $bookId, $currentId = false)
     {
         $query = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId);

-        if($currentId) {
+        if ($currentId) {

             $query = $query->where('id', '!=', $currentId);
         }
         return $query->count() > 0;
             $query = $query->where('id', '!=', $currentId);
         }
         return $query->count() > 0;


@@ -113,7 +113,7 @@ class ChapterRepo
     public function findSuitableSlug($name, $bookId, $currentId = false)
     {
         $slug = Str::slug($name);
     public function findSuitableSlug($name, $bookId, $currentId = false)
     {
         $slug = Str::slug($name);

-        while($this->doesSlugExist($slug, $bookId, $currentId)) {
+        while ($this->doesSlugExist($slug, $bookId, $currentId)) {

             $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
         }
         return $slug;
             $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
         }
         return $slug;


@@ -139,18 +139,19 @@ class ChapterRepo
     }
 
     /**
     }
 
     /**

-     * Sets a chapters book id.
+     * Changes the book relation of this chapter.

      * @param         $bookId
      * @param Chapter $chapter
      * @return Chapter
      */
      * @param         $bookId
      * @param Chapter $chapter
      * @return Chapter
      */

-    public function setBookId($bookId, Chapter $chapter)
+    public function changeBook($bookId, Chapter $chapter)

     {
         $chapter->book_id = $bookId;
     {
         $chapter->book_id = $bookId;

-        foreach($chapter->activity as $activity) {
+        foreach ($chapter->activity as $activity) {

             $activity->book_id = $bookId;
             $activity->save();
         }
             $activity->book_id = $bookId;
             $activity->save();
         }

+        $chapter->slug = $this->findSuitableSlug($chapter->name, $bookId, $chapter->id);

         $chapter->save();
         return $chapter;
     }
         $chapter->save();
         return $chapter;
     }