controller refactoring part 24

src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php

@@ -3,10 +3,11 @@ namespace Domain\Items\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
-use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Domain\Items\Requests\DeleteItemRequest;
 use Domain\Items\Actions\DeleteFileOrFolderAction;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
 
 /**
  * Delete item for guest user with edit permission
@@ -14,8 +15,9 @@ use Domain\Items\Actions\DeleteFileOrFolderAction;
 class VisitorDeleteFileOrFolderController extends Controller
 {
     public function __construct(
-        private HelperService $helper,
         private DeleteFileOrFolderAction $deleteFileOrFolder,
+        private ProtectShareRecordAction $protectShareRecord,
+        private VerifyAccessToItemAction $verifyAccessToItem,
     ) {
     }
 
@@ -30,7 +32,7 @@ class VisitorDeleteFileOrFolderController extends Controller
         );
 
         // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
+        ($this->protectShareRecord)($shared);
 
         // Check shared permission
         if (is_visitor($shared)) {
@@ -43,9 +45,9 @@ class VisitorDeleteFileOrFolderController extends Controller
 
             // Check access to requested item
             if ($file['type'] === 'folder') {
-                $this->helper->check_item_access($item->id, $shared);
+                ($this->verifyAccessToItem)($item->id, $shared);
             } else {
-                $this->helper->check_item_access($item->folder_id, $shared);
+                ($this->verifyAccessToItem)($item->folder_id, $shared);
             }
 
             // Delete item

src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php

@@ -4,10 +4,11 @@ namespace Domain\Items\Controllers;
 use Domain\Files\Models\File;
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
-use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Domain\Items\Requests\MoveItemRequest;
 use Domain\Items\Actions\MoveFileOrFolderAction;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
 
 /**
  * Move item for guest user with edit permission
@@ -15,8 +16,9 @@ use Domain\Items\Actions\MoveFileOrFolderAction;
 class VisitorMoveFileOrFolderController extends Controller
 {
     public function __construct(
-        private HelperService $helper,
         private MoveFileOrFolderAction $moveFileOrFolder,
+        private ProtectShareRecordAction $protectShareRecord,
+        private VerifyAccessToItemAction $verifyAccessToItem,
     ) {
     }
 
@@ -31,7 +33,7 @@ class VisitorMoveFileOrFolderController extends Controller
         );
 
         // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
+        ($this->protectShareRecord)($shared);
 
         // Check shared permission
         if (is_visitor($shared)) {
@@ -40,7 +42,7 @@ class VisitorMoveFileOrFolderController extends Controller
 
         foreach ($request->input('items') as $item) {
             if ($item['type'] === 'folder') {
-                $this->helper->check_item_access([
+                ($this->verifyAccessToItem)([
                     $request->input('to_id'), $item['id'],
                 ], $shared);
             }
@@ -50,7 +52,7 @@ class VisitorMoveFileOrFolderController extends Controller
                     ->where('user_id', $shared->user_id)
                     ->firstOrFail();
 
-                $this->helper->check_item_access([
+                ($this->verifyAccessToItem)([
                     $request->input('to_id'), $file->folder_id,
                 ], $shared);
             }

src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php

@@ -3,10 +3,11 @@ namespace Domain\Items\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
-use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
 use Domain\Folders\Actions\UpdateFolderPropertyAction;
 use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 
@@ -16,8 +17,9 @@ use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 class VisitorRenameFileOrFolderController extends Controller
 {
     public function __construct(
-        private HelperService $helper,
         private RenameFileOrFolderAction $renameFileOrFolder,
+        private ProtectShareRecordAction $protectShareRecord,
+        private VerifyAccessToItemAction $verifyAccessToItem,
         private UpdateFolderPropertyAction $updateFolderProperty,
         private FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
     ) {
@@ -27,14 +29,14 @@ class VisitorRenameFileOrFolderController extends Controller
         RenameItemRequest $request,
         string $id,
         Share $shared,
-    ): Response {
+    ): Response | array {
         // Return fake renamed item in demo
         if (is_demo_account($shared->user->email)) {
             return ($this->fakeRenameFileOrFolder)($request, $id);
         }
 
         // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
+        ($this->protectShareRecord)($shared);
 
         // Check shared permission
         if (is_visitor($shared)) {
@@ -46,9 +48,9 @@ class VisitorRenameFileOrFolderController extends Controller
 
         // Check access to requested item
         if ($request->input('type') === 'folder') {
-            $this->helper->check_item_access($item->id, $shared);
+            ($this->verifyAccessToItem)($item->id, $shared);
         } else {
-            $this->helper->check_item_access($item->folder_id, $shared);
+            ($this->verifyAccessToItem)($item->folder_id, $shared);
         }
 
         // If request have a change folder icon values set the folder icon