ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / app / Entities / Repos / BookRepo.php

diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 7fcc80face7c3833fd87c991402f62fbd37e2926..19d159eb1e7e9cc539a86f6031ef8004a20e70ef 100644 (file)
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -1,96 +1,38 @@
-<?php namespace BookStack\Entities\Repos;
+<?php

 
 

-use BookStack\Actions\TagRepo;
-use BookStack\Entities\Book;
-use BookStack\Entities\Managers\TrashCan;
+namespace BookStack\Entities\Repos;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\TagRepo;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Tools\TrashCan;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\NotifyException;
+use BookStack\Facades\Activity;

 use BookStack\Uploads\ImageRepo;
 use Exception;
 use BookStack\Uploads\ImageRepo;
 use Exception;

-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;

 use Illuminate\Http\UploadedFile;
 use Illuminate\Http\UploadedFile;

-use Illuminate\Support\Collection;

 
 class BookRepo
 {
 
 class BookRepo
 {

-
-    protected $baseRepo;
-    protected $tagRepo;
-    protected $imageRepo;
-
-    /**
-     * BookRepo constructor.
-     * @param $tagRepo
-     */
-    public function __construct(BaseRepo $baseRepo, TagRepo $tagRepo, ImageRepo $imageRepo)
-    {
-        $this->baseRepo = $baseRepo;
-        $this->tagRepo = $tagRepo;
-        $this->imageRepo = $imageRepo;
+    public function __construct(
+        protected BaseRepo $baseRepo,
+        protected TagRepo $tagRepo,
+        protected ImageRepo $imageRepo,
+        protected TrashCan $trashCan,
+    ) {

     }
 
     /**
     }
 
     /**

-     * Get all books in a paginated format.
-     */
-    public function getAllPaginated(int $count = 20, string $sort = 'name', string $order = 'asc'): LengthAwarePaginator
-    {
-        return Book::visible()->orderBy($sort, $order)->paginate($count);
-    }
-
-    /**
-     * Get the books that were most recently viewed by this user.
-     */
-    public function getRecentlyViewed(int $count = 20): Collection
-    {
-        return Book::visible()->withLastView()
-            ->having('last_viewed_at', '>', 0)
-            ->orderBy('last_viewed_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most popular books in the system.
-     */
-    public function getPopular(int $count = 20): Collection
-    {
-        return Book::visible()->withViewCount()
-            ->having('view_count', '>', 0)
-            ->orderBy('view_count', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most recently created books from the system.
-     */
-    public function getRecentlyCreated(int $count = 20): Collection
-    {
-        return Book::visible()->orderBy('created_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get a book by its slug.
-     */
-    public function getBySlug(string $slug): Book
-    {
-        $book = Book::visible()->where('slug', '=', $slug)->first();
-
-        if ($book === null) {
-            throw new NotFoundException(trans('errors.book_not_found'));
-        }
-
-        return $book;
-    }
-
-    /**
-     * Create a new book in the system
+     * Create a new book in the system.

      */
     public function create(array $input): Book
     {
         $book = new Book();
         $this->baseRepo->create($book, $input);
      */
     public function create(array $input): Book
     {
         $book = new Book();
         $this->baseRepo->create($book, $input);

+        $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
+        $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
+        Activity::add(ActivityType::BOOK_CREATE, $book);
+

         return $book;
     }
 
         return $book;
     }
 


@@ -100,35 +42,41 @@ class BookRepo
     public function update(Book $book, array $input): Book
     {
         $this->baseRepo->update($book, $input);
     public function update(Book $book, array $input): Book
     {
         $this->baseRepo->update($book, $input);

+
+        if (array_key_exists('default_template_id', $input)) {
+            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id']));
+        }
+
+        if (array_key_exists('image', $input)) {
+            $this->baseRepo->updateCoverImage($book, $input['image'], $input['image'] === null);
+        }
+
+        Activity::add(ActivityType::BOOK_UPDATE, $book);
+

         return $book;
     }
 
     /**
      * Update the given book's cover image, or clear it.
         return $book;
     }
 
     /**
      * Update the given book's cover image, or clear it.

+     *

      * @throws ImageUploadException
      * @throws Exception
      */
      * @throws ImageUploadException
      * @throws Exception
      */

-    public function updateCoverImage(Book $book, UploadedFile $coverImage = null, bool $removeImage = false)
+    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false)

     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }
 
     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }
 

-    /**
-     * Update the permissions of a book.
-     */
-    public function updatePermissions(Book $book, bool $restricted, Collection $permissions = null)
-    {
-        $this->baseRepo->updatePermissions($book, $restricted, $permissions);
-    }
-

     /**
      * Remove a book from the system.
     /**
      * Remove a book from the system.

-     * @throws NotifyException
-     * @throws BindingResolutionException
+     *
+     * @throws Exception

      */
     public function destroy(Book $book)
     {
      */
     public function destroy(Book $book)
     {

-        $trashCan = new TrashCan();
-        $trashCan->destroyBook($book);
+        $this->trashCan->softDestroyBook($book);
+        Activity::add(ActivityType::BOOK_DELETE, $book);
+
+        $this->trashCan->autoClearOld();

     }
 }
     }
 }