Finished refactor of entity repos

Removed entity-specific repos and standardised the majority of repo calls to be applicable to all entity types

Finished refactor of entity repos
Removed entity-specific repos and standardised the majority of repo calls to be applicable to all entity types
Dan Brown
Commit 8453191dfb029ffa7a43e292eeeca1dc6f6c9077 8453191d 1 parent 65796cfc
Showing 16 changed files with 65 additions and 387 deletions
app/Chapter.php
app/Http/Controllers/AttachmentController.php
app/Http/Controllers/BookController.php
app/Http/Controllers/ChapterController.php
app/Http/Controllers/ImageController.php
app/Http/Controllers/PageController.php
app/Repos/BookRepo.php
app/Repos/ChapterRepo.php
app/Repos/EntityRepo.php
app/Repos/PageRepo.php
app/Repos/TagRepo.php
app/Services/PermissionService.php
tests/Entity/EntityTest.php
tests/Entity/PageDraftTest.php
tests/Entity/SortTest.php
tests/ImageTest.php
--- a/app/Chapter.php
View file @8453191
+++ b/app/Chapter.php
View file @8453191
@@ -18,11 +18,12 @@ class Chapter extends Entity
     /**
      * Get the pages that this chapter contains.
+     * @param string $dir
      * @return mixed
      */
-    public function pages()
+    public function pages($dir = 'ASC')
     {
-        return $this->hasMany(Page::class)->orderBy('priority', 'ASC');
+        return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }
     /**
--- a/app/Http/Controllers/AttachmentController.php
View file @8453191
+++ b/app/Http/Controllers/AttachmentController.php
View file @8453191
@@ -3,7 +3,6 @@
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Attachment;
 use BookStack\Repos\EntityRepo;
-use BookStack\Repos\PageRepo;
 use BookStack\Services\AttachmentService;
 use Illuminate\Http\Request;
@@ -11,21 +10,18 @@ class AttachmentController extends Controller
 {
     protected $attachmentService;
     protected $attachment;
-    protected $pageRepo;
     protected $entityRepo;
     /**
      * AttachmentController constructor.
      * @param AttachmentService $attachmentService
      * @param Attachment $attachment
-     * @param PageRepo $pageRepo
+     * @param EntityRepo $entityRepo
      */
-    public function __construct(AttachmentService $attachmentService, Attachment $attachment, EntityRepo $entityRepo, PageRepo $pageRepo)
+    public function __construct(AttachmentService $attachmentService, Attachment $attachment, EntityRepo $entityRepo)
     {
         $this->attachmentService = $attachmentService;
         $this->attachment = $attachment;
-        // TODO - Remove this
-        $this->pageRepo = $pageRepo;
         $this->entityRepo = $entityRepo;
         parent::__construct();
     }
--- a/app/Http/Controllers/BookController.php
View file @8453191
+++ b/app/Http/Controllers/BookController.php
View file @8453191
@@ -4,10 +4,6 @@ use Activity;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 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 Views;
@@ -15,26 +11,16 @@ class BookController extends Controller
 {
     protected $entityRepo;
-    protected $bookRepo;
-    protected $pageRepo;
-    protected $chapterRepo;
     protected $userRepo;
     /**
      * BookController constructor.
      * @param EntityRepo $entityRepo
-     * @param BookRepo $bookRepo
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
      * @param UserRepo $userRepo
      */
-    public function __construct(EntityRepo $entityRepo, BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
+    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo)
     {
         $this->entityRepo = $entityRepo;
-        // TODO - Remove below
-        $this->bookRepo = $bookRepo;
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
         $this->userRepo = $userRepo;
         parent::__construct();
     }
@@ -76,7 +62,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-        $book = $this->bookRepo->createFromInput($request->all());
+        $book = $this->entityRepo->createFromInput('book', $request->all());
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
@@ -90,7 +76,7 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-view', $book);
-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = $this->entityRepo->getBookChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
         return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
@@ -123,7 +109,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
-        $book = $this->bookRepo->updateFromInput($book, $request->all());
+        $book = $this->entityRepo->updateFromInput('book', $book, $request->all());
         Activity::add($book, 'book_update', $book->id);
         return redirect($book->getUrl());
     }
