Remove Dumps

[bookstack] / app / Activity / Controllers / WatchController.php

diff --git a/app/Activity/Controllers/WatchController.php b/app/Activity/Controllers/WatchController.php
index 3d7e18116bec0b404bd8dd804480c23ab150376d..c0b1c58724926752c8656fc3685431f0e6361a9f 100644 (file)
--- a/app/Activity/Controllers/WatchController.php
+++ b/app/Activity/Controllers/WatchController.php
@@ -3,25 +3,22 @@
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;

-use BookStack\App\Model;
-use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Tools\MixedEntityRequestHelper;

 use BookStack\Http\Controller;
 use BookStack\Http\Controller;

-use Exception;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use Illuminate\Validation\ValidationException;

 
 class WatchController extends Controller
 {
 
 class WatchController extends Controller
 {

-    public function update(Request $request)
+    public function update(Request $request, MixedEntityRequestHelper $entityHelper)

     {
         $this->checkPermission('receive-notifications');
         $this->preventGuestAccess();
 
     {
         $this->checkPermission('receive-notifications');
         $this->preventGuestAccess();
 

-        $requestData = $this->validate($request, [
+        $requestData = $this->validate($request, array_merge([

             'level' => ['required', 'string'],
             'level' => ['required', 'string'],

-        ]);
+        ], $entityHelper->validationRules()));

 
 

-        $watchable = $this->getValidatedModelFromRequest($request);
+        $watchable = $entityHelper->getVisibleEntityFromRequestData($requestData);

         $watchOptions = new UserEntityWatchOptions(user(), $watchable);
         $watchOptions->updateLevelByName($requestData['level']);
 
         $watchOptions = new UserEntityWatchOptions(user(), $watchable);
         $watchOptions->updateLevelByName($requestData['level']);
 


@@ -29,37 +26,4 @@ class WatchController extends Controller
 
         return redirect()->back();
     }
 
         return redirect()->back();
     }

-
-    /**
-     * @throws ValidationException
-     * @throws Exception
-     */
-    protected function getValidatedModelFromRequest(Request $request): Entity
-    {
-        $modelInfo = $this->validate($request, [
-            'type' => ['required', 'string'],
-            'id'   => ['required', 'integer'],
-        ]);
-
-        if (!class_exists($modelInfo['type'])) {
-            throw new Exception('Model not found');
-        }
-
-        /** @var Model $model */
-        $model = new $modelInfo['type']();
-        if (!$model instanceof Entity) {
-            throw new Exception('Model not an entity');
-        }
-
-        $modelInstance = $model->newQuery()
-            ->where('id', '=', $modelInfo['id'])
-            ->first(['id', 'name', 'owned_by']);
-
-        $inaccessibleEntity = ($modelInstance instanceof Entity && !userCan('view', $modelInstance));
-        if (is_null($modelInstance) || $inaccessibleEntity) {
-            throw new Exception('Model instance not found');
-        }
-
-        return $modelInstance;
-    }

 }
 }