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

---
 .../Items/Actions/MoveFileOrFolderAction.php       |  1 -
 .../Controllers/MoveFileOrFolderController.php     | 14 ++++++++++----
 src/Domain/Items/Requests/MoveItemRequest.php      |  7 ++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Domain/Items/Actions/MoveFileOrFolderAction.php b/src/Domain/Items/Actions/MoveFileOrFolderAction.php
index 88abdbf0..65d05994 100644
--- a/src/Domain/Items/Actions/MoveFileOrFolderAction.php
+++ b/src/Domain/Items/Actions/MoveFileOrFolderAction.php
@@ -43,7 +43,6 @@ class MoveFileOrFolderAction
 
             // Process file
             if ($item['type'] !== 'folder') {
-                // Update file
                 $entry->update([
                     'parent_id' => $request->input('to_id'),
                 ]);
diff --git a/src/Domain/Items/Controllers/MoveFileOrFolderController.php b/src/Domain/Items/Controllers/MoveFileOrFolderController.php
index 4c6ad424..df8d136c 100644
--- a/src/Domain/Items/Controllers/MoveFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/MoveFileOrFolderController.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\MoveItemRequest;
 use Domain\Items\Actions\MoveFileOrFolderAction;
@@ -18,13 +18,19 @@ class MoveFileOrFolderController extends Controller
      */
     public function __invoke(
         MoveItemRequest $request,
-    ): Response {
+    ): JsonResponse {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Items was successfully moved.',
+        ];
+
         if (is_demo_account()) {
-            abort(204, 'Done.');
+            return response()->json($successMessage);
         }
 
+        // Move items
         ($this->moveFileOrFolder)($request);
 
-        return response('Done.', 204);
+        return response()->json($successMessage);
     }
 }
diff --git a/src/Domain/Items/Requests/MoveItemRequest.php b/src/Domain/Items/Requests/MoveItemRequest.php
index 04e75a8c..ac4ee833 100644
--- a/src/Domain/Items/Requests/MoveItemRequest.php
+++ b/src/Domain/Items/Requests/MoveItemRequest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -23,9 +24,9 @@ class MoveItemRequest extends FormRequest
     public function rules()
     {
         return [
-            'to_id'         => 'nullable|uuid',
-            'items[*].type' => 'required|string',
-            'items[*].id'   => 'required|uuid',
+            'to_id'        => 'nullable|uuid',
+            'items.*.type' => 'required|string',
+            'items.*.id'   => 'required|uuid',
         ];
     }
 }