@@ -150,7 +136,7 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-update', $book);
-        $bookChildren = $this->bookRepo->getChildren($book, true);
+        $bookChildren = $this->entityRepo->getBookChildren($book, true);
         $books = $this->entityRepo->getAll('book', false);
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
@@ -165,7 +151,7 @@ class BookController extends Controller
     public function getSortItem($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = $this->entityRepo->getBookChildren($book);
         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
@@ -202,7 +188,7 @@ class BookController extends Controller
             // Update models only if there's a change in parent chain or ordering.
             if ($model->priority !== $priority || $model->book_id !== $bookId || ($isPage && $model->chapter_id !== $chapterId)) {
-                $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
+                $this->entityRepo->changeBook($isPage?'page':'chapter', $bookId, $model);
                 $model->priority = $priority;
                 if ($isPage) $model->chapter_id = $chapterId;
                 $model->save();
@@ -222,7 +208,7 @@ class BookController extends Controller
         }
         // Update permissions on changed models
-        $this->bookRepo->buildJointPermissions($updatedModels);
+        $this->entityRepo->buildJointPermissions($updatedModels);
         return redirect($book->getUrl());
     }
@@ -237,8 +223,7 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
-        Activity::removeEntity($book);
+        $this->entityRepo->destroyBook($book);
-        $this->bookRepo->destroy($book);
         return redirect('/books');
     }
@@ -269,7 +254,7 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
-        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);
         session()->flash('success', trans('entities.books_permissions_updated'));
         return redirect($book->getUrl());
     }
--- a/app/Http/Controllers/ChapterController.php
View file @8453191
+++ b/app/Http/Controllers/ChapterController.php
View file @8453191
@@ -4,32 +4,23 @@ use Activity;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
 use Illuminate\Http\Response;
 use Views;
 class ChapterController extends Controller
 {
-    protected $bookRepo;
-    protected $chapterRepo;
     protected $userRepo;
     protected $entityRepo;
     /**
      * ChapterController constructor.
      * @param EntityRepo $entityRepo
-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo
      * @param UserRepo $userRepo
      */
-    public function __construct(EntityRepo $entityRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
+    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo)
     {
         $this->entityRepo = $entityRepo;
-        // TODO - Remove below
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
         $this->userRepo = $userRepo;
         parent::__construct();
     }
@@ -63,8 +54,8 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-create', $book);
         $input = $request->all();
-        $input['priority'] = $this->bookRepo->getNewPriority($book);
+        $input['priority'] = $this->entityRepo->getNewBookPriority($book);
-        $chapter = $this->chapterRepo->createFromInput($input, $book);
+        $chapter = $this->entityRepo->createFromInput('chapter', $input, $book);
         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
     }
@@ -79,10 +70,10 @@ class ChapterController extends Controller
     {
         $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
-        $sidebarTree = $this->bookRepo->getChildren($chapter->book);
+        $sidebarTree = $this->entityRepo->getBookChildren($chapter->book);
         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());
-        $pages = $this->chapterRepo->getChildren($chapter);
+        $pages = $this->entityRepo->getChapterChildren($chapter);
         return view('chapters/show', [
             'book' => $chapter->book,
             'chapter' => $chapter,
@@ -153,7 +144,7 @@ class ChapterController extends Controller
         $book = $chapter->book;
         $this->checkOwnablePermission('chapter-delete', $chapter);
         Activity::addMessage('chapter_delete', $book->id, $chapter->name);
-        $this->chapterRepo->destroy($chapter);
+        $this->entityRepo->destroyChapter($chapter);
         return redirect($book->getUrl());
     }
@@ -206,7 +197,7 @@ class ChapterController extends Controller
             return redirect()->back();
         }
-        $this->chapterRepo->changeBook($parent->id, $chapter, true);
+        $this->entityRepo->changeBook('chapter', $parent->id, $chapter, true);
         Activity::add($chapter, 'chapter_move', $chapter->book->id);
         session()->flash('success', trans('entities.chapter_move_success', ['bookName' => $parent->name]));
