Perms: Fixed some issues made when adding transactions

[bookstack] / app / Entities / Repos / ChapterRepo.php

diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 9534a406082346307c7658db71c6c65ad73ab65e..6503e63cfafc5912a886131ab089b169358ecbeb 100644 (file)
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -4,53 +4,42 @@ namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;

-use BookStack\Entities\Models\Page;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Chapter;

-use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Queries\EntityQueries;

 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;

-use BookStack\Exceptions\NotFoundException;

 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;

+use BookStack\Util\DatabaseTransaction;

 use Exception;
 
 class ChapterRepo
 {
     public function __construct(
 use Exception;
 
 class ChapterRepo
 {
     public function __construct(

-        protected BaseRepo $baseRepo
+        protected BaseRepo $baseRepo,
+        protected EntityQueries $entityQueries,
+        protected TrashCan $trashCan,

     ) {
     }
 
     ) {
     }
 

-    /**
-     * Get a chapter via the slug.
-     *
-     * @throws NotFoundException
-     */
-    public function getBySlug(string $bookSlug, string $chapterSlug): Chapter
-    {
-        $chapter = Chapter::visible()->whereSlugs($bookSlug, $chapterSlug)->first();
-
-        if ($chapter === null) {
-            throw new NotFoundException(trans('errors.chapter_not_found'));
-        }
-
-        return $chapter;
-    }
-

     /**
      * Create a new chapter in the system.
      */
     public function create(array $input, Book $parentBook): Chapter
     {
     /**
      * Create a new chapter in the system.
      */
     public function create(array $input, Book $parentBook): Chapter
     {

-        $chapter = new Chapter();
-        $chapter->book_id = $parentBook->id;
-        $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
-        $this->baseRepo->create($chapter, $input);
-        $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
-        Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
-
-        return $chapter;
+        return (new DatabaseTransaction(function () use ($input, $parentBook) {
+            $chapter = new Chapter();
+            $chapter->book_id = $parentBook->id;
+            $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
+            $this->baseRepo->create($chapter, $input);
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
+            Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
+
+            $this->baseRepo->sortParent($chapter);
+
+            return $chapter;
+        }))->run();

     }
 
     /**
     }
 
     /**


@@ -61,11 +50,13 @@ class ChapterRepo
         $this->baseRepo->update($chapter, $input);
 
         if (array_key_exists('default_template_id', $input)) {
         $this->baseRepo->update($chapter, $input);
 
         if (array_key_exists('default_template_id', $input)) {

-            $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id']));
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id']));

         }
 
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 
         }
 
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 

+        $this->baseRepo->sortParent($chapter);
+

         return $chapter;
     }
 
         return $chapter;
     }
 


@@ -76,10 +67,9 @@ class ChapterRepo
      */
     public function destroy(Chapter $chapter)
     {
      */
     public function destroy(Chapter $chapter)
     {

-        $trashCan = new TrashCan();
-        $trashCan->softDestroyChapter($chapter);
+        $this->trashCan->softDestroyChapter($chapter);

         Activity::add(ActivityType::CHAPTER_DELETE, $chapter);
         Activity::add(ActivityType::CHAPTER_DELETE, $chapter);

-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();

     }
 
     /**
     }
 
     /**


@@ -92,8 +82,8 @@ class ChapterRepo
      */
     public function move(Chapter $chapter, string $parentIdentifier): Book
     {
      */
     public function move(Chapter $chapter, string $parentIdentifier): Book
     {

-        $parent = $this->findParentByIdentifier($parentIdentifier);
-        if (is_null($parent)) {
+        $parent = $this->entityQueries->findVisibleByStringIdentifier($parentIdentifier);
+        if (!$parent instanceof Book) {

             throw new MoveOperationException('Book to move chapter into not found');
         }
 
             throw new MoveOperationException('Book to move chapter into not found');
         }
 


@@ -101,57 +91,14 @@ class ChapterRepo
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 

-        $chapter->changeBook($parent->id);
-        $chapter->rebuildPermissions();
-        Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
-
-        return $parent;
-    }
-
-    /**
-     * Update the default page template used for this chapter.
-     * Checks that, if changing, the provided value is a valid template and the user
-     * has visibility of the provided page template id.
-     */
-    protected function updateChapterDefaultTemplate(Chapter $chapter, int $templateId): void
-    {
-        $changing = $templateId !== intval($chapter->default_template_id);
-        if (!$changing) {
-            return;
-        }
-
-        if ($templateId === 0) {
-            $chapter->default_template_id = null;
-            $chapter->save();
-            return;
-        }
-
-        $templateExists = Page::query()->visible()
-            ->where('template', '=', true)
-            ->where('id', '=', $templateId)
-            ->exists();
-
-        $chapter->default_template_id = $templateExists ? $templateId : null;
-        $chapter->save();
-    }
-
-    /**
-     * Find a page parent entity via an identifier string in the format:
-     * {type}:{id}
-     * Example: (book:5).
-     *
-     * @throws MoveOperationException
-     */
-    public function findParentByIdentifier(string $identifier): ?Book
-    {
-        $stringExploded = explode(':', $identifier);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
+        return (new DatabaseTransaction(function () use ($chapter, $parent) {
+            $chapter->changeBook($parent->id);
+            $chapter->rebuildPermissions();
+            Activity::add(ActivityType::CHAPTER_MOVE, $chapter);

 
 

-        if ($entityType !== 'book') {
-            throw new MoveOperationException('Chapters can only be in books');
-        }
+            $this->baseRepo->sortParent($chapter);

 
 

-        return Book::visible()->where('id', '=', $entityId)->first();
+            return $parent;
+        }))->run();

     }
 }
     }
 }