Page Attachments - Improved UI, Now initially complete

[bookstack] / app / Repos / BookRepo.php

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index 572030d43701ff2569a69734742d16f75a388ad0..1af02035dd1797c75797bef710e1cf76307a104e 100644 (file)
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -1,32 +1,27 @@
 <?php namespace BookStack\Repos;
 
 <?php namespace BookStack\Repos;
 

-use Activity;
-use BookStack\Services\RestrictionService;
+use Alpha\B;
+use BookStack\Exceptions\NotFoundException;
+use Illuminate\Database\Eloquent\Collection;

 use Illuminate\Support\Str;
 use BookStack\Book;
 use Views;
 
 use Illuminate\Support\Str;
 use BookStack\Book;
 use Views;
 

-class BookRepo
+class BookRepo extends EntityRepo

 {
 {

-
-    protected $book;

     protected $pageRepo;
     protected $chapterRepo;
     protected $pageRepo;
     protected $chapterRepo;

-    protected $restrictionService;

 
     /**
      * BookRepo constructor.
 
     /**
      * BookRepo constructor.

-     * @param Book $book

      * @param PageRepo $pageRepo
      * @param ChapterRepo $chapterRepo
      * @param PageRepo $pageRepo
      * @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->chapterRepo = $chapterRepo;
         $this->pageRepo = $pageRepo;
         $this->chapterRepo = $chapterRepo;

-        $this->restrictionService = $restrictionService;
+        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -36,7 +31,7 @@ class BookRepo
      */
     private function bookQuery()
     {
      */
     private function bookQuery()
     {

-        return $this->restrictionService->enforceBookRestrictions($this->book, 'view');
+        return $this->permissionService->enforceBookRestrictions($this->book, 'view');

     }
 
     /**
     }
 
     /**


@@ -91,7 +86,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);
     }
 


@@ -103,7 +97,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);
     }
 


@@ -111,11 +104,12 @@ class BookRepo
      * Get a book by slug
      * @param $slug
      * @return mixed
      * Get a book by slug
      * @param $slug
      * @return mixed

+     * @throws NotFoundException

      */
     public function getBySlug($slug)
     {
         $book = $this->bookQuery()->where('slug', '=', $slug)->first();
      */
     public function getBySlug($slug)
     {
         $book = $this->bookQuery()->where('slug', '=', $slug)->first();

-        if ($book === null) abort(404);
+        if ($book === null) throw new NotFoundException('Book not found');

         return $book;
     }
 
         return $book;
     }
 


@@ -131,21 +125,43 @@ class BookRepo
 
     /**
      * Get a new book instance from request input.
 
     /**
      * 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->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
      */
      * @param $input
      * @return Book
      */

-    public function newFromInput($input)
+    public function updateFromInput(Book $book, $input)

     {
     {

-        return $this->bookQuery()->fill($input);
+        $book->fill($input);
+        $book->slug = $this->findSuitableSlug($book->name, $book->id);
+        $book->updated_by = user()->id;
+        $book->save();
+        $this->permissionService->buildJointPermissionsForEntity($book);
+        return $book;

     }
 
     /**
     }
 
     /**

-     * Destroy a book identified by the given slug.
-     * @param $bookSlug
+     * Destroy the given book.
+     * @param Book $book
+     * @throws \Exception

      */
      */

-    public function destroyBySlug($bookSlug)
+    public function destroy(Book $book)

     {
     {

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

         foreach ($book->pages as $page) {
             $this->pageRepo->destroy($page);
         }
         foreach ($book->pages as $page) {
             $this->pageRepo->destroy($page);
         }


@@ -153,6 +169,8 @@ class BookRepo
             $this->chapterRepo->destroy($chapter);
         }
         $book->views()->delete();
             $this->chapterRepo->destroy($chapter);
         }
         $book->views()->delete();

+        $book->permissions()->delete();
+        $this->permissionService->deleteJointPermissionsForEntity($book);

         $book->delete();
     }
 
         $book->delete();
     }
 


@@ -190,12 +208,10 @@ class BookRepo
      */
     public function findSuitableSlug($name, $currentId = false)
     {
      */
     public function findSuitableSlug($name, $currentId = false)
     {

-        $originalSlug = Str::slug($name);
-        $slug = $originalSlug;
-        $count = 2;
+        $slug = Str::slug($name);
+        if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5);

         while ($this->doesSlugExist($slug, $currentId)) {
         while ($this->doesSlugExist($slug, $currentId)) {

-            $slug = $originalSlug . '-' . $count;
-            $count++;
+            $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);

         }
         return $slug;
     }
         }
         return $slug;
     }


@@ -203,30 +219,54 @@ class BookRepo
     /**
      * Get all child objects of a book.
      * Returns a sorted collection of Pages and Chapters.
     /**
      * 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.
+     * Loads the book slug onto child elements to prevent access database access for getting the slug.

      * @param Book $book
      * @param Book $book

+     * @param bool $filterDrafts

      * @return mixed
      */
      * @return mixed
      */

-    public function getChildren(Book $book)
+    public function getChildren(Book $book, $filterDrafts = false)

     {
         $pageQuery = $book->pages()->where('chapter_id', '=', 0);
     {
         $pageQuery = $book->pages()->where('chapter_id', '=', 0);

-        $this->restrictionService->enforcePageRestrictions($pageQuery, 'view');
+        $pageQuery = $this->permissionService->enforcePageRestrictions($pageQuery, 'view');
+
+        if ($filterDrafts) {
+            $pageQuery = $pageQuery->where('draft', '=', false);
+        }
+

         $pages = $pageQuery->get();
 
         $pages = $pageQuery->get();
 

-        $chapterQuery = $book->chapters()->with('pages');
-        $this->restrictionService->enforceChapterRestrictions($chapterQuery, 'view');
+        $chapterQuery = $book->chapters()->with(['pages' => function ($query) use ($filterDrafts) {
+            $this->permissionService->enforcePageRestrictions($query, 'view');
+            if ($filterDrafts) $query->where('draft', '=', false);
+        }]);
+        $chapterQuery = $this->permissionService->enforceChapterRestrictions($chapterQuery, 'view');

         $chapters = $chapterQuery->get();
         $chapters = $chapterQuery->get();

-        $children = $pages->merge($chapters);
+        $children = $pages->values();
+        foreach ($chapters as $chapter) {
+            $children->push($chapter);
+        }

         $bookSlug = $book->slug;
         $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);
                 });
         $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);
                 });

+                $child->pages = $child->pages->sortBy(function ($child, $key) {
+                    $score = $child->priority;
+                    if ($child->draft) $score -= 100;
+                    return $score;
+                });

             }
         });
             }
         });

-        return $children->sortBy('priority');
+
+        // Sort items with drafts first then by priority.
+        return $children->sortBy(function ($child, $key) {
+            $score = $child->priority;
+            if ($child->isA('page') && $child->draft) $score -= 100;
+            return $score;
+        });

     }
 
     /**
     }
 
     /**


@@ -238,9 +278,10 @@ class BookRepo
      */
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     {
      */
     public function getBySearch($term, $count = 20, $paginationAppends = [])
     {

-        $terms = explode(' ', $term);
-        $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
-            ->paginate($count)->appends($paginationAppends);
+        $terms = $this->prepareSearchTerms($term);
+        $bookQuery = $this->permissionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms));
+        $bookQuery = $this->addAdvancedSearchQueries($bookQuery, $term);
+        $books = $bookQuery->paginate($count)->appends($paginationAppends);

         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($books as $book) {
             //highlight
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($books as $book) {
             //highlight


@@ -250,27 +291,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
 }
\ No newline at end of file