@@ -241,7 +232,7 @@ class ChapterController extends Controller
     {
         $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
-        $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter);
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter);
         session()->flash('success', trans('entities.chapters_permissions_success'));
         return redirect($chapter->getUrl());
     }
--- a/app/Http/Controllers/ImageController.php
View file @8453191
+++ b/app/Http/Controllers/ImageController.php
View file @8453191
 <?php namespace BookStack\Http\Controllers;
 use BookStack\Exceptions\ImageUploadException;
+use BookStack\Repos\EntityRepo;
 use BookStack\Repos\ImageRepo;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
@@ -150,12 +151,12 @@ class ImageController extends Controller
     /**
      * Deletes an image and all thumbnail/image files
-     * @param PageRepo $pageRepo
+     * @param EntityRepo $entityRepo
      * @param Request $request
      * @param int $id
      * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy(PageRepo $pageRepo, Request $request, $id)
+    public function destroy(EntityRepo $entityRepo, Request $request, $id)
     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
@@ -163,7 +164,7 @@ class ImageController extends Controller
         // Check if this image is used on any pages
         $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
         if (!$isForced) {
-            $pageSearch = $pageRepo->searchForImage($image->url);
+            $pageSearch = $entityRepo->searchForImage($image->url);
             if ($pageSearch !== false) {
                 return response()->json($pageSearch, 400);
             }
--- a/app/Http/Controllers/PageController.php
View file @8453191
+++ b/app/Http/Controllers/PageController.php
View file @8453191
@@ -7,9 +7,6 @@ use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
 use Illuminate\Http\Response;
 use Views;
 use GatherContent\Htmldiff\Htmldiff;
@@ -18,28 +15,18 @@ class PageController extends Controller
 {
     protected $entityRepo;
-    protected $pageRepo;
-    protected $bookRepo;
-    protected $chapterRepo;
     protected $exportService;
     protected $userRepo;
     /**
      * PageController constructor.
      * @param EntityRepo $entityRepo
-     * @param PageRepo $pageRepo
-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo
      * @param ExportService $exportService
      * @param UserRepo $userRepo
      */
-    public function __construct(EntityRepo $entityRepo, PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService, UserRepo $userRepo)
+    public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo)
     {
         $this->entityRepo = $entityRepo;
-        // TODO - remove below;
-        $this->pageRepo = $pageRepo;
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
         $this->exportService = $exportService;
         $this->userRepo = $userRepo;
         parent::__construct();
@@ -61,7 +48,7 @@ class PageController extends Controller
         // 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());
         }
@@ -89,8 +76,8 @@ class PageController extends Controller
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
-        $page = $this->pageRepo->getDraftPage($book, $chapter);
+        $page = $this->entityRepo->getDraftPage($book, $chapter);
-        $this->pageRepo->publishDraft($page, [
+        $this->entityRepo->publishPageDraft($page, [
             'name' => $request->get('name'),
             'html' => ''
         ]);
@@ -141,12 +128,12 @@ class PageController extends Controller
         $this->checkOwnablePermission('page-create', $parent);
         if ($parent->isA('chapter')) {
-            $input['priority'] = $this->chapterRepo->getNewPriority($parent);
+            $input['priority'] = $this->entityRepo->getNewChapterPriority($parent);
         } 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());
@@ -164,15 +151,15 @@ class PageController extends Controller
         try {
             $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         } 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);
-        $sidebarTree = $this->bookRepo->getChildren($page->book);
+        $sidebarTree = $this->entityRepo->getBookChildren($page->book);
-        $pageNav = $this->pageRepo->getPageNav($page);
+        $pageNav = $this->entityRepo->getPageNav($page);
         Views::add($page);
         $this->setPageTitle($page->getShortName());
@@ -206,18 +193,18 @@ class PageController extends Controller
         // Check for active editing
         $warnings = [];
