Removed parallel testing, updated predis

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

diff --git a/app/Http/Controllers/FavouriteController.php b/app/Http/Controllers/FavouriteController.php
index 8a26eac8ebbd02a27c35a9d831afbf849502832c..e46442a643449348ed0f212fee1fb7a00c091b65 100644 (file)
--- a/app/Http/Controllers/FavouriteController.php
+++ b/app/Http/Controllers/FavouriteController.php
@@ -3,12 +3,33 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Entities\Models\Entity;
 namespace BookStack\Http\Controllers;
 
 use BookStack\Entities\Models\Entity;

+use BookStack\Entities\Queries\TopFavourites;

 use BookStack\Interfaces\Favouritable;
 use BookStack\Model;
 use Illuminate\Http\Request;
 
 class FavouriteController extends Controller
 {
 use BookStack\Interfaces\Favouritable;
 use BookStack\Model;
 use Illuminate\Http\Request;
 
 class FavouriteController extends Controller
 {

+    /**
+     * Show a listing of all favourite items for the current user.
+     */
+    public function index(Request $request)
+    {
+        $viewCount = 20;
+        $page = intval($request->get('page', 1));
+        $favourites = (new TopFavourites())->run($viewCount + 1, (($page - 1) * $viewCount));
+
+        $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;
+
+        $this->setPageTitle(trans('entities.my_favourites'));
+
+        return view('common.detailed-listing-with-more', [
+            'title'       => trans('entities.my_favourites'),
+            'entities'    => $favourites->slice(0, $viewCount),
+            'hasMoreLink' => $hasMoreLink,
+        ]);
+    }
+

     /**
      * Add a new item as a favourite.
      */
     /**
      * Add a new item as a favourite.
      */


@@ -22,6 +43,7 @@ class FavouriteController extends Controller
         $this->showSuccessNotification(trans('activities.favourite_add_notification', [
             'name' => $favouritable->name,
         ]));
         $this->showSuccessNotification(trans('activities.favourite_add_notification', [
             'name' => $favouritable->name,
         ]));

+

         return redirect()->back();
     }
 
         return redirect()->back();
     }
 


@@ -38,6 +60,7 @@ class FavouriteController extends Controller
         $this->showSuccessNotification(trans('activities.favourite_remove_notification', [
             'name' => $favouritable->name,
         ]));
         $this->showSuccessNotification(trans('activities.favourite_remove_notification', [
             'name' => $favouritable->name,
         ]));

+

         return redirect()->back();
     }
 
         return redirect()->back();
     }
 


@@ -45,11 +68,11 @@ class FavouriteController extends Controller
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Exception
      */
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Exception
      */

-    protected function getValidatedModelFromRequest(Request $request): Favouritable
+    protected function getValidatedModelFromRequest(Request $request): Entity

     {
         $modelInfo = $this->validate($request, [
     {
         $modelInfo = $this->validate($request, [

-            'type' => 'required|string',
-            'id' => 'required|integer',
+            'type' => ['required', 'string'],
+            'id'   => ['required', 'integer'],

         ]);
 
         if (!class_exists($modelInfo['type'])) {
         ]);
 
         if (!class_exists($modelInfo['type'])) {


@@ -57,14 +80,14 @@ class FavouriteController extends Controller
         }
 
         /** @var Model $model */
         }
 
         /** @var Model $model */

-        $model = new $modelInfo['type'];
-        if (! $model instanceof Favouritable) {
+        $model = new $modelInfo['type']();
+        if (!$model instanceof Favouritable) {

             throw new \Exception('Model not favouritable');
         }
 
         $modelInstance = $model->newQuery()
             ->where('id', '=', $modelInfo['id'])
             throw new \Exception('Model not favouritable');
         }
 
         $modelInstance = $model->newQuery()
             ->where('id', '=', $modelInfo['id'])

-            ->first(['id', 'name']);
+            ->first(['id', 'name', 'owned_by']);

 
         $inaccessibleEntity = ($modelInstance instanceof Entity && !userCan('view', $modelInstance));
         if (is_null($modelInstance) || $inaccessibleEntity) {
 
         $inaccessibleEntity = ($modelInstance instanceof Entity && !userCan('view', $modelInstance));
         if (is_null($modelInstance) || $inaccessibleEntity) {