Default chapter templates: Added tests, extracted repo logic

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

diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 9534a406082346307c7658db71c6c65ad73ab65e..50b554d68dc585b4d1f3b42b16c8021936721c8e 100644 (file)
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -6,7 +6,6 @@ use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
@@ -47,7 +46,7 @@ class ChapterRepo
         $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));
+        $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
         return $chapter;
@@ -61,7 +60,7 @@ class ChapterRepo
         $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);
@@ -108,33 +107,6 @@ class ChapterRepo
         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}