-        if ($this->pageRepo->isPageEditingActive($page, 60)) {
+        if ($this->entityRepo->isPageEditingActive($page, 60)) {
-            $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60);
+            $warnings[] = $this->entityRepo->getPageEditingActiveMessage($page, 60);
         }
         // Check for a current draft version for this user
-        if ($this->pageRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
+        if ($this->entityRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
-            $draft = $this->pageRepo->getUserPageDraft($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;
-            $warnings [] = $this->pageRepo->getUserPageDraftMessage($draft);
+            $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);
         }
         if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings));
@@ -245,7 +232,7 @@ class PageController extends Controller
         ]);
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $this->checkOwnablePermission('page-update', $page);
-        $this->pageRepo->updatePage($page, $page->book->id, $request->all());
+        $this->entityRepo->updatePage($page, $page->book->id, $request->all());
         Activity::add($page, 'page_update', $page->book->id);
         return redirect($page->getUrl());
     }
@@ -268,11 +255,7 @@ class PageController extends Controller
             ], 500);
         }
-        if ($page->draft) {
+        $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
-            $draft = $this->pageRepo->updateDraftPage($page, $request->only(['name', 'html', 'markdown']));
-        } else {
-            $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown']));
-        }
         $updateTime = $draft->updated_at->timestamp;
         $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;
@@ -339,7 +322,7 @@ class PageController extends Controller
         $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());
     }
@@ -356,7 +339,7 @@ class PageController extends Controller
         $book = $page->book;
         $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());
     }
@@ -383,7 +366,7 @@ class PageController extends Controller
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $revision = $this->entityRepo->getById('page_revision', $revisionId, false);
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
@@ -404,7 +387,7 @@ class PageController extends Controller
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $revision = $this->entityRepo->getById('page_revision', $revisionId);
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;
@@ -431,7 +414,7 @@ class PageController extends Controller
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $this->checkOwnablePermission('page-update', $page);
-        $page = $this->pageRepo->restoreRevision($page, $page->book, $revisionId);
+        $page = $this->entityRepo->restorePageRevision($page, $page->book, $revisionId);
         Activity::add($page, 'page_restore', $page->book->id);
         return redirect($page->getUrl());
     }
@@ -491,7 +474,7 @@ class PageController extends Controller
      */
     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
@@ -504,7 +487,7 @@ class PageController extends Controller
      */
     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
@@ -575,7 +558,7 @@ class PageController extends Controller
             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]));
@@ -593,7 +576,7 @@ class PageController extends Controller
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $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());
     }
