controller refactoring part 21

src/Domain/Files/Controllers/UploadFileController.php

@@ -5,6 +5,7 @@ use Domain\Files\Models\File;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
 use Domain\Files\Actions\UploadFileAction;
+use Support\Demo\Actions\FakeUploadFileAction;
 
 class UploadFileController extends Controller
 {
@@ -14,9 +15,11 @@ class UploadFileController extends Controller
     public function __invoke(
         UploadRequest $request,
         UploadFileAction $uploadFiles,
-    ): File {
+        FakeUploadFileAction $fakeUploadFile,
+    ): File|array {
+
         if (is_demo_account('howdy@hi5ve.digital')) {
-            return $this->demo->upload($request);
+            return ($fakeUploadFile)($request);
         }
 
         return ($uploadFiles)($request);

src/Domain/Files/Controllers/VisitorGetSingleFileInfoController.php

@@ -10,7 +10,7 @@ use Domain\Files\Resources\FileResource;
 /**
  * Get shared file record
  */
-class VisitorGetSingleFileResourceController
+class VisitorGetSingleFileInfoController
 {
     public function __construct(
         public HelperService $helper,

src/Domain/Files/Controllers/VisitorUploadFilesController.php

@@ -3,6 +3,7 @@ namespace Domain\Files\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
+use Support\Demo\Actions\FakeUploadFileAction;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Support\Demo\Actions\DemoService;
@@ -12,21 +13,20 @@ use Domain\Files\Actions\UploadFileAction;
 /**
  * guest user upload file into shared folder
  */
-class EditorUploadFilesController extends Controller
+class VisitorUploadFilesController extends Controller
 {
     public function __construct(
         public HelperService $helper,
-        public DemoService $demo,
-    ) {
-    }
+    ) {}
 
     public function __invoke(
+        FakeUploadFileAction $fakeUploadFile,
         UploadFileAction $uploadFile,
         UploadRequest $request,
         Share $shared,
     ): Response | array {
         if (is_demo_account($shared->user->email)) {
-            return $this->demo->upload($request);
+            return ($fakeUploadFile)($request);
         }
 
         // Check ability to access protected share record

src/Domain/Folders/Controllers/CreateFolderController.php

@@ -1,34 +1,31 @@
 <?php
 namespace Domain\Folders\Controllers;
 
+use Auth;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
-use Support\Demo\Actions\DemoService;
 use Domain\Folders\Actions\CreateFolderAction;
 use Domain\Folders\Requests\CreateFolderRequest;
+use Support\Demo\Actions\FakeCreateFolderAction;
 
 class CreateFolderController extends Controller
 {
-    public function __construct(
-        public DemoService $demo
-    ) {
-    }
-
     /**
      * Create new folder for authenticated master|editor user
      */
     public function __invoke(
         CreateFolderRequest $request,
         CreateFolderAction $createFolder,
-    ): Response {
+        FakeCreateFolderAction $fakeCreateFolder,
+    ): Response|array {
+
         // If is demo, return fake folder
-        if (is_demo_account('howdy@hi5ve.digital')) {
-            return $this->demo->create_folder($request);
+        if (is_demo_account(Auth::user()->email)) {
+            return ($fakeCreateFolder)($request);
         }
 
         $folder = ($createFolder)($request);
 
-        // Create new folder
         return response($folder, 201);
     }
 }

src/Domain/Folders/Controllers/FavouriteController.php

@@ -5,14 +5,9 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use Support\Demo\Actions\DemoService;
 
 class FavouriteController extends Controller
 {
-    public function __construct(
-        public DemoService $demo,
-    ) {
-    }
 
     /**
      * Add folder to user favourites
@@ -24,7 +19,7 @@ class FavouriteController extends Controller
 
         foreach ($request->input('folders') as $id) {
             if (is_demo_account($user->email)) {
-                return $this->demo->favourites($user);
+                return $user->favouriteFolders->makeHidden(['pivot']);
             }
 
             // Add folder to user favourites
@@ -45,7 +40,7 @@ class FavouriteController extends Controller
         $user = Auth::user();
 
         if (is_demo_account($user->email)) {
-            return $this->demo->favourites($user);
+            return $user->favouriteFolders->makeHidden(['pivot']);
         }
 
         // Remove folder from user favourites

src/Domain/Folders/Controllers/VisitorCreateFolderController.php

@@ -3,30 +3,29 @@ namespace Domain\Folders\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
+use Support\Demo\Actions\FakeCreateFolderAction;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Support\Demo\Actions\DemoService;
 use Domain\Folders\Actions\CreateFolderAction;
 use Domain\Folders\Requests\CreateFolderRequest;
 
 /**
  * Create new folder for guest user with edit permission
  */
-class EditorCreateFolderController extends Controller
+class VisitorCreateFolderController extends Controller
 {
     public function __construct(
         public HelperService $helper,
-        public DemoService $demo,
-    ) {
-    }
+    ) {}
 
     public function __invoke(
+        FakeCreateFolderAction $fakeCreateFolderAction,
         CreateFolderAction $createFolder,
         CreateFolderRequest $request,
         Share $shared,
     ): Response | array {
         if (is_demo_account($shared->user->email)) {
-            return $this->demo->create_folder($request);
+            return ($fakeCreateFolderAction)($request);
         }
 
         // Check ability to access protected share record

src/Domain/Items/Controllers/RenameFileOrFolderController.php

@@ -10,6 +10,7 @@ use Domain\Folders\Actions\UpdateFolderPropertyAction;
 use Domain\Items\Actions\RenameFileOrFolderAction;
 use Domain\Items\Requests\RenameItemRequest;
 use Illuminate\Database\Eloquent\Model;
+use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 
 class RenameFileOrFolderController extends Controller
 {
@@ -20,11 +21,12 @@ class RenameFileOrFolderController extends Controller
         RenameItemRequest $request,
         string $id,
         RenameFileOrFolderAction $renameFileOrFolder,
-        UpdateFolderPropertyAction $updateFolderProperty
-    ): Model {
+        UpdateFolderPropertyAction $updateFolderProperty,
+        FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
+    ): Model|array {
 
-        if (is_demo_account(Auth::user()?->email)) {
-            return $this->demo->rename_item($request, $id);
+        if (is_demo_account(Auth::user()->email)) {
+            return ($fakeRenameFileOrFolder)($request, $id);
         }
 
         // If request contain icon or color, then change it

src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php

@@ -0,0 +1,59 @@
+<?php
+
+
+namespace Domain\Items\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Items\Actions\DeleteFileOrFolderAction;
+use Domain\Items\Actions\MoveFileOrFolderAction;
+use Domain\Items\Requests\DeleteItemRequest;
+use Domain\Sharing\Models\Share;
+use Illuminate\Http\Response;
+use Support\Services\HelperService;
+
+/**
+ * Delete item for guest user with edit permission
+ */
+class VisitorDeleteFileOrFolderController extends Controller
+{
+    public function __construct(
+        private HelperService $helper,
+        private DeleteFileOrFolderAction $deleteFileOrFolder,
+    ) {}
+
+    public function __invoke(
+        DeleteItemRequest $request,
+        Share $shared,
+    ): Response {
+
+        abort_if(
+            is_demo_account($shared->user->email), 204, 'Done.'
+        );
+
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check shared permission
+        if (is_visitor($shared)) {
+            abort(403);
+        }
+
+        foreach ($request->input('items') as $file) {
+            // Get file|folder item
+            $item = get_item($file['type'], $file['id']);
+
+            // Check access to requested item
+            if ($file['type'] === 'folder') {
+                $this->helper->check_item_access($item->id, $shared);
+            } else {
+                $this->helper->check_item_access($item->folder_id, $shared);
+            }
+
+            // Delete item
+            ($this->deleteFileOrFolder)($file, $file['id'], $shared);
+        }
+
+        return response('Done', 204);
+    }
+}

src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php

@@ -0,0 +1,64 @@
+<?php
+
+
+namespace Domain\Items\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File;
+use Domain\Items\Actions\MoveFileOrFolderAction;
+use Domain\Items\Requests\MoveItemRequest;
+use Domain\Sharing\Models\Share;
+use Illuminate\Http\Response;
+use Support\Services\HelperService;
+
+/**
+ * Move item for guest user with edit permission
+ */
+class VisitorMoveFileOrFolderController extends Controller
+{
+    public function __construct(
+        private HelperService $helper,
+        private MoveFileOrFolderAction $moveFileOrFolder,
+    ) {}
+
+    public function __invoke(
+        MoveItemRequest $request,
+        Share $shared,
+    ): Response {
+
+        abort_if(
+            is_demo_account($shared->user->email), 204, 'Done.'
+        );
+
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check shared permission
+        if (is_visitor($shared)) {
+            abort(403);
+        }
+
+        foreach ($request->input('items') as $item) {
+            if ($item['type'] === 'folder') {
+                $this->helper->check_item_access([
+                    $request->input('to_id'), $item['id'],
+                ], $shared);
+            }
+
+            if ($item['type'] !== 'folder') {
+                $file = File::where('id', $item['id'])
+                    ->where('user_id', $shared->user_id)
+                    ->firstOrFail();
+
+                $this->helper->check_item_access([
+                    $request->input('to_id'), $file->folder_id,
+                ], $shared);
+            }
+        }
+
+        ($this->moveFileOrFolder)($request, $request->to_id);
+
+        return response('Done!', 204);
+    }
+}

src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php

@@ -0,0 +1,72 @@
+<?php
+
+
+namespace Domain\Items\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Folders\Actions\UpdateFolderPropertyAction;
+use Domain\Items\Actions\RenameFileOrFolderAction;
+use Domain\Items\Requests\RenameItemRequest;
+use Domain\Sharing\Models\Share;
+use Illuminate\Http\Response;
+use Support\Demo\Actions\FakeRenameFileOrFolderAction;
+use Support\Services\HelperService;
+
+/**
+ * Rename item for guest user with edit permission
+ */
+class VisitorRenameFileOrFolderController extends Controller
+{
+    public function __construct(
+        private HelperService $helper,
+        private RenameFileOrFolderAction $renameFileOrFolder,
+        private UpdateFolderPropertyAction $updateFolderProperty,
+        private FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
+    ) {}
+
+    public function __invoke(
+        RenameItemRequest $request,
+        string $id,
+        Share $shared,
+    ): Response {
+
+        // 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);
+
+        // Check shared permission
+        if (is_visitor($shared)) {
+            abort(403);
+        }
+
+        // Get file|folder item
+        $item = get_item($request->input('type'), $id);
+
+        // Check access to requested item
+        if ($request->input('type') === 'folder') {
+            $this->helper->check_item_access($item->id, $shared);
+        } else {
+            $this->helper->check_item_access($item->folder_id, $shared);
+        }
+
+        // If request have a change folder icon values set the folder icon
+        if ($request->input('type') === 'folder' && $request->filled('icon')) {
+            ($this->updateFolderProperty)($request, $id);
+        }
+
+        // Rename item
+        $item = ($this->renameFileOrFolder)($request, $id);
+
+        // Set public url
+        if ($item->type !== 'folder') {
+            $item->setPublicUrl($shared->token);
+        }
+
+        return response($item, 201);
+    }
+}

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -1,155 +0,0 @@
-<?php
-namespace Domain\Sharing\Controllers;
-
-use Illuminate\Http\Request;
-use Domain\Files\Models\File;
-use Illuminate\Http\Response;
-use Domain\Sharing\Models\Share;
-use Domain\Folders\Models\Folder;
-use Support\Services\HelperService;
-use App\Http\Controllers\Controller;
-use Support\Demo\Actions\DemoService;
-use Support\Services\FileManagerService;
-use Domain\Items\Requests\MoveItemRequest;
-use Domain\Items\Requests\DeleteItemRequest;
-use Domain\Items\Requests\RenameItemRequest;
-use Illuminate\Contracts\Routing\ResponseFactory;
-
-class ManipulateShareItemsController extends Controller
-{
-    public function __construct(
-        private FileManagerService $filemanager,
-        private HelperService $helper,
-        private DemoService $demo,
-    ) {
-    }
-
-    /**
-     * Rename item for guest user with edit permission
-     *
-     * @param RenameItemRequest $request
-     * @param $id
-     * @param Share $shared
-     * @return mixed
-     * @throws \Exception
-     */
-    public function rename_item(RenameItemRequest $request, $id, Share $shared)
-    {
-        if (is_demo_account($shared->user->email)) {
-            return $this->demo->rename_item($request, $id);
-        }
-
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check shared permission
-        if (is_visitor($shared)) {
-            abort(403);
-        }
-
-        // Get file|folder item
-        $item = get_item($request->type, $id);
-
-        // Check access to requested item
-        if ($request->type === 'folder') {
-            $this->helper->check_item_access($item->id, $shared);
-        } else {
-            $this->helper->check_item_access($item->folder_id, $shared);
-        }
-
-        // If request have a change folder icon values set the folder icon
-        if ($request->type === 'folder' && $request->filled('icon')) {
-            $this->filemanager->edit_folder_properties($request, $id);
-        }
-
-        // Rename item
-        $item = $this->filemanager->rename_item($request, $id, $shared);
-
-        // Set public url
-        if ($item->type !== 'folder') {
-            $item->setPublicUrl($shared->token);
-        }
-
-        return response($item, 201);
-    }
-
-    /**
-     * Delete item for guest user with edit permission
-     *
-     * @param DeleteItemRequest $request
-     * @param Share $shared
-     * @return ResponseFactory|\Illuminate\Http\Response
-     * @throws \Exception
-     */
-    public function delete_item(DeleteItemRequest $request, Share $shared)
-    {
-        abort_if(is_demo_account($shared->user->email), 204, 'Done.');
-
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check shared permission
-        if (is_visitor($shared)) {
-            abort(403);
-        }
-
-        foreach ($request->items as $file) {
-            // Get file|folder item
-            $item = get_item($file['type'], $file['id']);
-
-            // Check access to requested item
-            if ($file['type'] === 'folder') {
-                $this->helper->check_item_access($item->id, $shared);
-            } else {
-                $this->helper->check_item_access($item->folder_id, $shared);
-            }
-
-            // Delete item
-            $this->filemanager->delete_item($file, $file['id'], $shared);
-        }
-
-        return response('Done', 204);
-    }
-
-    /**
-     * Move item for guest user with edit permission
-     *
-     * @param MoveItemRequest $request
-     * @param Share $shared
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    public function move(MoveItemRequest $request, Share $shared)
-    {
-        abort_if(is_demo_account($shared->user->email), 204, 'Done.');
-
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check shared permission
-        if (is_visitor($shared)) {
-            abort(403);
-        }
-
-        foreach ($request->items as $item) {
-            if ($item['type'] === 'folder') {
-                $this->helper->check_item_access([
-                    $request->to_id, $item['id'],
-                ], $shared);
-            }
-
-            if ($item['type'] !== 'folder') {
-                $file = File::where('id', $item['id'])
-                    ->where('user_id', $shared->user_id)
-                    ->firstOrFail();
-
-                $this->helper->check_item_access([
-                    $request->to_id, $file->folder_id,
-                ], $shared);
-            }
-        }
-
-        $this->filemanager->move($request, $request->to_id);
-
-        return response('Done!', 204);
-    }
-}

src/Domain/Sharing/Controllers/VisitorAuthenticateProtectedShareController.php

@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Hash;
 use Domain\Sharing\Resources\ShareResource;
 use Domain\Sharing\Requests\AuthenticateShareRequest;
 
-class AuthenticateProtectedSharedItemController extends Controller
+class VisitorAuthenticateProtectedShareController extends Controller
 {
     /**
      * Check Password for protected item