controller refactoring part 6

routes/api.php

@@ -1,20 +1,20 @@
 <?php
 
 use App\Users\Actions\CreateNewUserAction;
-use Domain\Files\Controllers\UploadFilesController;
 use Domain\Pages\Controllers\PagesController;
-use Domain\Sharing\Controllers\ShareController;
 use Domain\Items\Controllers\EditItemsController;
+use Domain\Sharing\Controllers\ShareController;
+use Domain\Sharing\Controllers\ShareViaEmailController;
 use Domain\Trash\Controllers\DumpTrashController;
 use App\Users\Controllers\ResetPasswordController;
 use Domain\Zipping\Controllers\ZipFilesController;
 use App\Users\Controllers\ForgotPasswordController;
+use Domain\Files\Controllers\UploadFilesController;
 use Domain\Folders\Controllers\FavouriteController;
 use Domain\Plans\Controllers\ActivePlansController;
 use Domain\Settings\Controllers\SettingsController;
 use Domain\Zipping\Controllers\ZipFolderController;
 use Domain\Folders\Controllers\CreateFolderController;
-use Domain\Sharing\Controllers\ShareViaEmailController;
 use Domain\Trash\Controllers\RestoreTrashContentController;
 use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;

routes/share.php

@@ -1,23 +1,28 @@
 <?php
 
-use Domain\Sharing\Controllers\ShareController;
-use Domain\Sharing\Controllers\BrowseShareController;
+use Domain\Files\Controllers\EditorUploadFilesController;
 use Domain\Homepage\Controllers\AppFunctionsController;
+use Domain\Folders\Controllers\EditorCreateFolderController;
+use Domain\Sharing\Controllers\BrowseShareController;
 use Domain\Sharing\Controllers\ManipulateShareItemsController;
+use Domain\Sharing\Controllers\ShareController;
+use Domain\Zipping\Controllers\EditorZipFilesController;
+use Domain\Zipping\Controllers\EditorZipFolderController;
 
 // Browse functions
 Route::group(['prefix' => 'editor'], function () {
-    Route::post('/create-folder/{shared}', [ManipulateShareItemsController::class, 'create_folder']);
+    Route::post('/create-folder/{shared}', EditorCreateFolderController::class);
+    Route::post('/upload/{shared}', EditorUploadFilesController::class);
+
     Route::patch('/rename/{id}/{shared}', [ManipulateShareItemsController::class, 'rename_item']);
     Route::post('/remove/{shared}', [ManipulateShareItemsController::class, 'delete_item']);
-    Route::post('/upload/{shared}', [ManipulateShareItemsController::class, 'upload']);
     Route::post('/move/{shared}', [ManipulateShareItemsController::class, 'move']);
 });
 
 // Zip shared items
 Route::group(['prefix' => 'zip'], function () {
-    Route::post('/files/{shared}', [ManipulateShareItemsController::class, 'zip_multiple_files']);
-    Route::get('/folder/{id}/{shared}', [ManipulateShareItemsController::class, 'zip_folder']);
+    Route::post('/files/{shared}', EditorZipFilesController::class);
+    Route::get('/folder/{id}/{shared}', EditorZipFolderController::class);
 });
 
 // Browse share content

routes/web.php

@@ -2,7 +2,7 @@
 
 use Domain\Admin\Controllers\InvoiceController;
 use Domain\Homepage\Controllers\IndexController;
-use Domain\Sharing\Controllers\BrowseShareController;
+use Domain\Folders\Controllers\BrowseShareController;
 use Domain\Homepage\Controllers\AppFunctionsController;
 use Domain\SetupWizard\Controllers\SetupWizardController;
 use Domain\Subscriptions\Controllers\StripeWebhookController;

src/Domain/Files/Actions/UploadFilesAction.php

@@ -1,23 +1,21 @@
 <?php
-
-
 namespace Domain\Files\Actions;
 
-
 use App\Users\Models\User;
-use Domain\Files\Models\File as UserFile;
-use Domain\Files\Requests\UploadRequest;
 use Domain\Sharing\Models\Share;
+use Support\Services\HelperService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
-use Support\Services\HelperService;
+use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Models\File as UserFile;
 
 class UploadFilesAction
 {
     public function __construct(
         public HelperService $helper,
-    ) {}
+    ) {
+    }
 
     /**
      * Upload new file

src/Domain/Files/Controllers/EditorUploadFilesController.php

@@ -0,0 +1,51 @@
+<?php
+namespace Domain\Files\Controllers;
+
+use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
+use Support\Services\HelperService;
+use App\Http\Controllers\Controller;
+use Support\Demo\Actions\DemoService;
+use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Actions\UploadFilesAction;
+
+/**
+ * guest user upload file into shared folder
+ */
+class EditorUploadFilesController extends Controller
+{
+    public function __construct(
+        public HelperService $helper,
+        public DemoService $demo,
+    ) {
+    }
+
+    public function __invoke(
+        UploadFilesAction $uploadFile,
+        UploadRequest $request,
+        Share $shared,
+    ): Response | array {
+        if (is_demo_account($shared->user->email)) {
+            return $this->demo->upload($request);
+        }
+
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check shared permission
+        if (is_visitor($shared)) {
+            abort(403);
+        }
+
+        // Check access to requested directory
+        $this->helper->check_item_access($request->folder_id, $shared);
+
+        // Return new uploaded file
+        $new_file = ($uploadFile)($request, $shared);
+
+        // Set public access url
+        $new_file->setPublicUrl($shared->token);
+
+        return response($new_file, 201);
+    }
+}