--- a/app/Repos/BookRepo.php deleted 100644 → 0
View file @65796cf
+++ b/app/Repos/BookRepo.php deleted 100644 → 0
View file @65796cf
-<?php namespace BookStack\Repos;
-
-use BookStack\Book;
-
-class BookRepo extends EntityRepo
-{
-    protected $pageRepo;
-    protected $chapterRepo;
-
-    /**
-     * BookRepo constructor.
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
-     */
-    public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo)
-    {
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Get a new book instance from request input.
-     * @param array $input
-     * @return Book
-     */
-    public function createFromInput($input)
-    {
-        $book = $this->book->newInstance($input);
-        $book->slug = $this->findSuitableSlug('book', $book->name);
-        $book->created_by = user()->id;
-        $book->updated_by = user()->id;
-        $book->save();
-        $this->permissionService->buildJointPermissionsForEntity($book);
-        return $book;
-    }
-
-    /**
-     * Update the given book from user input.
-     * @param Book $book
-     * @param $input
-     * @return Book
-     */
-    public function updateFromInput(Book $book, $input)
-    {
-        if ($book->name !== $input['name']) {
-            $book->slug = $this->findSuitableSlug('book', $input['name'], $book->id);
-        }
-        $book->fill($input);
-        $book->updated_by = user()->id;
-        $book->save();
-        $this->permissionService->buildJointPermissionsForEntity($book);
-        return $book;
-    }
-
-    /**
-     * Destroy the given book.
-     * @param Book $book
-     * @throws \Exception
-     */
-    public function destroy(Book $book)
-    {
-        foreach ($book->pages as $page) {
-            $this->pageRepo->destroy($page);
-        }
-        foreach ($book->chapters as $chapter) {
-            $this->chapterRepo->destroy($chapter);
-        }
-        $book->views()->delete();
-        $book->permissions()->delete();
-        $this->permissionService->deleteJointPermissionsForEntity($book);
-        $book->delete();
-    }
-
-    /**
-     * Get the next child element priority.
-     * @param Book $book
-     * @return int
-     */
-    public function getNewPriority($book)
-    {
-        $lastElem = $this->getChildren($book)->pop();
-        return $lastElem ? $lastElem->priority + 1 : 0;
-    }
-
-    /**
-     * Get all child objects of a book.
-     * Returns a sorted collection of Pages and Chapters.
-     * Loads the book slug onto child elements to prevent access database access for getting the slug.
-     * @param Book $book
-     * @param bool $filterDrafts
-     * @return mixed
-     */
-    public function getChildren(Book $book, $filterDrafts = false)
-    {
-        $q = $this->permissionService->bookChildrenQuery($book->id, $filterDrafts);
-        $entities = [];
-        $parents = [];
-        $tree = [];
-
-        foreach ($q as $index => $rawEntity) {
-            if ($rawEntity->entity_type === 'Bookstack\\Page') {
-                $entities[$index] = $this->page->newFromBuilder($rawEntity);
-            } else if ($rawEntity->entity_type === 'Bookstack\\Chapter') {
-                $entities[$index] = $this->chapter->newFromBuilder($rawEntity);
-                $key = $entities[$index]->entity_type . ':' . $entities[$index]->id;
-                $parents[$key] = $entities[$index];
-                $parents[$key]->setAttribute('pages', collect());
-            }
-            if ($entities[$index]->chapter_id === 0) $tree[] = $entities[$index];
-            $entities[$index]->book = $book;
-        }
-
-        foreach ($entities as $entity) {
-            if ($entity->chapter_id === 0) continue;
-            $parentKey = 'Bookstack\\Chapter:' . $entity->chapter_id;
-            $chapter = $parents[$parentKey];
-            $chapter->pages->push($entity);
-        }
-
-        return collect($tree);
-    }
-
-}
\ No newline at end of file
--- a/app/Repos/ChapterRepo.php deleted 100644 → 0
View file @65796cf
+++ b/app/Repos/ChapterRepo.php deleted 100644 → 0
View file @65796cf
-<?php namespace BookStack\Repos;
-
-
-use Activity;
-use BookStack\Book;
-use BookStack\Exceptions\NotFoundException;
-use Illuminate\Support\Str;
-use BookStack\Chapter;
-
-class ChapterRepo extends EntityRepo
-{
-    protected $pageRepo;
-
-    /**
-     * ChapterRepo constructor.
-     * @param $pageRepo
-     */
-    public function __construct(PageRepo $pageRepo)
-    {
-        $this->pageRepo = $pageRepo;
-        parent::__construct();
-    }
-
-    /**
-     * Get the child items for a chapter
-     * @param Chapter $chapter
-     */
-    public function getChildren(Chapter $chapter)
-    {
-        $pages = $this->permissionService->enforcePageRestrictions($chapter->pages())->get();
-        // Sort items with drafts first then by priority.
-        return $pages->sortBy(function ($child, $key) {
-            $score = $child->priority;
-            if ($child->draft) $score -= 100;
-            return $score;
-        });
-    }
-
-    /**
-     * Create a new chapter from request input.
-     * @param $input
-     * @param Book $book
-     * @return Chapter
-     */
-    public function createFromInput($input, Book $book)
-    {
-        $chapter = $this->chapter->newInstance($input);
-        $chapter->slug = $this->findSuitableSlug('chapter', $chapter->name, false, $book->id);
-        $chapter->created_by = user()->id;
-        $chapter->updated_by = user()->id;
-        $chapter = $book->chapters()->save($chapter);
-        $this->permissionService->buildJointPermissionsForEntity($chapter);
-        return $chapter;
-    }
-
-    /**
-     * Destroy a chapter and its relations by providing its slug.
-     * @param Chapter $chapter
-     */
-    public function destroy(Chapter $chapter)
-    {
-        if (count($chapter->pages) > 0) {
-            foreach ($chapter->pages as $page) {
-                $page->chapter_id = 0;
-                $page->save();
-            }
-        }
-        Activity::removeEntity($chapter);
-        $chapter->views()->delete();
-        $chapter->permissions()->delete();
-        $this->permissionService->deleteJointPermissionsForEntity($chapter);
-        $chapter->delete();
-    }
-
-
-    /**
-     * Get a new priority value for a new page to be added
-     * to the given chapter.
-     * @param Chapter $chapter
-     * @return int
-     */
-    public function getNewPriority(Chapter $chapter)
-    {
-        $lastPage = $chapter->pages->last();
-        return $lastPage !== null ? $lastPage->priority + 1 : 0;
-    }
-
-    /**
-     * Changes the book relation of this chapter.
-     * @param $bookId
-     * @param Chapter $chapter
-     * @param bool $rebuildPermissions
-     * @return Chapter
-     */
-    public function changeBook($bookId, Chapter $chapter, $rebuildPermissions = false)
-    {
-        $chapter->book_id = $bookId;
-        // Update related activity
-        foreach ($chapter->activity as $activity) {
-            $activity->book_id = $bookId;
-            $activity->save();
-        }
-        $chapter->slug = $this->findSuitableSlug('chapter', $chapter->name, $chapter->id, $bookId);
-        $chapter->save();
-        // Update all child pages
-        foreach ($chapter->pages as $page) {
-            $this->pageRepo->changeBook($bookId, $page);
-        }
-
-        // Update permissions if applicable
-        if ($rebuildPermissions) {
-            $chapter->load('book');
-            $this->permissionService->buildJointPermissionsForEntity($chapter->book);
-        }
-
-        return $chapter;
-    }
-
-}
\ No newline at end of file
--- a/app/Repos/EntityRepo.php
View file @8453191
+++ b/app/Repos/EntityRepo.php
View file @8453191
--- a/app/Repos/PageRepo.php deleted 100644 → 0
View file @65796cf
+++ b/app/Repos/PageRepo.php deleted 100644 → 0
View file @65796cf
--- a/app/Repos/TagRepo.php
View file @8453191
+++ b/app/Repos/TagRepo.php
View file @8453191
@@ -38,7 +38,7 @@ class TagRepo
     {
         $entityInstance = $this->entity->getEntityInstance($entityType);
         $searchQuery = $entityInstance->where('id', '=', $entityId)->with('tags');
-        $searchQuery = $this->permissionService->enforceEntityRestrictions($searchQuery, $action);
+        $searchQuery = $this->permissionService->enforceEntityRestrictions($entityType, $searchQuery, $action);
         return $searchQuery->first();
     }
