Fixed failing test after drawio default url change

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

diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 6c56767655c894b22c548e7ff552a07f36940ea6..8217d2cab90e48301433c20740ea7df6ede8a135 100644 (file)
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -1,21 +1,30 @@
-<?php namespace BookStack\Entities\Models;
+<?php
+
+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\Support\Collection;
 
 /**
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 
 /**

- * Class Book
- * @property string $description
- * @property int $image_id
- * @property Image|null $cover
+ * Class Book.
+ *
+ * @property string                                   $description
+ * @property int                                      $image_id
+ * @property Image|null                               $cover
+ * @property \Illuminate\Database\Eloquent\Collection $chapters
+ * @property \Illuminate\Database\Eloquent\Collection $pages
+ * @property \Illuminate\Database\Eloquent\Collection $directPages

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

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

 
     protected $fillable = ['name', 'description'];
     protected $hidden = ['restricted', 'pivot', 'image_id', 'deleted_at'];
 
     protected $fillable = ['name', 'description'];
     protected $hidden = ['restricted', 'pivot', 'image_id', 'deleted_at'];


@@ -30,8 +39,10 @@ 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 $width  - Width of the image

      * @param int $height - Height of the image
      * @param int $height - Height of the image

+     *

      * @return string
      */
     public function getBookCover($width = 440, $height = 250)
      * @return string
      */
     public function getBookCover($width = 440, $height = 250)


@@ -46,11 +57,12 @@ class Book extends Entity implements HasCoverImage
         } catch (Exception $err) {
             $cover = $default;
         }
         } catch (Exception $err) {
             $cover = $default;
         }

+

         return $cover;
     }
 
     /**
         return $cover;
     }
 
     /**

-     * Get the cover image of the book
+     * Get the cover image of the book.

      */
     public function cover(): BelongsTo
     {
      */
     public function cover(): BelongsTo
     {


@@ -67,48 +79,44 @@ class Book extends Entity implements HasCoverImage
 
     /**
      * 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 getDirectChildren(): 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');
     }
 }