Finished refactor of entity repos

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 5b2b510c9ce279ba80728c8584b0ffbf97a6907a..57ac486d5e71122b49b057b9fc7dc25dd36ef3ed 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,66 +1,51 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 
 use Activity;

+use BookStack\Repos\EntityRepo;

 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;

-
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Str;
-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
+use Illuminate\Http\Response;

 use Views;
 
 class BookController extends Controller
 {
 
 use Views;
 
 class BookController extends Controller
 {
 

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

     protected $userRepo;
 
     /**
      * BookController constructor.
     protected $userRepo;
 
     /**
      * BookController constructor.

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

      * @param UserRepo $userRepo
      */
      * @param UserRepo $userRepo
      */

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

     {
     {

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

         $this->userRepo = $userRepo;
         parent::__construct();
     }
 
     /**
      * Display a listing of the book.
         $this->userRepo = $userRepo;
         parent::__construct();
     }
 
     /**
      * Display a listing of the book.

-     *

      * @return Response
      */
     public function index()
     {
      * @return Response
      */
     public function index()
     {

-        $books = $this->bookRepo->getAllPaginated(10);
-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
-        $popular = $this->bookRepo->getPopular(4, 0);
+        $books = $this->entityRepo->getAllPaginated('book', 10);
+        $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
+        $popular = $this->entityRepo->getPopular('book', 4, 0);

         $this->setPageTitle('Books');
         return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
     }
 
     /**
      * Show the form for creating a new book.
         $this->setPageTitle('Books');
         return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
     }
 
     /**
      * Show the form for creating a new book.

-     *

      * @return Response
      */
     public function create()
     {
         $this->checkPermission('book-create-all');
      * @return Response
      */
     public function create()
     {
         $this->checkPermission('book-create-all');

-        $this->setPageTitle('Create New Book');
+        $this->setPageTitle(trans('entities.books_create'));

         return view('books/create');
     }
 
         return view('books/create');
     }
 


@@ -77,25 +62,21 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
-        $book->created_by = Auth::user()->id;
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->entityRepo->createFromInput('book', $request->all());

         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.

-     *

      * @param $slug
      * @return Response
      */
     public function show($slug)
     {
      * @param $slug
      * @return Response
      */
     public function show($slug)
     {

-        $book = $this->bookRepo->getBySlug($slug);
-        $bookChildren = $this->bookRepo->getChildren($book);
+        $book = $this->entityRepo->getBySlug('book', $slug);
+        $this->checkOwnablePermission('book-view', $book);
+        $bookChildren = $this->entityRepo->getBookChildren($book);

         Views::add($book);
         $this->setPageTitle($book->getShortName());
         return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
         return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);


@@ -103,37 +84,32 @@ class BookController extends Controller
 
     /**
      * Show the form for editing the specified book.
 
     /**
      * Show the form for editing the specified book.

-     *

      * @param $slug
      * @return Response
      */
     public function edit($slug)
     {
      * @param $slug
      * @return Response
      */
     public function edit($slug)
     {

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

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

-        $this->setPageTitle('Edit Book ' . $book->getShortName());
+        $this->setPageTitle(trans('entities.books_edit_named',['bookName'=>$book->getShortName()]));

         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Update the specified book in storage.
         return view('books/edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Update the specified book in storage.

-     *

      * @param  Request $request
      * @param          $slug
      * @return Response
      */
     public function update(Request $request, $slug)
     {
      * @param  Request $request
      * @param          $slug
      * @return Response
      */
     public function update(Request $request, $slug)
     {

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

         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->entityRepo->updateFromInput('book', $book, $request->all());

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


@@ -145,9 +121,9 @@ class BookController extends Controller
      */
     public function showDelete($bookSlug)
     {
      */
     public function showDelete($bookSlug)
     {

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

         $this->checkOwnablePermission('book-delete', $book);
         $this->checkOwnablePermission('book-delete', $book);

-        $this->setPageTitle('Delete Book ' . $book->getShortName());
+        $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));

         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
 
         return view('books/delete', ['book' => $book, 'current' => $book]);
     }
 


@@ -158,11 +134,11 @@ class BookController extends Controller
      */
     public function sort($bookSlug)
     {
      */
     public function sort($bookSlug)
     {

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

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

-        $bookChildren = $this->bookRepo->getChildren($book);
-        $books = $this->bookRepo->getAll(false);
-        $this->setPageTitle('Sort Book ' . $book->getShortName());
+        $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]);
     }
 
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
     }
 


@@ -174,8 +150,8 @@ class BookController extends Controller
      */
     public function getSortItem($bookSlug)
     {
      */
     public function getSortItem($bookSlug)
     {

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

         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 
         return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 


@@ -187,7 +163,7 @@ class BookController extends Controller
      */
     public function saveSort($bookSlug, Request $request)
     {
      */
     public function saveSort($bookSlug, Request $request)
     {

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

         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent


@@ -195,21 +171,31 @@ class BookController extends Controller
             return redirect($book->getUrl());
         }
 
             return redirect($book->getUrl());
         }
 

-        $sortedBooks = [];

         // Sort pages and chapters
         // Sort pages and chapters

+        $sortedBooks = [];
+        $updatedModels = collect();

         $sortMap = json_decode($request->get('sort-tree'));
         $defaultBookId = $book->id;
         $sortMap = json_decode($request->get('sort-tree'));
         $defaultBookId = $book->id;

-        foreach ($sortMap as $index => $bookChild) {
-            $id = $bookChild->id;
+
+        // Loop through contents of provided map and update entities accordingly
+        foreach ($sortMap as $bookChild) {
+            $priority = $bookChild->sort;
+            $id = intval($bookChild->id);

             $isPage = $bookChild->type == 'page';
             $isPage = $bookChild->type == 'page';

-            $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
-            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
-            $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
-            $model->priority = $index;
-            if ($isPage) {
-                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+            $bookId = $this->entityRepo->exists('book', $bookChild->book) ? intval($bookChild->book) : $defaultBookId;
+            $chapterId = ($isPage && $bookChild->parentChapter === false) ? 0 : intval($bookChild->parentChapter);
+            $model = $this->entityRepo->getById($isPage?'page':'chapter', $id);
+
+            // 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)) {
+                $this->entityRepo->changeBook($isPage?'page':'chapter', $bookId, $model);
+                $model->priority = $priority;
+                if ($isPage) $model->chapter_id = $chapterId;
+                $model->save();
+                $updatedModels->push($model);

             }
             }

-            $model->save();
+
+            // Store involved books to be sorted later

             if (!in_array($bookId, $sortedBooks)) {
                 $sortedBooks[] = $bookId;
             }
             if (!in_array($bookId, $sortedBooks)) {
                 $sortedBooks[] = $bookId;
             }


@@ -217,10 +203,13 @@ class BookController extends Controller
 
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
 
         // Add activity for books
         foreach ($sortedBooks as $bookId) {

-            $updatedBook = $this->bookRepo->getById($bookId);
+            $updatedBook = $this->entityRepo->getById('book', $bookId);

             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 

+        // Update permissions on changed models
+        $this->entityRepo->buildJointPermissions($updatedModels);
+

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


@@ -231,11 +220,10 @@ class BookController extends Controller
      */
     public function destroy($bookSlug)
     {
      */
     public function destroy($bookSlug)
     {

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

         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);

-        Activity::removeEntity($book);
-        $this->bookRepo->destroyBySlug($bookSlug);
+        $this->entityRepo->destroyBook($book);

         return redirect('/books');
     }
 
         return redirect('/books');
     }
 


@@ -246,7 +234,7 @@ class BookController extends Controller
      */
     public function showRestrict($bookSlug)
     {
      */
     public function showRestrict($bookSlug)
     {

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

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


@@ -264,10 +252,10 @@ class BookController extends Controller
      */
     public function restrict($bookSlug, Request $request)
     {
      */
     public function restrict($bookSlug, Request $request)
     {

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

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

-        $this->bookRepo->updateRestrictionsFromRequest($request, $book);
-        session()->flash('success', 'Page Restrictions Updated');
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $book);
+        session()->flash('success', trans('entities.books_permissions_updated'));

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