api resource refactoring part 5

src/App/Users/Models/User.php

@@ -147,8 +147,7 @@ class User extends Authenticatable implements MustVerifyEmail
     public function favouriteFolders(): BelongsToMany
     {
         return $this->belongsToMany(Folder::class, 'favourite_folder', 'user_id', 'folder_id', 'id', 'id')
-            ->where('team_folder', false)
-            ->with('shared:token,id,item_id,permission,is_protected,expire_in');
+            ->where('team_folder', false);
     }
 
     /**

src/App/Users/Resources/UserResource.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Users\Resources;
 
+use Domain\Folders\Resources\FolderCollection;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource
@@ -50,15 +51,7 @@ class UserResource extends JsonResource
                             ],
                         ],
                     ],
-                    'favourites' => [
-                        'data' => [
-                            'id'         => $this->id,
-                            'type'       => 'favourite_folders',
-                            'attributes' => [
-                                'folders' => $this->favouriteFolders->makeHidden(['pivot']),
-                            ],
-                        ],
-                    ],
+                    'favourites' => new FolderCollection($this->favouriteFolders),
                 ],
             ],
         ];

src/Domain/Browsing/Controllers/BrowseTrashContentController.php

@@ -32,8 +32,9 @@ class BrowseTrashContentController
 
             // Collect folders and files to single array
             return [
-                'content' => collect([$folders, $files])->collapse(),
-                'folder'  => $requestedFolder,
+                'folders' => new FolderCollection($folders),
+                'files'   => new FilesCollection($files),
+                'root'    => $requestedFolder,
             ];
         }
 

src/Domain/Files/Resources/FileResource.php

@@ -43,6 +43,17 @@ class FileResource extends JsonResource
                     $this->mergeWhen($this->shared, fn() => [
                         'shared' => new ShareResource($this->shared),
                     ]),
+                    $this->mergeWhen($this->parent, fn() => [
+                        'parent' => [
+                            'data' => [
+                                'type'       => 'folder',
+                                'id'         => $this->parent->id,
+                                'attributes' => [
+                                    'name' => $this->parent->name,
+                                ],
+                            ],
+                        ],
+                    ]),
                 ]
             ],
         ];

src/Domain/Folders/Resources/FolderResource.php

@@ -43,6 +43,17 @@ class FolderResource extends JsonResource
                     $this->mergeWhen($this->shared, fn() => [
                         'shared' => new ShareResource($this->shared),
                     ]),
+                    $this->mergeWhen($this->parent, fn() => [
+                        'parent' => [
+                            'data' => [
+                                'type'       => 'folder',
+                                'id'         => $this->parent->id,
+                                'attributes' => [
+                                    'name' => $this->parent->name,
+                                ],
+                            ],
+                        ],
+                    ]),
                 ],
             ],
         ];