src/Domain/Files/Controllers/UploadFilesController.php

@@ -1,13 +1,10 @@
 <?php
-
-
 namespace Domain\Files\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Domain\Files\Actions\UploadFilesAction;
 use Domain\Files\Models\File;
+use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Actions\UploadFilesAction;
 
 class UploadFilesController extends Controller
 {

src/Domain/Folders/Controllers/CreateFolderController.php

@@ -11,7 +11,8 @@ class CreateFolderController extends Controller
 {
     public function __construct(
         public DemoService $demo
-    ) {}
+    ) {
+    }
 
     /**
      * Create new folder for authenticated master|editor user

src/Domain/Folders/Controllers/EditorCreateFolderController.php

@@ -0,0 +1,48 @@
+<?php
+namespace Domain\Folders\Controllers;
+
+use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
+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
+{
+    public function __construct(
+        public HelperService $helper,
+        public DemoService $demo,
+    ) {
+    }
+
+    public function __invoke(
+        CreateFolderAction $createFolder,
+        CreateFolderRequest $request,
+        Share $shared,
+    ): Response | array {
+        if (is_demo_account($shared->user->email)) {
+            return $this->demo->create_folder($request);
+        }
+
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check shared permission
+        if (is_visitor($shared)) {
+            abort(403);
+        }
+
+        // Check access to requested directory
+        $this->helper->check_item_access($request->parent_id, $shared);
+
+        // Create folder
+        $folder = ($createFolder)($request, $shared);
+
+        return response($folder, 201);
+    }
+}

src/Domain/Items/Controllers/EditItemsController.php

@@ -3,12 +3,9 @@ namespace Domain\Items\Controllers;
 
 use Exception;
 use Illuminate\Http\Request;
-use Domain\Files\Models\File;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Support\Demo\Actions\DemoService;
-use Illuminate\Database\Eloquent\Model;
-use Domain\Files\Requests\UploadRequest;
 use Support\Services\FileManagerService;
 use Domain\Items\Requests\MoveItemRequest;
 use Domain\Items\Requests\DeleteItemRequest;

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -9,15 +9,12 @@ use Domain\Folders\Models\Folder;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Support\Demo\Actions\DemoService;
-use Illuminate\Database\Eloquent\Model;
-use Domain\Files\Requests\UploadRequest;
 use Support\Services\FileManagerService;
 use Domain\Items\Requests\MoveItemRequest;
 use Domain\Zipping\Actions\ZipFilesAction;
 use Domain\Zipping\Actions\ZipFolderAction;
 use Domain\Items\Requests\DeleteItemRequest;
 use Domain\Items\Requests\RenameItemRequest;
-use Domain\Folders\Requests\CreateFolderRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class ManipulateShareItemsController extends Controller
@@ -29,37 +26,6 @@ class ManipulateShareItemsController extends Controller
     ) {
     }
 
-    /**
-     * Create new folder for guest user with edit permission
-     *
-     * @param CreateFolderRequest $request
-     * @param Share $shared
-     * @return array|\Illuminate\Contracts\Foundation\Application|ResponseFactory|\Illuminate\Http\Response
-     * @throws \Exception
-     */
-    public function create_folder(CreateFolderRequest $request, Share $shared)
-    {
-        if (is_demo_account($shared->user->email)) {
-            return $this->demo->create_folder($request);
-        }
-
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check shared permission
-        if (is_visitor($shared)) {
-            abort(403);
-        }
-
-        // Check access to requested directory
-        $this->helper->check_item_access($request->parent_id, $shared);
-
-        // Create folder
-        $folder = $this->filemanager->create_folder($request, $shared);
-
-        return response($folder, 201);
-    }
-
     /**
      * Rename item for guest user with edit permission
      *
@@ -147,40 +113,6 @@ class ManipulateShareItemsController extends Controller
         return response('Done', 204);
     }
 
-    /**
-     * Delete file for guest user with edit permission
-     *
-     * @param UploadRequest $request
-     * @param Share $shared
-     * @return File|\Illuminate\Contracts\Foundation\Application|ResponseFactory|Model|\Illuminate\Http\Response
-     * @throws \Exception
-     */
-    public function upload(UploadRequest $request, Share $shared)
-    {
-        if (is_demo_account($shared->user->email)) {
-            return $this->demo->upload($request);
-        }
-
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check shared permission
-        if (is_visitor($shared)) {
-            abort(403);
-        }
-
-        // Check access to requested directory
-        $this->helper->check_item_access($request->folder_id, $shared);
-
-        // Return new uploaded file
-        $new_file = $this->filemanager->upload($request, $shared);
-
-        // Set public access url
-        $new_file->setPublicUrl($shared->token);
-
-        return response($new_file, 201);
-    }
-
     /**
      * Move item for guest user with edit permission
      *
@@ -222,75 +154,4 @@ class ManipulateShareItemsController extends Controller
 
         return response('Done!', 204);
     }
-
-    /**
-     * Guest download folder via zip
-     */
-    public function zip_folder(
-        string $id,
-        Share $shared,
-        ZipFolderAction $zipFolder,
-    ): Response {
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check access to requested folder
-        $this->helper->check_item_access($id, $shared);
-
-        // Get folder
-        $folder = Folder::whereUserId($shared->user_id)
-            ->where('id', $id);
-
-        if (! $folder->exists()) {
-            abort(404, 'Requested folder doesn\'t exists.');
-        }
-
-        $zip = ($zipFolder)($id, $shared);
-
-        // Get file
-        return response([
-            'url' => route('zip_public', [
-                'id'    => $zip->id,
-                'token' => $shared->token,
-            ]),
-            'name' => $zip->basename,
-        ], 201);
-    }
-
-    /**
-     * Guest download multiple files via zip
-     */
-    public function zip_multiple_files(
-        Request $request,
-        Share $shared,
-        ZipFilesAction $zipFiles,
-    ): Response {
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        $file_parent_folders = File::whereUserId($shared->user_id)
-            ->whereIn('id', $request->items)
-            ->get()
-            ->pluck('folder_id')
-            ->toArray();
-
-        // Check access to requested directory
-        $this->helper->check_item_access($file_parent_folders, $shared);
-
-        // Get requested files
-        $files = File::whereUserId($shared->user_id)
-            ->whereIn('id', $request->items)
-            ->get();
-
-        $zip = ($zipFiles)($files, $shared);
-
-        // Get file
-        return response([
-            'url' => route('zip_public', [
-                'id'    => $zip->id,
-                'token' => $shared->token,
-            ]),
-            'name' => $zip->basename,
-        ], 201);
-    }
 }

