Fixed errors that occured when merging & refactored entity repositories

Also deleted the git '.orig' files that got added in last merge.

 <?php namespace BookStack\Repos;
 <?php namespace BookStack\Repos;
 
 
-use Activity;
+use BookStack\Exceptions\NotFoundException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Book;
 use BookStack\Book;
 use Views;
 use Views;
 
 
-class BookRepo
+class BookRepo extends EntityRepo
 {
 {
-
-    protected $book;
     protected $pageRepo;
     protected $pageRepo;
     protected $chapterRepo;
     protected $chapterRepo;
-    protected $restrictionService;
 
 
     /**
     /**
      * BookRepo constructor.
      * BookRepo constructor.
-     * @param Book $book
      * @param PageRepo $pageRepo
      * @param PageRepo $pageRepo
      * @param ChapterRepo $chapterRepo
      * @param ChapterRepo $chapterRepo
-     * @param RestrictionService $restrictionService
      */
      */
-    public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo, RestrictionService $restrictionService)
+    public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo)
     {
     {
-        $this->book = $book;
         $this->pageRepo = $pageRepo;
         $this->pageRepo = $pageRepo;
         $this->chapterRepo = $chapterRepo;
         $this->chapterRepo = $chapterRepo;
-        $this->restrictionService = $restrictionService;
+        parent::__construct();
     }
     }
 
 
     /**
     /**
@@ -90,7 +84,6 @@ class BookRepo
      */
      */
     public function getRecentlyViewed($count = 10, $page = 0)
     public function getRecentlyViewed($count = 10, $page = 0)
     {
     {
-        // TODO restrict
         return Views::getUserRecentlyViewed($count, $page, $this->book);
         return Views::getUserRecentlyViewed($count, $page, $this->book);
     }
     }
 
 
@@ -102,7 +95,6 @@ class BookRepo
      */
      */
     public function getPopular($count = 10, $page = 0)
     public function getPopular($count = 10, $page = 0)
     {
     {
-        // TODO - Restrict
         return Views::getPopular($count, $page, $this->book);
         return Views::getPopular($count, $page, $this->book);
     }
     }
 
 
@@ -241,16 +233,7 @@ class BookRepo
      */
      */
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     {
     {
-        preg_match_all('/"(.*?)"/', $term, $matches);
-        if (count($matches[1]) > 0) {
-            $terms = $matches[1];
-            $term = trim(preg_replace('/"(.*?)"/', '', $term));
-        } else {
-            $terms = [];
-        }
-        if (!empty($term)) {
-            $terms = array_merge($terms, explode(' ', $term));
-        }
+        $terms = $this->prepareSearchTerms($term);
         $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
         $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
             ->paginate($count)->appends($paginationAppends);
             ->paginate($count)->appends($paginationAppends);
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
@@ -262,27 +245,4 @@ class BookRepo
         return $books;
         return $books;
     }
     }
 
 
-    /**
-     * Updates books restrictions from a request
-     * @param $request
-     * @param $book
-     */
-    public function updateRestrictionsFromRequest($request, $book)
-    {
-        // TODO - extract into shared repo
-        $book->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $book->restrictions()->delete();
-        if ($request->has('restrictions')) {
-            foreach ($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $book->restrictions()->create([
-                        'role_id' => $roleId,
-                        'action' => strtolower($action)
-                    ]);
-                }
-            }
-        }
-        $book->save();
-    }
-
 }
 }
\ No newline at end of file

