From 9ed2eec09233dd3dac27be0c7af086a21a012e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 3 May 2022 08:27:14 +0200
Subject: [PATCH] delete api update

---
 .../Items/Actions/DeleteFileOrFolderAction.php      |  8 ++++++++
 .../Controllers/DeleteFileOrFolderController.php    | 13 +++++++++----
 .../Controllers/RenameFileOrFolderController.php    |  4 +---
 src/Domain/Items/Requests/DeleteItemRequest.php     |  8 +++++---
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Domain/Items/Actions/DeleteFileOrFolderAction.php b/src/Domain/Items/Actions/DeleteFileOrFolderAction.php
index ba68f4b8..1bc2318f 100644
--- a/src/Domain/Items/Actions/DeleteFileOrFolderAction.php
+++ b/src/Domain/Items/Actions/DeleteFileOrFolderAction.php
@@ -26,6 +26,10 @@ class DeleteFileOrFolderAction
                 ->with('folders')
                 ->find($id);
 
+            if (! $folder) {
+                return;
+            }
+
             Gate::authorize('can-edit', [$folder, $shared]);
 
             // Get folder shared record
@@ -85,6 +89,10 @@ class DeleteFileOrFolderAction
             $file = File::withTrashed()
                 ->find($id);
 
+            if (! $file) {
+                return;
+            }
+
             Gate::authorize('can-edit', [$file, $shared]);
 
             // Get folder shared record
diff --git a/src/Domain/Items/Controllers/DeleteFileOrFolderController.php b/src/Domain/Items/Controllers/DeleteFileOrFolderController.php
index 7efa600d..f923a40f 100644
--- a/src/Domain/Items/Controllers/DeleteFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/DeleteFileOrFolderController.php
@@ -1,7 +1,7 @@
 <?php
 namespace Domain\Items\Controllers;
 
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
 use Domain\Items\Requests\DeleteItemRequest;
 use Domain\Items\Actions\DeleteFileOrFolderAction;
@@ -18,15 +18,20 @@ class DeleteFileOrFolderController extends Controller
      */
     public function __invoke(
         DeleteItemRequest $request,
-    ): Response {
+    ): JsonResponse {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Items was successfully deleted.',
+        ];
+
         if (is_demo_account()) {
-            abort(204, 'Done.');
+            return response()->json($successMessage);
         }
 
         foreach ($request->input('items') as $item) {
             ($this->deleteFileOrFolder)($item, $item['id']);
         }
 
-        return response('Done', 204);
+        return response()->json($successMessage);
     }
 }
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index 9321d1ec..2e4deb71 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -1,8 +1,6 @@
 <?php
 namespace Domain\Items\Controllers;
 
-use Domain\Files\Models\File;
-use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Domain\Files\Resources\FileResource;
 use Domain\Folders\Resources\FolderResource;
@@ -29,7 +27,7 @@ class RenameFileOrFolderController extends Controller
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): FileResource | FolderResource | File | Folder | array {
+    ): FileResource|FolderResource {
         if (is_demo_account()) {
             $item = ($this->fakeRenameFileOrFolder)($request, $id);
 
diff --git a/src/Domain/Items/Requests/DeleteItemRequest.php b/src/Domain/Items/Requests/DeleteItemRequest.php
index 1f21ae0c..06af3254 100644
--- a/src/Domain/Items/Requests/DeleteItemRequest.php
+++ b/src/Domain/Items/Requests/DeleteItemRequest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -23,9 +24,10 @@ class DeleteItemRequest extends FormRequest
     public function rules()
     {
         return [
-            'data[*].force_delete' => 'required|boolean',
-            'data[*].type'         => 'required|string',
-            'data[*].id'           => 'required|integer',
+            'items'                => 'array',
+            'items.*.force_delete' => 'required|boolean',
+            'items.*.type'         => 'required|string',
+            'items.*.id'           => 'required|uuid',
         ];
     }
 }