--- a/app/Services/PermissionService.php
View file @8453191
+++ b/app/Services/PermissionService.php
View file @8453191
@@ -517,42 +517,6 @@ ORDER BY draft desc, priority asc";
     }
     /**
-     * Add restrictions for a page query
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforcePageRestrictions($query, $action = 'view')
-    {
-        // TODO - remove this
-        return $this->enforceEntityRestrictions('page', $query, $action);
-    }
-
-    /**
-     * Add on permission restrictions to a chapter query.
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforceChapterRestrictions($query, $action = 'view')
-    {
-        // TODO - remove this
-        return $this->enforceEntityRestrictions('chapter', $query, $action);
-    }
-
-    /**
-     * Add restrictions to a book query.
-     * @param $query
-     * @param string $action
-     * @return mixed
-     */
-    public function enforceBookRestrictions($query, $action = 'view')
-    {
-        // TODO - remove this
-        return $this->enforceEntityRestrictions('book', $query, $action);
-    }
-
-    /**
      * Add restrictions for a generic entity
      * @param string $entityType
      * @param Builder|Entity $query
--- a/tests/Entity/EntityTest.php
View file @8453191
+++ b/tests/Entity/EntityTest.php
View file @8453191
@@ -168,7 +168,7 @@ class EntityTest extends TestCase
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($creator);
         app('BookStack\Repos\UserRepo')->destroy($creator);
-        app('BookStack\Repos\PageRepo')->saveRevision($entities['page']);
+        app('BookStack\Repos\EntityRepo')->savePageRevision($entities['page']);
         $this->checkEntitiesViewable($entities);
     }
@@ -181,7 +181,7 @@ class EntityTest extends TestCase
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($updater);
         app('BookStack\Repos\UserRepo')->destroy($updater);
-        app('BookStack\Repos\PageRepo')->saveRevision($entities['page']);
+        app('BookStack\Repos\EntityRepo')->savePageRevision($entities['page']);
         $this->checkEntitiesViewable($entities);
     }
--- a/tests/Entity/PageDraftTest.php
View file @8453191
+++ b/tests/Entity/PageDraftTest.php
View file @8453191
@@ -4,13 +4,13 @@
 class PageDraftTest extends TestCase
 {
     protected $page;
-    protected $pageRepo;
+    protected $entityRepo;
     public function setUp()
     {
         parent::setUp();
         $this->page = \BookStack\Page::first();
-        $this->pageRepo = app('\BookStack\Repos\PageRepo');
+        $this->entityRepo = app('\BookStack\Repos\EntityRepo');
     }
     public function test_draft_content_shows_if_available()
@@ -20,7 +20,7 @@ class PageDraftTest extends TestCase
             ->dontSeeInField('html', $addedContent);
         $newContent = $this->page->html . $addedContent;
-        $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
+        $this->entityRepo->updatePageDraft($this->page, ['html' => $newContent]);
         $this->asAdmin()->visit($this->page->getUrl() . '/edit')
             ->seeInField('html', $newContent);
     }
@@ -33,7 +33,7 @@ class PageDraftTest extends TestCase
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();
-        $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
+        $this->entityRepo->updatePageDraft($this->page, ['html' => $newContent]);
         $this->actingAs($newUser)->visit($this->page->getUrl() . '/edit')
             ->dontSeeInField('html', $newContent);
     }
@@ -41,7 +41,7 @@ class PageDraftTest extends TestCase
     public function test_alert_message_shows_if_editing_draft()
     {
         $this->asAdmin();
-        $this->pageRepo->saveUpdateDraft($this->page, ['html' => 'test content']);
+        $this->entityRepo->updatePageDraft($this->page, ['html' => 'test content']);
         $this->asAdmin()->visit($this->page->getUrl() . '/edit')
             ->see('You are currently editing a draft');
     }
@@ -55,7 +55,7 @@ class PageDraftTest extends TestCase
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();
-        $this->pageRepo->saveUpdateDraft($this->page, ['html' => $newContent]);
+        $this->entityRepo->updatePageDraft($this->page, ['html' => $newContent]);
         $this->actingAs($newUser)
             ->visit($this->page->getUrl() . '/edit')
--- a/tests/Entity/SortTest.php
View file @8453191
+++ b/tests/Entity/SortTest.php
View file @8453191
@@ -13,8 +13,8 @@ class SortTest extends TestCase
     public function test_drafts_do_not_show_up()
     {
         $this->asAdmin();
-        $pageRepo = app('\BookStack\Repos\PageRepo');
+        $entityRepo = app('\BookStack\Repos\EntityRepo');
-        $draft = $pageRepo->getDraftPage($this->book);
+        $draft = $entityRepo->getDraftPage($this->book);
         $this->visit($this->book->getUrl())
             ->see($draft->name)
--- a/tests/ImageTest.php
View file @8453191
+++ b/tests/ImageTest.php
View file @8453191
@@ -90,7 +90,7 @@ class ImageTest extends TestCase
             'type' => 'gallery'
         ]);
-        $this->assertFalse(file_exists(public_path($relPath)), 'Uploaded image has been deleted');
+        $this->assertFalse(file_exists(public_path($relPath)), 'Uploaded image has not been deleted as expected');
     }
 }
\ No newline at end of file