src/Domain/Zipping/Controllers/EditorZipFilesController.php

@@ -0,0 +1,57 @@
+<?php
+
+
+namespace Domain\Zipping\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Zipping\Actions\ZipFilesAction;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Support\Services\HelperService;
+
+/**
+ * Guest download multiple files via zip
+ */
+class EditorZipFilesController extends Controller
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {}
+
+    public function __invoke(
+        ZipFilesAction $zipFiles,
+        Request $request,
+        Share $shared,
+    ): Response {
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        $file_parent_folders = File::whereUserId($shared->user_id)
+            ->whereIn('id', $request->items)
+            ->get()
+            ->pluck('folder_id')
+            ->toArray();
+
+        // Check access to requested directory
+        $this->helper->check_item_access($file_parent_folders, $shared);
+
+        // Get requested files
+        $files = File::whereUserId($shared->user_id)
+            ->whereIn('id', $request->items)
+            ->get();
+
+        $zip = ($zipFiles)($files, $shared);
+
+        // Get file
+        return response([
+            'url' => route('zip_public', [
+                'id'    => $zip->id,
+                'token' => $shared->token,
+            ]),
+            'name' => $zip->basename,
+        ], 201);
+    }
+}

src/Domain/Zipping/Controllers/EditorZipFolderController.php

@@ -0,0 +1,53 @@
+<?php
+
+
+namespace Domain\Zipping\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Folders\Models\Folder;
+use Domain\Sharing\Models\Share;
+use Domain\Zipping\Actions\ZipFolderAction;
+use Illuminate\Http\Response;
+use Support\Services\HelperService;
+
+/**
+ * Guest download folder via zip
+ */
+class EditorZipFolderController extends Controller
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {}
+
+    public function __invoke(
+        ZipFolderAction $zipFolder,
+        string $id,
+        Share $shared,
+    ): Response {
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check access to requested folder
+        $this->helper->check_item_access($id, $shared);
+
+        // Get folder
+        $folder = Folder::whereUserId($shared->user_id)
+            ->where('id', $id);
+
+        if (! $folder->exists()) {
+            abort(404, 'Requested folder doesn\'t exists.');
+        }
+
+        $zip = ($zipFolder)($id, $shared);
+
+        // Get file
+        return response([
+            'url' => route('zip_public', [
+                'id'    => $zip->id,
+                'token' => $shared->token,
+            ]),
+            'name' => $zip->basename,
+        ], 201);
+    }
+}