Finished refactor of entity repos

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index e40d7668a4fedd3fe46d747b3ab10e0830274a6f..6ed9fc30c79c8e6d037d06c1ca727448152ff0b9 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,41 +2,31 @@
 
 use Activity;
 use BookStack\Exceptions\NotFoundException;
 
 use Activity;
 use BookStack\Exceptions\NotFoundException;

+use BookStack\Repos\EntityRepo;

 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;

 use Illuminate\Http\Response;
 use Illuminate\Http\Response;

-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 use Views;
 use GatherContent\Htmldiff\Htmldiff;
 
 class PageController extends Controller
 {
 
 use Views;
 use GatherContent\Htmldiff\Htmldiff;
 
 class PageController extends Controller
 {
 

-    protected $pageRepo;
-    protected $bookRepo;
-    protected $chapterRepo;
+    protected $entityRepo;

     protected $exportService;
     protected $userRepo;
 
     /**
      * PageController constructor.
     protected $exportService;
     protected $userRepo;
 
     /**
      * PageController constructor.

-     * @param PageRepo $pageRepo
-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo
+     * @param EntityRepo $entityRepo

      * @param ExportService $exportService
      * @param UserRepo $userRepo
      */
      * @param ExportService $exportService
      * @param UserRepo $userRepo
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService, UserRepo $userRepo)
+    public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo)

     {
     {

-        $this->pageRepo = $pageRepo;
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
+        $this->entityRepo = $entityRepo;

         $this->exportService = $exportService;
         $this->userRepo = $userRepo;
         parent::__construct();
         $this->exportService = $exportService;
         $this->userRepo = $userRepo;
         parent::__construct();


@@ -51,14 +41,14 @@ class PageController extends Controller
      */
     public function create($bookSlug, $chapterSlug = null)
     {
      */
     public function create($bookSlug, $chapterSlug = null)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : null;
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null;

         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
         if ($this->signedIn) {
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
         if ($this->signedIn) {

-            $draft = $this->pageRepo->getDraftPage($book, $chapter);
+            $draft = $this->entityRepo->getDraftPage($book, $chapter);

             return redirect($draft->getUrl());
         }
 
             return redirect($draft->getUrl());
         }
 


@@ -81,13 +71,13 @@ class PageController extends Controller
             'name' => 'required|string|max:255'
         ]);
 
             'name' => 'required|string|max:255'
         ]);
 

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : null;
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null;

         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 

-        $page = $this->pageRepo->getDraftPage($book, $chapter);
-        $this->pageRepo->publishDraft($page, [
+        $page = $this->entityRepo->getDraftPage($book, $chapter);
+        $this->entityRepo->publishPageDraft($page, [

             'name' => $request->get('name'),
             'html' => ''
         ]);
             'name' => $request->get('name'),
             'html' => ''
         ]);


@@ -102,15 +92,14 @@ class PageController extends Controller
      */
     public function editDraft($bookSlug, $pageId)
     {
      */
     public function editDraft($bookSlug, $pageId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $draft = $this->pageRepo->getById($pageId, true);
-        $this->checkOwnablePermission('page-create', $book);
+        $draft = $this->entityRepo->getById('page', $pageId, true);
+        $this->checkOwnablePermission('page-create', $draft->book);

         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [
             'page' => $draft,
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [
             'page' => $draft,

-            'book' => $book,
+            'book' => $draft->book,

             'isDraft' => true,
             'draftsEnabled' => $draftsEnabled
         ]);
             'isDraft' => true,
             'draftsEnabled' => $draftsEnabled
         ]);


@@ -130,21 +119,21 @@ class PageController extends Controller
         ]);
 
         $input = $request->all();
         ]);
 
         $input = $request->all();

-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->entityRepo->getBySlug('book', $bookSlug);

 
 

-        $draftPage = $this->pageRepo->getById($pageId, true);
+        $draftPage = $this->entityRepo->getById('page', $pageId, true);

 
         $chapterId = intval($draftPage->chapter_id);
 
         $chapterId = intval($draftPage->chapter_id);

-        $parent = $chapterId !== 0 ? $this->chapterRepo->getById($chapterId) : $book;
+        $parent = $chapterId !== 0 ? $this->entityRepo->getById('chapter', $chapterId) : $book;

         $this->checkOwnablePermission('page-create', $parent);
 
         if ($parent->isA('chapter')) {
         $this->checkOwnablePermission('page-create', $parent);
 
         if ($parent->isA('chapter')) {

-            $input['priority'] = $this->chapterRepo->getNewPriority($parent);
+            $input['priority'] = $this->entityRepo->getNewChapterPriority($parent);

         } else {
         } else {

-            $input['priority'] = $this->bookRepo->getNewPriority($parent);
+            $input['priority'] = $this->entityRepo->getNewBookPriority($parent);

         }
 
         }
 

