System CLI: Updated to 126de5599c state

[bookstack] / app / Entities / Models / Book.php

diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 1e4591bd75d3f385e5a4cffe217b5f8c7f643f2c..c1644dcf5fb10afa03ebff7d38142e5162785c9d 100644 (file)
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -4,6 +4,7 @@ namespace BookStack\Entities\Models;
 
 use BookStack\Uploads\Image;
 use Exception;
 
 use BookStack\Uploads\Image;
 use Exception;

+use Illuminate\Database\Eloquent\Factories\HasFactory;

 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;


@@ -14,17 +15,23 @@ use Illuminate\Support\Collection;
  *
  * @property string                                   $description
  * @property int                                      $image_id
  *
  * @property string                                   $description
  * @property int                                      $image_id

+ * @property ?int                                     $default_template_id

  * @property Image|null                               $cover
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages
  * @property Image|null                               $cover
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages

+ * @property \Illuminate\Database\Eloquent\Collection $shelves
+ * @property ?Page                                    $defaultTemplate

  */
 class Book extends Entity implements HasCoverImage
 {
  */
 class Book extends Entity implements HasCoverImage
 {

-    public $searchFactor = 2;
+    use HasFactory;
+    use HasHtmlDescription;

 
 

-    protected $fillable = ['name', 'description'];
-    protected $hidden = ['restricted', 'pivot', 'image_id', 'deleted_at'];
+    public float $searchFactor = 1.2;
+
+    protected $fillable = ['name'];
+    protected $hidden = ['pivot', 'image_id', 'deleted_at', 'description_html'];

 
     /**
      * Get the url for this book.
 
     /**
      * Get the url for this book.


@@ -36,26 +43,19 @@ class Book extends Entity implements HasCoverImage
 
     /**
      * Returns book cover image, if book cover not exists return default cover image.
 
     /**
      * Returns book cover image, if book cover not exists return default cover image.

-     *
-     * @param int $width  - Width of the image
-     * @param int $height - Height of the image
-     *
-     * @return string

      */
      */

-    public function getBookCover($width = 440, $height = 250)
+    public function getBookCover(int $width = 440, int $height = 250): string

     {
         $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
     {
         $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';

-        if (!$this->image_id) {
+        if (!$this->image_id || !$this->cover) {

             return $default;
         }
 
         try {
             return $default;
         }
 
         try {

-            $cover = $this->cover ? url($this->cover->getThumb($width, $height, false)) : $default;
+            return $this->cover->getThumb($width, $height, false) ?? $default;

         } catch (Exception $err) {
         } catch (Exception $err) {

-            $cover = $default;
+            return $default;

         }
         }

-
-        return $cover;

     }
 
     /**
     }
 
     /**


@@ -74,55 +74,53 @@ class Book extends Entity implements HasCoverImage
         return 'cover_book';
     }
 
         return 'cover_book';
     }
 

+    /**
+     * Get the Page that is used as default template for newly created pages within this Book.
+     */
+    public function defaultTemplate(): BelongsTo
+    {
+        return $this->belongsTo(Page::class, 'default_template_id');
+    }
+

     /**
      * Get all pages within this book.
     /**
      * Get all pages within this book.

-     *
-     * @return HasMany

      */
      */

-    public function pages()
+    public function pages(): HasMany

     {
         return $this->hasMany(Page::class);
     }
 
     /**
      * Get the direct child pages of this book.
     {
         return $this->hasMany(Page::class);
     }
 
     /**
      * Get the direct child pages of this book.

-     *
-     * @return HasMany

      */
      */

-    public function directPages()
+    public function directPages(): HasMany

     {
         return $this->pages()->where('chapter_id', '=', '0');
     }
 
     /**
      * Get all chapters within this book.
     {
         return $this->pages()->where('chapter_id', '=', '0');
     }
 
     /**
      * Get all chapters within this book.

-     *
-     * @return HasMany

      */
      */

-    public function chapters()
+    public function chapters(): HasMany

     {
         return $this->hasMany(Chapter::class);
     }
 
     /**
      * Get the shelves this book is contained within.
     {
         return $this->hasMany(Chapter::class);
     }
 
     /**
      * Get the shelves this book is contained within.

-     *
-     * @return BelongsToMany

      */
      */

-    public function shelves()
+    public function shelves(): BelongsToMany

     {
         return $this->belongsToMany(Bookshelf::class, 'bookshelves_books', 'book_id', 'bookshelf_id');
     }
 
     /**
      * Get the direct child items within this book.
     {
         return $this->belongsToMany(Bookshelf::class, 'bookshelves_books', 'book_id', 'bookshelf_id');
     }
 
     /**
      * Get the direct child items within this book.

-     *
-     * @return Collection

      */
      */

-    public function getDirectChildren(): Collection
+    public function getDirectVisibleChildren(): Collection

     {
     {

-        $pages = $this->directPages()->visible()->get();
-        $chapters = $this->chapters()->visible()->get();
+        $pages = $this->directPages()->scopes('visible')->get();
+        $chapters = $this->chapters()->scopes('visible')->get();

 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }