controller refactoring part 3

routes/api.php

@@ -5,8 +5,10 @@ use Domain\Sharing\Controllers\ShareController;
 use Domain\Items\Controllers\EditItemsController;
 use Domain\Trash\Controllers\DumpTrashController;
 use App\Users\Controllers\ResetPasswordController;
+use Domain\Zipping\Controllers\ZipFilesController;
 use App\Users\Controllers\ForgotPasswordController;
 use Domain\Folders\Controllers\FavouriteController;
+use Domain\Zipping\Controllers\ZipFolderController;
 use Domain\Homepage\Controllers\AppFunctionsController;
 use Domain\Sharing\Controllers\ShareViaEmailController;
 use Domain\Trash\Controllers\RestoreTrashContentController;
@@ -68,8 +70,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post('/upload', [EditItemsController::class, 'upload']);
     Route::post('/move', [EditItemsController::class, 'move']);
 
-    Route::group(['prefix' => 'zip'], function () {
-        Route::post('/files', [EditItemsController::class, 'zip_multiple_files']);
-        Route::get('/folder/{id}', [EditItemsController::class, 'zip_folder']);
+    Route::group(['prefix' => ''], function () {
+        Route::post('/files', ZipFilesController::class);
+        Route::get('/folder/{id}', ZipFolderController::class);
     });
 });

src/App/Users/Actions/CreateNewUserAction.php

@@ -22,10 +22,11 @@ class CreateNewUserAction extends Controller
     }
 
     /**
-     * Validate and create a newly registered user.
+     * Validate and create a new user.
      */