-<?php namespace BookStack\Repos;
-
-use Activity;
-use BookStack\Exceptions\NotFoundException;
-use BookStack\Services\RestrictionService;
-use Illuminate\Support\Str;
-use BookStack\Book;
-use Views;
-
-class BookRepo
-{
-
-    protected $book;
-    protected $pageRepo;
-    protected $chapterRepo;
-    protected $restrictionService;
-
-    /**
-     * BookRepo constructor.
-     * @param Book $book
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
-     * @param RestrictionService $restrictionService
-     */
-    public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo, RestrictionService $restrictionService)
-    {
-        $this->book = $book;
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
-        $this->restrictionService = $restrictionService;
-    }
-
-    /**
-     * Base query for getting books.
-     * Takes into account any restrictions.
-     * @return mixed
-     */
-    private function bookQuery()
-    {
-        return $this->restrictionService->enforceBookRestrictions($this->book, 'view');
-    }
-
-    /**
-     * Get the book that has the given id.
-     * @param $id
-     * @return mixed
-     */
-    public function getById($id)
-    {
-        return $this->bookQuery()->findOrFail($id);
-    }
-
-    /**
-     * Get all books, Limited by count.
-     * @param int $count
-     * @return mixed
-     */
-    public function getAll($count = 10)
-    {
-        $bookQuery = $this->bookQuery()->orderBy('name', 'asc');
-        if (!$count) return $bookQuery->get();
-        return $bookQuery->take($count)->get();
-    }
-
-    /**
-     * Get all books paginated.
-     * @param int $count
-     * @return mixed
-     */
-    public function getAllPaginated($count = 10)
-    {
-        return $this->bookQuery()
-            ->orderBy('name', 'asc')->paginate($count);
-    }
-
-
-    /**
-     * Get the latest books.
-     * @param int $count
-     * @return mixed
-     */
-    public function getLatest($count = 10)
-    {
-        return $this->bookQuery()->orderBy('created_at', 'desc')->take($count)->get();
-    }
-
-    /**
-     * Gets the most recently viewed for a user.
-     * @param int $count
-     * @param int $page
-     * @return mixed
-     */
-    public function getRecentlyViewed($count = 10, $page = 0)
-    {
-        // TODO restrict
-        return Views::getUserRecentlyViewed($count, $page, $this->book);
-    }
-
-    /**
-     * Gets the most viewed books.
-     * @param int $count
-     * @param int $page
-     * @return mixed
-     */
-    public function getPopular($count = 10, $page = 0)
-    {
-        // TODO - Restrict
-        return Views::getPopular($count, $page, $this->book);
-    }
-
-    /**
-     * Get a book by slug
-     * @param $slug
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function getBySlug($slug)
-    {
-        $book = $this->bookQuery()->where('slug', '=', $slug)->first();
-        if ($book === null) throw new NotFoundException('Book not found');
-        return $book;
-    }
-
-    /**
-     * Checks if a book exists.
-     * @param $id
-     * @return bool
-     */
-    public function exists($id)
-    {
-        return $this->bookQuery()->where('id', '=', $id)->exists();
-    }
-
-    /**
-     * Get a new book instance from request input.
-     * @param $input
-     * @return Book
-     */
-    public function newFromInput($input)
-    {
-        return $this->book->newInstance($input);
-    }
-
-    /**
-     * Destroy a book identified by the given slug.
-     * @param $bookSlug
-     */
-    public function destroyBySlug($bookSlug)
-    {
-        $book = $this->getBySlug($bookSlug);
-        foreach ($book->pages as $page) {
-            $this->pageRepo->destroy($page);
-        }
-        foreach ($book->chapters as $chapter) {
-            $this->chapterRepo->destroy($chapter);
-        }
-        $book->views()->delete();
-        $book->restrictions()->delete();
-        $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;
-    }
-
-    /**
-     * @param string $slug
-     * @param bool|false $currentId
-     * @return bool
-     */
-    public function doesSlugExist($slug, $currentId = false)
-    {
-        $query = $this->book->where('slug', '=', $slug);
-        if ($currentId) {
-            $query = $query->where('id', '!=', $currentId);
-        }
-        return $query->count() > 0;
-    }
-
-    /**
-     * Provides a suitable slug for the given book name.
-     * Ensures the returned slug is unique in the system.
-     * @param string $name
-     * @param bool|false $currentId
-     * @return string
-     */
-    public function findSuitableSlug($name, $currentId = false)
-    {
-        $originalSlug = Str::slug($name);
-        $slug = $originalSlug;
-        $count = 2;
-        while ($this->doesSlugExist($slug, $currentId)) {
-            $slug = $originalSlug . '-' . $count;
-            $count++;
-        }
-        return $slug;
-    }
-
-    /**
-     * Get all child objects of a book.
-     * Returns a sorted collection of Pages and Chapters.
-     * Loads the bookslug onto child elements to prevent access database access for getting the slug.
-     * @param Book $book
-     * @return mixed
-     */
-    public function getChildren(Book $book)
-    {
-        $pageQuery = $book->pages()->where('chapter_id', '=', 0);
-        $pageQuery = $this->restrictionService->enforcePageRestrictions($pageQuery, 'view');
-        $pages = $pageQuery->get();
-
-        $chapterQuery = $book->chapters()->with(['pages' => function($query) {
-            $this->restrictionService->enforcePageRestrictions($query, 'view');
-        }]);
-        $chapterQuery = $this->restrictionService->enforceChapterRestrictions($chapterQuery, 'view');
-        $chapters = $chapterQuery->get();
-        $children = $pages->merge($chapters);
-        $bookSlug = $book->slug;
-        $children->each(function ($child) use ($bookSlug) {
-            $child->setAttribute('bookSlug', $bookSlug);
-            if ($child->isA('chapter')) {
-                $child->pages->each(function ($page) use ($bookSlug) {
-                    $page->setAttribute('bookSlug', $bookSlug);
-                });
-            }
-        });
-        return $children->sortBy('priority');
-    }
-
-    /**
-     * Get books by search term.
-     * @param $term
-     * @param int $count
-     * @param array $paginationAppends
-     * @return mixed
-     */
-    public function getBySearch($term, $count = 20, $paginationAppends = [])
-    {
-<<<<<<< HEAD
-        preg_match_all('/"(.*?)"/', $term, $matches);
-        if (count($matches[1]) > 0) {
-            $terms = $matches[1];
-            $term = trim(preg_replace('/"(.*?)"/', '', $term));
-        } else {
-            $terms = [];
-        }
-        if (!empty($term)) {
-            $terms = array_merge($terms, explode(' ', $term));
-        }
-        $books = $this->book->fullTextSearchQuery(['name', 'description'], $terms)
-=======
-        $terms = explode(' ', $term);
-        $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
->>>>>>> custom_role_system
-            ->paginate($count)->appends($paginationAppends);
-        $words = join('|', explode(' ', preg_quote(trim($term), '/')));
-        foreach ($books as $book) {
-            //highlight
-            $result = preg_replace('#' . $words . '#iu', "<span class=\"highlight\">\$0</span>", $book->getExcerpt(100));
-            $book->searchSnippet = $result;
-        }
-        return $books;
-    }
-
-    /**
-     * Updates books restrictions from a request
-     * @param $request
-     * @param $book
-     */
-    public function updateRestrictionsFromRequest($request, $book)
-    {
-        // TODO - extract into shared repo
-        $book->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $book->restrictions()->delete();
-        if ($request->has('restrictions')) {
-            foreach ($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $book->restrictions()->create([
-                        'role_id' => $roleId,
-                        'action' => strtolower($action)
-                    ]);
-                }
-            }
-        }
-        $book->save();
-    }
-
-}
\ No newline at end of file

@@ -3,27 +3,11 @@
 
 
 use Activity;
 use Activity;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Services\RestrictionService;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Chapter;
 use BookStack\Chapter;
 
 
-class ChapterRepo
+class ChapterRepo extends EntityRepo
 {
 {
-
-    protected $chapter;
-    protected $restrictionService;
-
-    /**
-     * ChapterRepo constructor.
-     * @param Chapter $chapter
-     * @param RestrictionService $restrictionService
-     */
-    public function __construct(Chapter $chapter, RestrictionService $restrictionService)
-    {
-        $this->chapter = $chapter;
-        $this->restrictionService = $restrictionService;
-    }
-
     /**
     /**
      * Base query for getting chapters, Takes restrictions into account.
      * Base query for getting chapters, Takes restrictions into account.
      * @return mixed
      * @return mixed
@@ -148,7 +132,7 @@ class ChapterRepo
 
 
     /**
     /**
      * Get chapters by the given search term.
      * Get chapters by the given search term.
-     * @param       $term
+     * @param string $term
      * @param array $whereTerms
      * @param array $whereTerms
      * @param int $count
      * @param int $count
      * @param array $paginationAppends
      * @param array $paginationAppends
@@ -156,16 +140,7 @@ class ChapterRepo
      */
      */
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
     {
-        preg_match_all('/"(.*?)"/', $term, $matches);
-        if (count($matches[1]) > 0) {
-            $terms = $matches[1];
-            $term = trim(preg_replace('/"(.*?)"/', '', $term));
-        } else {
-            $terms = [];
-        }
-        if (!empty($term)) {
-            $terms = array_merge($terms, explode(' ', $term));
-        }
+        $terms = $this->prepareSearchTerms($term);
         $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
         $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
             ->paginate($count)->appends($paginationAppends);
             ->paginate($count)->appends($paginationAppends);
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
@@ -195,27 +170,4 @@ class ChapterRepo
         return $chapter;
         return $chapter;
     }
     }
 
 
-    /**
-     * Updates pages restrictions from a request
-     * @param $request
-     * @param $chapter
-     */
-    public function updateRestrictionsFromRequest($request, $chapter)
-    {
-        // TODO - extract into shared repo
-        $chapter->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $chapter->restrictions()->delete();
-        if ($request->has('restrictions')) {
-            foreach($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $chapter->restrictions()->create([
-                        'role_id' => $roleId,
-                        'action'  => strtolower($action)
-                    ]);
-                }
-            }
-        }
-        $chapter->save();
-    }
-
 }
 }
