controller refactoring part 24

src/Domain/Folders/Controllers/VisitorCreateFolderController.php

@@ -3,11 +3,12 @@ namespace Domain\Folders\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
-use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Domain\Folders\Actions\CreateFolderAction;
 use Domain\Folders\Requests\CreateFolderRequest;
 use Support\Demo\Actions\FakeCreateFolderAction;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
 
 /**
  * Create new folder for guest user with edit permission
@@ -15,22 +16,23 @@ use Support\Demo\Actions\FakeCreateFolderAction;
 class VisitorCreateFolderController extends Controller
 {
     public function __construct(
-        public HelperService $helper,
+        private CreateFolderAction $createFolder,
+        private ProtectShareRecordAction $protectShareRecord,
+        private VerifyAccessToItemAction $verifyAccessToItem,
+        private FakeCreateFolderAction $fakeCreateFolderAction,
     ) {
     }
 
     public function __invoke(
-        FakeCreateFolderAction $fakeCreateFolderAction,
-        CreateFolderAction $createFolder,
         CreateFolderRequest $request,
         Share $shared,
     ): Response | array {
         if (is_demo_account($shared->user->email)) {
-            return ($fakeCreateFolderAction)($request);
+            return ($this->fakeCreateFolderAction)($request);
         }
 
         // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
+        ($this->protectShareRecord)($shared);
 
         // Check shared permission
         if (is_visitor($shared)) {
@@ -38,10 +40,10 @@ class VisitorCreateFolderController extends Controller
         }
 
         // Check access to requested directory
-        $this->helper->check_item_access($request->parent_id, $shared);
+        ($this->verifyAccessToItem)($request->parent_id, $shared);
 
         // Create folder
-        $folder = ($createFolder)($request, $shared);
+        $folder = ($this->createFolder)($request, $shared);
 
         return response($folder, 201);
     }

src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php

@@ -3,8 +3,9 @@ namespace Domain\Folders\Controllers;
 
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
-use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
 
 /**
  * Get navigation tree of shared folder
@@ -12,7 +13,8 @@ use App\Http\Controllers\Controller;
 class VisitorNavigationFolderTreeController extends Controller
 {
     public function __construct(
-        public HelperService $helper,
+        private ProtectShareRecordAction $protectShareRecord,
+        private VerifyAccessToItemAction $verifyAccessToItem,
     ) {
     }
 
@@ -20,10 +22,10 @@ class VisitorNavigationFolderTreeController extends Controller
         Share $shared,
     ): array {
         // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
+        ($this->protectShareRecord)($shared);
 
         // Check if user can get directory
-        $this->helper->check_item_access($shared->item_id, $shared);
+        ($this->verifyAccessToItem)($shared->item_id, $shared);
 
         // Get folders
         $folders = Folder::with('folders:id,parent_id,name')