Code cleanup, bug squashing

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index e7d788d91dde01b78fdd158035fe07fd6cd5f54e..b63fe911fe083f378dc58495334eedad23e36d2b 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,12 +1,12 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Entities\Managers\BookContents;
-use BookStack\Entities\Bookshelf;
-use BookStack\Entities\Managers\EntityContext;
+use BookStack\Actions\ActivityType;
+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Tools\ShelfContext;

 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotifyException;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;


@@ -18,14 +18,10 @@ class BookController extends Controller
     protected $bookRepo;
     protected $entityContextManager;
 
     protected $bookRepo;
     protected $entityContextManager;
 

-    /**
-     * BookController constructor.
-     */
-    public function __construct(EntityContext $entityContextManager, BookRepo $bookRepo)
+    public function __construct(ShelfContext $entityContextManager, BookRepo $bookRepo)

     {
         $this->bookRepo = $bookRepo;
         $this->entityContextManager = $entityContextManager;
     {
         $this->bookRepo = $bookRepo;
         $this->entityContextManager = $entityContextManager;

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -86,7 +82,7 @@ class BookController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',

-            'image' => $this->getImageValidationRules(),
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
 
         $bookshelf = null;
         ]);
 
         $bookshelf = null;


@@ -97,11 +93,10 @@ class BookController extends Controller
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));
 
         $book = $this->bookRepo->create($request->all());
         $this->bookRepo->updateCoverImage($book, $request->file('image', null));

-        Activity::add($book, 'book_create', $book->id);

 
         if ($bookshelf) {
             $bookshelf->appendBook($book);
 
         if ($bookshelf) {
             $bookshelf->appendBook($book);

-            Activity::add($bookshelf, 'bookshelf_update');
+            Activity::addForEntity($bookshelf, ActivityType::BOOKSHELF_UPDATE);

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


@@ -114,6 +109,7 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($slug);
         $bookChildren = (new BookContents($book))->getTree(true);
     {
         $book = $this->bookRepo->getBySlug($slug);
         $bookChildren = (new BookContents($book))->getTree(true);

+        $bookParentShelves = $book->shelves()->visible()->get();

 
         Views::add($book);
         if ($request->has('shelf')) {
 
         Views::add($book);
         if ($request->has('shelf')) {


@@ -125,6 +121,7 @@ class BookController extends Controller
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,

+            'bookParentShelves' => $bookParentShelves,

             'activity' => Activity::entityActivity($book, 20, 1)
         ]);
     }
             'activity' => Activity::entityActivity($book, 20, 1)
         ]);
     }


@@ -153,15 +150,13 @@ class BookController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',
         $this->validate($request, [
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000',

-            'image' => $this->getImageValidationRules(),
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
 
         $book = $this->bookRepo->update($book, $request->all());
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 
         ]);
 
         $book = $this->bookRepo->update($book, $request->all());
         $resetCover = $request->has('image_reset');
         $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
 

-        Activity::add($book, 'book_update', $book->id);
-

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


@@ -179,14 +174,12 @@ class BookController extends Controller
     /**
      * Remove the specified book from the system.
      * @throws Throwable
     /**
      * Remove the specified book from the system.
      * @throws Throwable

-     * @throws NotifyException

      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 
      */
     public function destroy(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 

-        Activity::addMessage('book_delete', $book->name);

         $this->bookRepo->destroy($book);
 
         return redirect('/books');
         $this->bookRepo->destroy($book);
 
         return redirect('/books');