api resource refactoring part 4

src/Domain/Items/Controllers/RenameFileOrFolderController.php

@@ -5,7 +5,6 @@ use Auth;
 use App\Http\Controllers\Controller;
 use Domain\Files\Resources\FileResource;
 use Domain\Folders\Resources\FolderResource;
-use Illuminate\Database\Eloquent\Model;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
 use Domain\Folders\Actions\UpdateFolderPropertyAction;
@@ -36,7 +35,13 @@ class RenameFileOrFolderController extends Controller
             ($this->updateFolderProperty)($request, $id);
         }
 
-        // Rename Item
-        return ($this->renameFileOrFolder)($request, $id);
+        $item = ($this->renameFileOrFolder)($request, $id);
+
+        if ($request->input('type') === 'folder') {
+            return new FolderResource($item);
+        }
+
+        // Return updated item
+        return new FileResource($item);
     }
 }

src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php

@@ -1,6 +1,9 @@
 <?php
 namespace Domain\Items\Controllers;
 
+use Domain\Files\Resources\FileResource;
+use Domain\Folders\Resources\FolderResource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
@@ -62,10 +65,15 @@ class VisitorRenameFileOrFolderController extends Controller
         $item = ($this->renameFileOrFolder)($request, $id);
 
         // Set public url
-        if ($item->type !== 'folder') {
+        if ($request->input('type') !== 'folder') {
             $item->setPublicUrl($shared->token);
         }
 
-        return response($item, 201);
+        if ($request->input('type') === 'folder') {
+            return response(new FolderResource($item), 201);
+        }
+
+        // Return updated item
+        return response(new FileResource($item), 201);
     }
 }