\ No newline at end of file

-<?php namespace BookStack\Repos;
-
-
-use Activity;
-use BookStack\Exceptions\NotFoundException;
-use BookStack\Services\RestrictionService;
-use Illuminate\Support\Str;
-use BookStack\Chapter;
-
-class ChapterRepo
-{
-
-    protected $chapter;
-    protected $restrictionService;
-
-    /**
-     * ChapterRepo constructor.
-     * @param Chapter $chapter
-     * @param RestrictionService $restrictionService
-     */
-    public function __construct(Chapter $chapter, RestrictionService $restrictionService)
-    {
-        $this->chapter = $chapter;
-        $this->restrictionService = $restrictionService;
-    }
-
-    /**
-     * Base query for getting chapters, Takes restrictions into account.
-     * @return mixed
-     */
-    private function chapterQuery()
-    {
-        return $this->restrictionService->enforceChapterRestrictions($this->chapter, 'view');
-    }
-
-    /**
-     * Check if an id exists.
-     * @param $id
-     * @return bool
-     */
-    public function idExists($id)
-    {
-        return $this->chapterQuery()->where('id', '=', $id)->count() > 0;
-    }
-
-    /**
-     * Get a chapter by a specific id.
-     * @param $id
-     * @return mixed
-     */
-    public function getById($id)
-    {
-        return $this->chapterQuery()->findOrFail($id);
-    }
-
-    /**
-     * Get all chapters.
-     * @return \Illuminate\Database\Eloquent\Collection|static[]
-     */
-    public function getAll()
-    {
-        return $this->chapterQuery()->all();
-    }
-
-    /**
-     * Get a chapter that has the given slug within the given book.
-     * @param $slug
-     * @param $bookId
-     * @return mixed
-     * @throws NotFoundException
-     */
-    public function getBySlug($slug, $bookId)
-    {
-        $chapter = $this->chapterQuery()->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
-        if ($chapter === null) throw new NotFoundException('Chapter not found');
-        return $chapter;
-    }
-
-    /**
-     * Get the child items for a chapter
-     * @param Chapter $chapter
-     */
-    public function getChildren(Chapter $chapter)
-    {
-        return $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
-    }
-
-    /**
-     * Create a new chapter from request input.
-     * @param $input
-     * @return $this
-     */
-    public function newFromInput($input)
-    {
-        return $this->chapter->fill($input);
-    }
-
-    /**
-     * 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->restrictions()->delete();
-        $chapter->delete();
-    }
-
-    /**
-     * Check if a chapter's slug exists.
-     * @param            $slug
-     * @param            $bookId
-     * @param bool|false $currentId
-     * @return bool
-     */
-    public function doesSlugExist($slug, $bookId, $currentId = false)
-    {
-        $query = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId);
-        if ($currentId) {
-            $query = $query->where('id', '!=', $currentId);
-        }
-        return $query->count() > 0;
-    }
-
-    /**
-     * Finds a suitable slug for the provided name.
-     * Checks database to prevent duplicate slugs.
-     * @param            $name
-     * @param            $bookId
-     * @param bool|false $currentId
-     * @return string
-     */
-    public function findSuitableSlug($name, $bookId, $currentId = false)
-    {
-        $slug = Str::slug($name);
-        while ($this->doesSlugExist($slug, $bookId, $currentId)) {
-            $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
-        }
-        return $slug;
-    }
-
-    /**
-     * Get chapters by the given search term.
-     * @param       $term
-     * @param array $whereTerms
-     * @param int $count
-     * @param array $paginationAppends
-     * @return mixed
-     */
-    public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
-    {
-<<<<<<< HEAD
-        preg_match_all('/"(.*?)"/', $term, $matches);
-        if (count($matches[1]) > 0) {
-            $terms = $matches[1];
-            $term = trim(preg_replace('/"(.*?)"/', '', $term));
-        } else {
-            $terms = [];
-        }
-        if (!empty($term)) {
-            $terms = array_merge($terms, explode(' ', $term));
-        }
-        $chapters = $this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms)
-=======
-        $terms = explode(' ', $term);
-        $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
->>>>>>> custom_role_system
-            ->paginate($count)->appends($paginationAppends);
-        $words = join('|', explode(' ', preg_quote(trim($term), '/')));
-        foreach ($chapters as $chapter) {
-            //highlight
-            $result = preg_replace('#' . $words . '#iu', "<span class=\"highlight\">\$0</span>", $chapter->getExcerpt(100));
-            $chapter->searchSnippet = $result;
-        }
-        return $chapters;
-    }
-
-    /**
-     * Changes the book relation of this chapter.
-     * @param         $bookId
-     * @param Chapter $chapter
-     * @return Chapter
-     */
-    public function changeBook($bookId, Chapter $chapter)
-    {
-        $chapter->book_id = $bookId;
-        foreach ($chapter->activity as $activity) {
-            $activity->book_id = $bookId;
-            $activity->save();
-        }
-        $chapter->slug = $this->findSuitableSlug($chapter->name, $bookId, $chapter->id);
-        $chapter->save();
-        return $chapter;
-    }
-
-    /**
-     * Updates pages restrictions from a request
-     * @param $request
-     * @param $chapter
-     */
-    public function updateRestrictionsFromRequest($request, $chapter)
-    {
-        // TODO - extract into shared repo
-        $chapter->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $chapter->restrictions()->delete();
-        if ($request->has('restrictions')) {
-            foreach($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $chapter->restrictions()->create([
-                        'role_id' => $roleId,
-                        'action'  => strtolower($action)
-                    ]);
-                }
-            }
-        }
-        $chapter->save();
-    }
-
-}
\ No newline at end of file

 <?php namespace BookStack\Repos;
 <?php namespace BookStack\Repos;
 
 