-        $page = $this->pageRepo->publishDraft($draftPage, $input);
+        $page = $this->entityRepo->publishPageDraft($draftPage, $input);

 
         Activity::add($page, 'page_create', $book->id);
         return redirect($page->getUrl());
 
         Activity::add($page, 'page_create', $book->id);
         return redirect($page->getUrl());


@@ -152,32 +141,29 @@ class PageController extends Controller
 
     /**
      * Display the specified page.
 
     /**
      * Display the specified page.

-     * If the page is not found via the slug the
-     * revisions are searched for a match.
+     * If the page is not found via the slug the revisions are searched for a match.

      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response
      */
     public function show($bookSlug, $pageSlug)
     {
      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response
      */
     public function show($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-

         try {
         try {

-            $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+            $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         } catch (NotFoundException $e) {
         } catch (NotFoundException $e) {

-            $page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug);
+            $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug);

             if ($page === null) abort(404);
             return redirect($page->getUrl());
         }
 
         $this->checkOwnablePermission('page-view', $page);
 
             if ($page === null) abort(404);
             return redirect($page->getUrl());
         }
 
         $this->checkOwnablePermission('page-view', $page);
 

-        $sidebarTree = $this->bookRepo->getChildren($book);
-        $pageNav = $this->pageRepo->getPageNav($page);
+        $sidebarTree = $this->entityRepo->getBookChildren($page->book);
+        $pageNav = $this->entityRepo->getPageNav($page);

         
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         
         Views::add($page);
         $this->setPageTitle($page->getShortName());

-        return view('pages/show', ['page' => $page, 'book' => $book,
+        return view('pages/show', ['page' => $page, 'book' => $page->book,

                                    'current' => $page, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]);
     }
 
                                    'current' => $page, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]);
     }
 


@@ -188,7 +174,7 @@ class PageController extends Controller
      */
     public function getPageAjax($pageId)
     {
      */
     public function getPageAjax($pageId)
     {

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->entityRepo->getById('page', $pageId);

         return response()->json($page);
     }
 
         return response()->json($page);
     }
 


@@ -200,26 +186,25 @@ class PageController extends Controller
      */
     public function edit($bookSlug, $pageSlug)
     {
      */
     public function edit($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()]));
         $page->isDraft = false;
 
         // Check for active editing
         $warnings = [];
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()]));
         $page->isDraft = false;
 
         // Check for active editing
         $warnings = [];

-        if ($this->pageRepo->isPageEditingActive($page, 60)) {
-            $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60);
+        if ($this->entityRepo->isPageEditingActive($page, 60)) {
+            $warnings[] = $this->entityRepo->getPageEditingActiveMessage($page, 60);

         }
 
         // Check for a current draft version for this user
         }
 
         // Check for a current draft version for this user

-        if ($this->pageRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
-            $draft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);
+        if ($this->entityRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
+            $draft = $this->entityRepo->getUserPageDraft($page, $this->currentUser->id);

             $page->name = $draft->name;
             $page->html = $draft->html;
             $page->markdown = $draft->markdown;
             $page->isDraft = true;
             $page->name = $draft->name;
             $page->html = $draft->html;
             $page->markdown = $draft->markdown;
             $page->isDraft = true;

-            $warnings [] = $this->pageRepo->getUserPageDraftMessage($draft);
+            $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);

         }
 
         if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings));
         }
 
         if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings));


@@ -227,7 +212,7 @@ class PageController extends Controller
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [
             'page' => $page,
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [
             'page' => $page,

-            'book' => $book,
+            'book' => $page->book,

             'current' => $page,
             'draftsEnabled' => $draftsEnabled
         ]);
             'current' => $page,
             'draftsEnabled' => $draftsEnabled
         ]);


@@ -245,11 +230,10 @@ class PageController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

-        $this->pageRepo->updatePage($page, $book->id, $request->all());
-        Activity::add($page, 'page_update', $book->id);
+        $this->entityRepo->updatePage($page, $page->book->id, $request->all());
+        Activity::add($page, 'page_update', $page->book->id);

         return redirect($page->getUrl());
     }
 
         return redirect($page->getUrl());
     }
 


@@ -261,7 +245,7 @@ class PageController extends Controller
      */
     public function saveDraft(Request $request, $pageId)
     {
      */
     public function saveDraft(Request $request, $pageId)
     {

-        $page = $this->pageRepo->getById($pageId, true);
+        $page = $this->entityRepo->getById('page', $pageId, true);

         $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->signedIn) {
         $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->signedIn) {


@@ -271,11 +255,7 @@ class PageController extends Controller
             ], 500);
         }
 
             ], 500);
         }
 