-    public function __invoke(Request $request): Response
-    {
+    public function __invoke(
+        Request $request
+    ): Response {
         $settings = Setting::whereIn('name', [
             'storage_default', 'registration',
         ])

src/Domain/Items/Controllers/EditItemsController.php

@@ -7,7 +7,6 @@ use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
 use Support\Demo\Actions\DemoService;
 use Illuminate\Database\Eloquent\Model;
 use Domain\Files\Requests\UploadRequest;
@@ -115,49 +114,4 @@ class EditItemsController extends Controller
 
         return response('Done!', 204);
     }
-
-    /**
-     * User download folder via zip
-     *
-     * @param $id
-     * @return string
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function zip_folder($id)
-    {
-        $folder = Folder::whereUserId(Auth::id())
-            ->where('id', $id);
-
-        if (! $folder->exists()) {
-            abort(404, "Requested folder doesn't exists.");
-        }
-
-        $zip = $this->filemanager->zip_folder($id);
-
-        return response([
-            'url'  => route('zip', $zip->id),
-            'name' => $zip->basename,
-        ], 201);
-    }
-
-    /**
-     * User download multiple files via zip
-     *
-     * @param Request $request
-     * @return string
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function zip_multiple_files(Request $request)
-    {
-        $files = File::whereUserId(Auth::id())
-            ->whereIn('id', $request->input('items'))
-            ->get();
-
-        $zip = $this->filemanager->zip_files($files);
-
-        return response([
-            'url'  => route('zip', $zip->id),
-            'name' => $zip->basename,
-        ], 201);
-    }
 }

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -3,6 +3,7 @@ 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;
@@ -12,6 +13,8 @@ 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;
@@ -222,14 +225,12 @@ class ManipulateShareItemsController extends Controller
 
     /**
      * Guest download folder via zip
-     *
-     * @param $id
-     * @param Share $shared
-     * @return string
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function zip_folder($id, Share $shared)
-    {
+    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);
 
@@ -244,7 +245,7 @@ class ManipulateShareItemsController extends Controller
             abort(404, 'Requested folder doesn\'t exists.');
         }
 
-        $zip = $this->filemanager->zip_folder($id, $shared);
+        $zip = ($zipFolder)($id, $shared);
 
         // Get file
         return response([
@@ -258,14 +259,12 @@ class ManipulateShareItemsController extends Controller
 
     /**
      * Guest download multiple files via zip
-     *
-     * @param Request $request
-     * @param Share $shared
-     * @return string
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function zip_multiple_files(Request $request, Share $shared)
-    {
+    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);
 
@@ -283,7 +282,7 @@ class ManipulateShareItemsController extends Controller
             ->whereIn('id', $request->items)
             ->get();
 
-        $zip = $this->filemanager->zip_files($files, $shared);
+        $zip = ($zipFiles)($files, $shared);
 
         // Get file
         return response([

src/Domain/Sharing/Controllers/ShareController.php

@@ -30,12 +30,13 @@ class ShareController extends Controller
         CreateShareRequest $request,
         SendLinkToEmailAction $sendLinkToEmailAction,
     ): ShareResource {
-
         $shared = Share::create([
             'password'     => $request->has('password')
                 ? bcrypt($request->input('password'))
                 : null,
-            'type'         => $request->input('type') === 'folder' ? 'folder' : 'file',
+            'type'         => $request->input('type') === 'folder'
+                ? 'folder'
+                : 'file',
             'is_protected' => $request->input('isPassword'),
             'permission'   => $request->input('permission') ?? null,
             'expire_in'    => $request->input('expiration') ?? null,
@@ -60,13 +61,8 @@ class ShareController extends Controller
      */
     public function update(
         UpdateShareRequest $request,
-        string $id,
+        Share $shared,
     ): ShareResource {
-        // Get sharing record
-        $shared = Share::where('id', $id)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
-
         // Update sharing record
         $shared->update([
             'permission'   => $request->input('permission'),

src/Domain/Zipping/Actions/ZipFilesAction.php

@@ -0,0 +1,70 @@
+<?php
+namespace Domain\Zipping\Actions;
+
+use Illuminate\Support\Str;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+use League\Flysystem\FileNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class ZipFilesAction
+{
+    /**
+     * Zip selected files, store it in /zip folder and retrieve zip record
+     */
+    public function __invoke(
+        File | Collection $files,
+        ?Share $shared = null,
+    ): Zip {
+        // Local storage instance
+        $disk_local = Storage::disk('local');
+
+        // Move file to local storage from external storage service
+        if (! is_storage_driver('local')) {
+            $files->each(function ($file) use ($disk_local) {
+                try {
+                    $disk_local->put("temp/$file->basename", Storage::get("files/$file->user_id/$file->basename"));
+                } catch (FileNotFoundException $e) {
+                    throw new HttpException(404, 'File not found');
+                }
+            });
+        }
+
+        // Get zip path
+        $zip_name = Str::random() . '.zip';
+
+        // Create zip
+        $zipper = new \Madnest\Madzipper\Madzipper;
+        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
+
+        // Add files to zip
+        $files->each(function ($file) use ($zip, $disk_local) {
+            $file_path = is_storage_driver('local')
+                ? $disk_local->path("files/$file->user_id/$file->basename")
+                : $disk_local->path("temp/$file->basename");
+
+            $zip->addString("$file->name.$file->mimetype", File::get($file_path));
+        });
+
+        // Close zip
+        //$zip->close();
+
+        // Delete temporary files
+        if (! is_storage_driver('local')) {
+            $files->each(function ($file) use ($disk_local) {
+                $disk_local->delete("temp/$file->basename");
+            });
+        }
+
+        // Store zip record
+        return Zip::create([
+            'user_id'      => $shared->user_id ?? Auth::id(),
+            'shared_token' => $shared->token ?? null,
+            'basename'     => $zip_name,
+        ]);
+    }
+}

src/Domain/Zipping/Actions/ZipFolderAction.php

@@ -0,0 +1,81 @@
+<?php
+namespace Domain\Zipping\Actions;
+
+use Illuminate\Support\Str;
+use Domain\Zipping\Models\Zip;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+use League\Flysystem\FileNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class ZipFolderAction
+{
+    /**
+     * Zip requested folder
+     */
+    public function __invoke(
+        $id,
+        ?Share $shared = null
+    ): Zip {
+        // Get folder
+        $requested_folder = Folder::with(['folders.files', 'files'])
+            ->where('id', $id)
+            ->where('user_id', Auth::id() ?? $shared->user_id)
+            ->with('folders')
+            ->first();
+
+        $files = get_files_for_zip($requested_folder, collect([]));
+
+        // Local storage instance
+        $disk_local = Storage::disk('local');
+
+        // Move file to local storage from external storage service
+        if (! is_storage_driver('local')) {
+            foreach ($files as $file) {
+                try {
+                    $disk_local->put("temp/{$file['basename']}", Storage::get("files/$requested_folder->user_id/{$file['basename']}"));
+                } catch (FileNotFoundException $e) {
+                    throw new HttpException(404, 'File not found');
+                }
+            }
+        }
+
+        // Get zip path
+        $zip_name = Str::random(16) . '-' . Str::slug($requested_folder->name) . '.zip';
+
+        // Create zip
+        $zipper = new \Madnest\Madzipper\Madzipper;
+        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
+
+        // Add files to zip
+        foreach ($files as $file) {
+            $file_path = is_storage_driver('local')
+                ? $disk_local->path("files/$requested_folder->user_id/{$file['basename']}")
+                : $disk_local->path("temp/{$file['basename']}");
+
+            $zip
+                ->folder($file['folder_path'])
+                ->addString("{$file['name']}.{$file['mimetype']}", File::get($file_path));
+        }
+
+        // Close zip
+        //$zip->close();
+
+        // Delete temporary files
+        if (! is_storage_driver('local')) {
+            foreach ($files as $file) {
+                $disk_local->delete('temp/' . $file['basename']);
+            }
+        }
+
+        // Store zip record
+        return Zip::create([
+            'user_id'      => $shared->user_id ?? Auth::id(),
+            'shared_token' => $shared->token ?? null,
+            'basename'     => $zip_name,
+        ]);
+    }
+}

src/Domain/Zipping/Controllers/ZipFilesController.php

@@ -0,0 +1,28 @@
+<?php
+namespace Domain\Zipping\Controllers;
+
+use Illuminate\Http\Request;
+use Domain\Files\Models\File;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+use Domain\Zipping\Actions\ZipFilesAction;
+
+class ZipFilesController extends Controller
+{
+    public function __invoke(
+        Request $request,
+        ZipFilesAction $zipFiles,
+    ): Response {
+        $files = File::whereUserId(Auth::id())
+            ->whereIn('id', $request->input('items'))
+            ->get();
+
+        $zip = ($zipFiles)($files);
+
+        return response([
+            'url'  => route('zip', $zip->id),
+            'name' => $zip->basename,
+        ], 201);
+    }
+}

src/Domain/Zipping/Controllers/ZipFolderController.php

@@ -0,0 +1,30 @@
+<?php
+namespace Domain\Zipping\Controllers;
+
+use Illuminate\Http\Response;
+use Domain\Folders\Models\Folder;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+use Domain\Zipping\Actions\ZipFolderAction;
+
+class ZipFolderController extends Controller
+{
+    public function __invoke(
+        string $id,
+        ZipFolderAction $zipFolder,
+    ): Response {
+        $folder = Folder::whereUserId(Auth::id())
+            ->where('id', $id);
+
+        if (! $folder->exists()) {
+            abort(404, "Requested folder doesn't exists.");
+        }
+
+        $zip = ($zipFolder)($id);
+
+        return response([
+            'url'  => route('zip', $zip->id),
+            'name' => $zip->basename,
+        ], 201);
+    }
+}

src/Support/Services/FileManagerService.php

@@ -4,17 +4,13 @@ namespace Support\Services;
 use DB;
 use App\Users\Models\User;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use Domain\Zipping\Models\Zip;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Domain\Files\Models\File as UserFile;
-use League\Flysystem\FileNotFoundException;
 use Domain\Items\Requests\RenameItemRequest;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class FileManagerService
 {
@@ -23,133 +19,6 @@ class FileManagerService
     ) {
     }
 
-    /**
-     * Zip requested folder
-     *
-     * @param $id
-     * @param $shared
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function zip_folder($id, $shared = null)
-    {
-        // Get folder
-        $requested_folder = Folder::with(['folders.files', 'files'])
-            ->where('id', $id)
-            ->where('user_id', Auth::id() ?? $shared->user_id)
-            ->with('folders')
-            ->first();
-
-        $files = get_files_for_zip($requested_folder, collect([]));
-
-        // Local storage instance
-        $disk_local = Storage::disk('local');
-
-        // Move file to local storage from external storage service
-        if (! is_storage_driver('local')) {
-            foreach ($files as $file) {
-                try {
-                    $disk_local->put("temp/{$file['basename']}", Storage::get("files/$requested_folder->user_id/{$file['basename']}"));
-                } catch (FileNotFoundException $e) {
-                    throw new HttpException(404, 'File not found');
-                }
-            }
-        }
-
-        // Get zip path
-        $zip_name = Str::random(16) . '-' . Str::slug($requested_folder->name) . '.zip';
-
-        // Create zip
-        $zipper = new \Madnest\Madzipper\Madzipper;
-        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
-
-        // Add files to zip
-        foreach ($files as $file) {
-            $file_path = is_storage_driver('local')
-                ? $disk_local->path("files/$requested_folder->user_id/{$file['basename']}")
-                : $disk_local->path("temp/{$file['basename']}");
-
-            $zip
-                ->folder($file['folder_path'])
-                ->addString("{$file['name']}.{$file['mimetype']}", File::get($file_path));
-        }
-
-        // Close zip
-        //$zip->close();
-
-        // Delete temporary files
-        if (! is_storage_driver('local')) {
-            foreach ($files as $file) {
-                $disk_local->delete('temp/' . $file['basename']);
-            }
-        }
-
-        // Store zip record
-        return Zip::create([
-            'user_id'      => $shared->user_id ?? Auth::id(),
-            'shared_token' => $shared->token ?? null,
-            'basename'     => $zip_name,
-        ]);
-    }
-
-    /**
-     * Zip selected files, store it in /zip folder and retrieve zip record
-     *
-     * @param $files
-     * @param null $shared
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function zip_files($files, $shared = null)
-    {
-        // Local storage instance
-        $disk_local = Storage::disk('local');
-
-        // Move file to local storage from external storage service
-        if (! is_storage_driver('local')) {
-            $files->each(function ($file) use ($disk_local) {
-                try {
-                    $disk_local->put("temp/$file->basename", Storage::get("files/$file->user_id/$file->basename"));
-                } catch (FileNotFoundException $e) {
-                    throw new HttpException(404, 'File not found');
-                }
-            });
-        }
-
-        // Get zip path
-        $zip_name = Str::random(16) . '.zip';
-
-        // Create zip
-        $zipper = new \Madnest\Madzipper\Madzipper;
-        $zip = $zipper->make($disk_local->path("zip/$zip_name"));
-
-        // Add files to zip
-        $files->each(function ($file) use ($zip, $disk_local) {
-            $file_path = is_storage_driver('local')
-                ? $disk_local->path("files/$file->user_id/$file->basename")
-                : $disk_local->path("temp/$file->basename");
-
-            $zip->addString("$file->name.$file->mimetype", File::get($file_path));
-        });
-
-        // Close zip
-        //$zip->close();
-
-        // Delete temporary files
-        if (! is_storage_driver('local')) {
-            $files->each(function ($file) use ($disk_local) {
-                $disk_local->delete("temp/$file->basename");
-            });
-        }
-
-        // Store zip record
-        return Zip::create([
-            'user_id'      => $shared->user_id ?? Auth::id(),
-            'shared_token' => $shared->token ?? null,
-            'basename'     => $zip_name,
-        ]);
-    }
-
     /**
      * Create new directory
      *

tests/TestCase.php

@@ -25,6 +25,6 @@ abstract class TestCase extends BaseTestCase
 
         resolve(SetupService::class)->create_directories();
 
-        $this->withoutExceptionHandling();
+        //$this->withoutExceptionHandling();
     }
 }