-
 use BookStack\Book;
 use BookStack\Book;
 use BookStack\Chapter;
 use BookStack\Chapter;
+use BookStack\Entity;
 use BookStack\Page;
 use BookStack\Page;
 use BookStack\Services\RestrictionService;
 use BookStack\Services\RestrictionService;
 
 
 class EntityRepo
 class EntityRepo
 {
 {
 
 
+    /**
+     * @var Book $book
+     */
     public $book;
     public $book;
+
+    /**
+     * @var Chapter
+     */
     public $chapter;
     public $chapter;
+
+    /**
+     * @var Page
+     */
     public $page;
     public $page;
-    private $restrictionService;
+
+    /**
+     * @var RestrictionService
+     */
+    protected $restrictionService;
 
 
     /**
     /**
      * EntityService constructor.
      * EntityService constructor.
-     * @param Book $book
-     * @param Chapter $chapter
-     * @param Page $page
-     * @param RestrictionService $restrictionService
      */
      */
-    public function __construct(Book $book, Chapter $chapter, Page $page, RestrictionService $restrictionService)
+    public function __construct()
     {
     {
-        $this->book = $book;
-        $this->chapter = $chapter;
-        $this->page = $page;
-        $this->restrictionService = $restrictionService;
+        $this->book = app(Book::class);
+        $this->chapter = app(Chapter::class);
+        $this->page = app(Page::class);
+        $this->restrictionService = app(RestrictionService::class);
     }
     }
 
 
     /**
     /**
@@ -37,7 +48,7 @@ class EntityRepo
     public function getRecentlyCreatedBooks($count = 20, $page = 0)
     public function getRecentlyCreatedBooks($count = 20, $page = 0)
     {
     {
         return $this->restrictionService->enforceBookRestrictions($this->book)
         return $this->restrictionService->enforceBookRestrictions($this->book)
-            ->orderBy('created_at', 'desc')->skip($page*$count)->take($count)->get();
+            ->orderBy('created_at', 'desc')->skip($page * $count)->take($count)->get();
     }
     }
 
 
     /**
     /**
@@ -49,7 +60,7 @@ class EntityRepo
     public function getRecentlyUpdatedBooks($count = 20, $page = 0)
     public function getRecentlyUpdatedBooks($count = 20, $page = 0)
     {
     {
         return $this->restrictionService->enforceBookRestrictions($this->book)
         return $this->restrictionService->enforceBookRestrictions($this->book)
-            ->orderBy('updated_at', 'desc')->skip($page*$count)->take($count)->get();
+            ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
     }
     }
 
 
     /**
     /**
@@ -60,7 +71,7 @@ class EntityRepo
     public function getRecentlyCreatedPages($count = 20, $page = 0)
     public function getRecentlyCreatedPages($count = 20, $page = 0)
     {
     {
         return $this->restrictionService->enforcePageRestrictions($this->page)
         return $this->restrictionService->enforcePageRestrictions($this->page)
-            ->orderBy('created_at', 'desc')->skip($page*$count)->take($count)->get();
+            ->orderBy('created_at', 'desc')->skip($page * $count)->take($count)->get();
     }
     }
 
 
     /**
     /**
@@ -72,7 +83,49 @@ class EntityRepo
     public function getRecentlyUpdatedPages($count = 20, $page = 0)
     public function getRecentlyUpdatedPages($count = 20, $page = 0)
     {
     {
         return $this->restrictionService->enforcePageRestrictions($this->page)
         return $this->restrictionService->enforcePageRestrictions($this->page)
-            ->orderBy('updated_at', 'desc')->skip($page*$count)->take($count)->get();
+            ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
+    }
+
+    /**
+     * Updates entity restrictions from a request
+     * @param $request
+     * @param Entity $entity
+     */
+    public function updateRestrictionsFromRequest($request, Entity $entity)
+    {
+        $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
+        $entity->restrictions()->delete();
+        if ($request->has('restrictions')) {
+            foreach ($request->get('restrictions') as $roleId => $restrictions) {
+                foreach ($restrictions as $action => $value) {
+                    $entity->restrictions()->create([
+                        'role_id' => $roleId,
+                        'action' => strtolower($action)
+                    ]);
+                }
+            }
+        }
+        $entity->save();
+    }
+
+    /**
+     * Prepare a string of search terms by turning
+     * it into an array of terms.
+     * Keeps quoted terms together.
+     * @param $termString
+     * @return array
+     */
+    protected function prepareSearchTerms($termString)
+    {
+        preg_match_all('/"(.*?)"/', $termString, $matches);
+        if (count($matches[1]) > 0) {
+            $terms = $matches[1];
+            $termString = trim(preg_replace('/"(.*?)"/', '', $termString));
+        } else {
+            $terms = [];
+        }
+        if (!empty($termString)) $terms = array_merge($terms, explode(' ', $termString));
+        return $terms;
     }
     }
 
 
 
 

@@ -3,34 +3,23 @@
 
 
 use Activity;
 use Activity;
 use BookStack\Book;
 use BookStack\Book;
-use BookStack\Chapter;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Services\RestrictionService;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 use BookStack\Page;
 use BookStack\Page;
 use BookStack\PageRevision;
 use BookStack\PageRevision;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 
-class PageRepo
+class PageRepo extends EntityRepo
 {
 {
-    protected $page;
     protected $pageRevision;
     protected $pageRevision;
-    protected $restrictionService;
 
 
     /**
     /**
      * PageRepo constructor.
      * PageRepo constructor.
-     * @param Page $page
      * @param PageRevision $pageRevision
      * @param PageRevision $pageRevision
-     * @param RestrictionService $restrictionService
      */
      */
-    public function __construct(Page $page, PageRevision $pageRevision, RestrictionService $restrictionService)
+    public function __construct(PageRevision $pageRevision)
     {
     {
-        $this->page = $page;
         $this->pageRevision = $pageRevision;
         $this->pageRevision = $pageRevision;
-        $this->restrictionService = $restrictionService;
+        parent::__construct();
     }
     }
 
 
     /**
     /**
@@ -200,16 +189,7 @@ class PageRepo
      */
      */
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
     {
-        preg_match_all('/"(.*?)"/', $term, $matches);
-        if (count($matches[1]) > 0) {
-            $terms = $matches[1];
-            $term = trim(preg_replace('/"(.*?)"/', '', $term));
-        } else {
-            $terms = [];
-        }
-        if (!empty($term)) {
-            $terms = array_merge($terms, explode(' ', $term));
-        }
+        $terms = $this->prepareSearchTerms($term);
         $pages = $this->restrictionService->enforcePageRestrictions($this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms))
         $pages = $this->restrictionService->enforcePageRestrictions($this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms))
             ->paginate($count)->appends($paginationAppends);
             ->paginate($count)->appends($paginationAppends);
 
 
@@ -416,27 +396,4 @@ class PageRepo
         return $this->pageQuery()->orderBy('updated_at', 'desc')->paginate($count);
         return $this->pageQuery()->orderBy('updated_at', 'desc')->paginate($count);
     }
     }
 
 
-    /**
-     * Updates pages restrictions from a request
-     * @param $request
-     * @param $page
-     */
-    public function updateRestrictionsFromRequest($request, $page)
-    {
-        // TODO - extract into shared repo
-        $page->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
-        $page->restrictions()->delete();
-        if ($request->has('restrictions')) {
-            foreach($request->get('restrictions') as $roleId => $restrictions) {
-                foreach ($restrictions as $action => $value) {
-                    $page->restrictions()->create([
-                        'role_id' => $roleId,
-                        'action'  => strtolower($action)
-                    ]);
-                }
-            }
-        }
-        $page->save();
-    }
-
 }
 }

 <?php namespace BookStack\Services;
 <?php namespace BookStack\Services;
 
 
-use Illuminate\Support\Facades\Auth;
 use BookStack\Activity;
 use BookStack\Activity;
 use BookStack\Entity;
 use BookStack\Entity;
 use Session;
 use Session;