-        if ($page->draft) {
-            $draft = $this->pageRepo->updateDraftPage($page, $request->only(['name', 'html', 'markdown']));
-        } else {
-            $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown']));
-        }
+        $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));

 
         $updateTime = $draft->updated_at->timestamp;
         $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;
 
         $updateTime = $draft->updated_at->timestamp;
         $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;


@@ -294,7 +274,7 @@ class PageController extends Controller
      */
     public function redirectFromLink($pageId)
     {
      */
     public function redirectFromLink($pageId)
     {

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->entityRepo->getById('page', $pageId);

         return redirect($page->getUrl());
     }
 
         return redirect($page->getUrl());
     }
 


@@ -306,11 +286,10 @@ class PageController extends Controller
      */
     public function showDelete($bookSlug, $pageSlug)
     {
      */
     public function showDelete($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
+        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);

     }
 
 
     }
 
 


@@ -323,11 +302,10 @@ class PageController extends Controller
      */
     public function showDeleteDraft($bookSlug, $pageId)
     {
      */
     public function showDeleteDraft($bookSlug, $pageId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getById($pageId, true);
+        $page = $this->entityRepo->getById('page', $pageId, true);

         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
+        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);

     }
 
     /**
     }
 
     /**


@@ -339,12 +317,12 @@ class PageController extends Controller
      */
     public function destroy($bookSlug, $pageSlug)
     {
      */
     public function destroy($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $book = $page->book;

         $this->checkOwnablePermission('page-delete', $page);
         Activity::addMessage('page_delete', $book->id, $page->name);
         session()->flash('success', trans('entities.pages_delete_success'));
         $this->checkOwnablePermission('page-delete', $page);
         Activity::addMessage('page_delete', $book->id, $page->name);
         session()->flash('success', trans('entities.pages_delete_success'));

-        $this->pageRepo->destroy($page);
+        $this->entityRepo->destroyPage($page);

         return redirect($book->getUrl());
     }
 
         return redirect($book->getUrl());
     }
 


@@ -357,11 +335,11 @@ class PageController extends Controller
      */
     public function destroyDraft($bookSlug, $pageId)
     {
      */
     public function destroyDraft($bookSlug, $pageId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getById($pageId, true);
+        $page = $this->entityRepo->getById('page', $pageId, true);
+        $book = $page->book;

         $this->checkOwnablePermission('page-update', $page);
         session()->flash('success', trans('entities.pages_delete_draft_success'));
         $this->checkOwnablePermission('page-update', $page);
         session()->flash('success', trans('entities.pages_delete_draft_success'));

-        $this->pageRepo->destroy($page);
+        $this->entityRepo->destroyPage($page);

         return redirect($book->getUrl());
     }
 
         return redirect($book->getUrl());
     }
 


@@ -373,10 +351,9 @@ class PageController extends Controller
      */
     public function showRevisions($bookSlug, $pageSlug)
     {
      */
     public function showRevisions($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);
+        return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);

     }
 
     /**
     }
 
     /**


@@ -388,16 +365,15 @@ class PageController extends Controller
      */
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $revision = $this->entityRepo->getById('page_revision', $revisionId, false);

 
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
         
         return view('pages/revision', [
             'page' => $page,
 
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
         
         return view('pages/revision', [
             'page' => $page,

-            'book' => $book,
+            'book' => $page->book,

         ]);
     }
 
         ]);
     }
 


@@ -410,9 +386,8 @@ class PageController extends Controller
      */
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $revision = $this->entityRepo->getById('page_revision', $revisionId);

 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;
 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;


@@ -423,7 +398,7 @@ class PageController extends Controller
 
         return view('pages/revision', [
             'page' => $page,
 
         return view('pages/revision', [
             'page' => $page,

-            'book' => $book,
+            'book' => $page->book,

             'diff' => $diff,
         ]);
     }
             'diff' => $diff,
         ]);
     }


@@ -437,11 +412,10 @@ class PageController extends Controller
      */
     public function restoreRevision($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function restoreRevision($bookSlug, $pageSlug, $revisionId)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

-        $page = $this->pageRepo->restoreRevision($page, $book, $revisionId);
-        Activity::add($page, 'page_restore', $book->id);
+        $page = $this->entityRepo->restorePageRevision($page, $page->book, $revisionId);
+        Activity::add($page, 'page_restore', $page->book->id);

         return redirect($page->getUrl());
     }
 
         return redirect($page->getUrl());
     }
 


