ExportFormatter: Add book description and check for empty book and chapter descriptio...

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

diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 977193d85bbd0229a2d1a1e745dbf5fd01dd4a83..17cbccd4133676bc44aac8aaf844478ba771e5c7 100644 (file)
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -5,11 +5,10 @@ namespace BookStack\Entities\Repos;
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 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 Exception;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use Exception;


@@ -17,26 +16,12 @@ use Exception;
 class ChapterRepo
 {
     public function __construct(
 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.
      */
     /**
      * Create a new chapter in the system.
      */


@@ -46,6 +31,7 @@ class ChapterRepo
         $chapter->book_id = $parentBook->id;
         $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
         $this->baseRepo->create($chapter, $input);
         $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);
 
         return $chapter;
         Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
         return $chapter;


@@ -57,6 +43,11 @@ class ChapterRepo
     public function update(Chapter $chapter, array $input): Chapter
     {
         $this->baseRepo->update($chapter, $input);
     public function update(Chapter $chapter, array $input): Chapter
     {
         $this->baseRepo->update($chapter, $input);

+
+        if (array_key_exists('default_template_id', $input)) {
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id']));
+        }
+

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


@@ -69,10 +60,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();

     }
 
     /**
     }
 
     /**


@@ -85,8 +75,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');
         }
 


@@ -100,24 +90,4 @@ class ChapterRepo
 
         return $parent;
     }
 
         return $parent;
     }

-
-    /**
-     * 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]);
-
-        if ($entityType !== 'book') {
-            throw new MoveOperationException('Chapters can only be in books');
-        }
-
-        return Book::visible()->where('id', '=', $entityId)->first();
-    }

 }
 }