trash api update

src/Domain/Trash/Controllers/DumpTrashController.php

@@ -2,57 +2,54 @@
 namespace Domain\Trash\Controllers;
 
 use Domain\Files\Models\File;
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 
 class DumpTrashController extends Controller
 {
-    public function __invoke(): Response
+    public function __invoke(): JsonResponse
     {
-        abort_if(
-            is_demo_account(),
-            204,
-            'Done.'
-        );
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'The trash was successfully dumped.',
+        ];
 
-        $user_id = Auth::id();
-
-        // Get files and folders
-        $folders = Folder::onlyTrashed()
-            ->where('user_id', $user_id)
-            ->get();
-
-        $files = File::onlyTrashed()
-            ->where('user_id', $user_id)
-            ->get();
-
-        // Force delete folder
-        $folders->each->forceDelete();
-
-        // Force delete files
-        foreach ($files as $file) {
-            // Delete file
-            Storage::delete("/files/$user_id/{$file->basename}");
-
-            // Delete thumbnail if exist
-            if ($file->thumbnail) {
-                collect([
-                    config('vuefilemanager.image_sizes.later'),
-                    config('vuefilemanager.image_sizes.immediately'),
-                ])->collapse()
-                    ->each(function ($size) use ($file) {
-                        Storage::delete("/files/$file->user_id/{$size['name']}-{$file->basename}");
-                    });
-            }
-
-            // Delete file permanently
-            $file->forceDelete();
+        if (is_demo_account()) {
+            return response()->json($successMessage);
         }
 
+        // Delete folders
+        Folder::onlyTrashed()
+            ->where('user_id', auth()->id())
+            ->cursor()
+            ->each(fn($folder) => $folder->forceDelete());
+
+        // Delete files
+        File::onlyTrashed()
+            ->where('user_id', auth()->id())
+            ->cursor()
+            ->each(function ($file) {
+                // Delete file
+                Storage::delete("/files/$file->user_id/$file->basename");
+
+                // Delete thumbnail if exist
+                if ($file->thumbnail) {
+                    collect([
+                        config('vuefilemanager.image_sizes.later'),
+                        config('vuefilemanager.image_sizes.immediately'),
+                    ])->collapse()
+                        ->each(function ($size) use ($file) {
+                            Storage::delete("/files/$file->user_id/{$size['name']}-$file->basename");
+                        });
+                }
+
+                // Delete file permanently
+                $file->forceDelete();
+            });
+
         // Return response
-        return response('Done.', 204);
+        return response()->json($successMessage);
     }
 }

src/Domain/Trash/Controllers/RestoreTrashContentController.php

@@ -1,68 +1,37 @@
 <?php
 namespace Domain\Trash\Controllers;
 
-use Illuminate\Http\Request;
-use Domain\Files\Models\File;
-use Illuminate\Http\Response;
-use Domain\Folders\Models\Folder;
+use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Validator;
+use Domain\Trash\Requests\RestoreTrashContentRequest;
 
 class RestoreTrashContentController extends Controller
 {
     public function __invoke(
-        Request $request
-    ): Response {
-        abort_if(is_demo_account(), 204, 'Done.');
+        RestoreTrashContentRequest $request
+    ): JsonResponse {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'The item was successfully restored.',
+        ];
 
-        // TODO: zrefaktorovat validator do requestu
-        $validator = Validator::make($request->input('items'), [
-            '*.type' => 'required|string',
-            '*.id'   => 'string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) {
-            abort(400, 'Bad input');
+        if (is_demo_account()) {
+            return response()->json($successMessage);
         }
 
-        // Get user id
-        $user_id = Auth::id();
+        foreach ($request->input('items') as $item) {
+            $entry = get_item($item['type'], $item['id']);
 
-        foreach ($request->input('items') as $restore) {
-            // Get folder
-            if ($restore['type'] === 'folder') {
-                // Get folder
-                $item = Folder::onlyTrashed()
-                    ->where('user_id', $user_id)
-                    ->where('id', $restore['id'])
-                    ->first();
-
-                // Restore item to home directory
-                if ($request->has('to_home') && $request->to_home) {
-                    $item->parent_id = null;
-                    $item->save();
-                }
-            } else {
-                // Get item
-                $item = File::onlyTrashed()
-                    ->where('user_id', $user_id)
-                    ->where('id', $restore['id'])
-                    ->first();
-
-                // Restore item to home directory
-                if ($request->has('to_home') && $request->to_home) {
-                    $item->parent_id = null;
-                    $item->save();
-                }
+            // Restore item to home directory
+            if ($request->has('to_home') && $request->input('to_home')) {
+                $entry->update(['parent_id' => null]);
             }
 
             // Restore Item
-            $item->restore();
+            $entry->restore();
         }
 
         // Return response
-        return response('Done.', 204);
+        return response()->json($successMessage);
     }
 }

src/Domain/Trash/Requests/RestoreTrashContentRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Domain\Trash\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RestoreTrashContentRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'to_home'      => 'sometimes|boolean',
+            'items'        => 'array',
+            'items.*.type' => 'required|string',
+            'items.*.id'   => 'required|uuid',
+        ];
+    }
+}