@@ -454,8 +428,7 @@ class PageController extends Controller
      */
     public function exportPdf($bookSlug, $pageSlug)
     {
      */
     public function exportPdf($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',
         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -471,8 +444,7 @@ class PageController extends Controller
      */
     public function exportHtml($bookSlug, $pageSlug)
     {
      */
     public function exportHtml($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',
         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -488,8 +460,7 @@ class PageController extends Controller
      */
     public function exportPlainText($bookSlug, $pageSlug)
     {
      */
     public function exportPlainText($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $containedHtml = $this->exportService->pageToPlainText($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',
         $containedHtml = $this->exportService->pageToPlainText($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -503,7 +474,7 @@ class PageController extends Controller
      */
     public function showRecentlyCreated()
     {
      */
     public function showRecentlyCreated()
     {

-        $pages = $this->pageRepo->getRecentlyCreatedPaginated(20)->setPath(baseUrl('/pages/recently-created'));
+        $pages = $this->entityRepo->getRecentlyCreatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-created'));

         return view('pages/detailed-listing', [
             'title' => trans('entities.recently_created_pages'),
             'pages' => $pages
         return view('pages/detailed-listing', [
             'title' => trans('entities.recently_created_pages'),
             'pages' => $pages


@@ -516,7 +487,7 @@ class PageController extends Controller
      */
     public function showRecentlyUpdated()
     {
      */
     public function showRecentlyUpdated()
     {

-        $pages = $this->pageRepo->getRecentlyUpdatedPaginated(20)->setPath(baseUrl('/pages/recently-updated'));
+        $pages = $this->entityRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-updated'));

         return view('pages/detailed-listing', [
             'title' => trans('entities.recently_updated_pages'),
             'pages' => $pages
         return view('pages/detailed-listing', [
             'title' => trans('entities.recently_updated_pages'),
             'pages' => $pages


@@ -531,8 +502,7 @@ class PageController extends Controller
      */
     public function showRestrict($bookSlug, $pageSlug)
     {
      */
     public function showRestrict($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('restrictions-manage', $page);
         $roles = $this->userRepo->getRestrictableRoles();
         return view('pages/restrictions', [
         $this->checkOwnablePermission('restrictions-manage', $page);
         $roles = $this->userRepo->getRestrictableRoles();
         return view('pages/restrictions', [


@@ -550,11 +520,10 @@ class PageController extends Controller
      */
     public function showMove($bookSlug, $pageSlug)
     {
      */
     public function showMove($bookSlug, $pageSlug)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         return view('pages/move', [
         $this->checkOwnablePermission('page-update', $page);
         return view('pages/move', [

-            'book' => $book,
+            'book' => $page->book,

             'page' => $page
         ]);
     }
             'page' => $page
         ]);
     }


@@ -569,8 +538,7 @@ class PageController extends Controller
      */
     public function move($bookSlug, $pageSlug, Request $request)
     {
      */
     public function move($bookSlug, $pageSlug, Request $request)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
 
         $entitySelection = $request->get('entity_selection', null);
         $this->checkOwnablePermission('page-update', $page);
 
         $entitySelection = $request->get('entity_selection', null);


@@ -582,20 +550,15 @@ class PageController extends Controller
         $entityType = $stringExploded[0];
         $entityId = intval($stringExploded[1]);
 
         $entityType = $stringExploded[0];
         $entityId = intval($stringExploded[1]);
 

-        $parent = false;

 
 

-        if ($entityType == 'chapter') {
-            $parent = $this->chapterRepo->getById($entityId);
-        } else if ($entityType == 'book') {
-            $parent = $this->bookRepo->getById($entityId);
-        }
-
-        if ($parent === false || $parent === null) {
+        try {
+            $parent = $this->entityRepo->getById($entityType, $entityId);
+        } catch (\Exception $e) {

             session()->flash(trans('entities.selected_book_chapter_not_found'));
             return redirect()->back();
         }
 
             session()->flash(trans('entities.selected_book_chapter_not_found'));
             return redirect()->back();
         }
 

-        $this->pageRepo->changePageParent($page, $parent);
+        $this->entityRepo->changePageParent($page, $parent);

         Activity::add($page, 'page_move', $page->book->id);
         session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
 
         Activity::add($page, 'page_move', $page->book->id);
         session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
 


@@ -611,10 +574,9 @@ class PageController extends Controller
      */
     public function restrict($bookSlug, $pageSlug, Request $request)
     {
      */
     public function restrict($bookSlug, $pageSlug, Request $request)
     {

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

         $this->checkOwnablePermission('restrictions-manage', $page);
         $this->checkOwnablePermission('restrictions-manage', $page);

-        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $page);

         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }
         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }