controller refactoring part 1

src/Domain/Browsing/Controllers/BrowseController.php

@@ -1,215 +0,0 @@
-<?php
-namespace Domain\Browsing\Controllers;
-
-use App\Users\Models\User;
-use Illuminate\Http\Request;
-use Domain\Files\Models\File;
-use Domain\Sharing\Models\Share;
-use Domain\Folders\Models\Folder;
-use Illuminate\Support\Collection;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Domain\Items\Requests\SearchRequest;
-
-class BrowseController extends Controller
-{
-    /**
-     * Get directory with files
-     *
-     * @param Request $request
-     * @param $id
-     * @return Collection
-     */
-    public function folder(Request $request, $id)
-    {
-        $root_id = $id === 'undefined' ? null : $id;
-
-        // Get folder trash items
-        if ($request->query('trash')) {
-            // Get folders and files
-            $folders = Folder::onlyTrashed()
-                ->with('parent')
-                ->where('parent_id', $root_id)
-                ->sortable()
-                ->get();
-
-            $files = File::onlyTrashed()
-                ->with('parent')
-                ->where('folder_id', $root_id)
-                ->sortable()
-                ->get();
-
-            // Collect folders and files to single array
-            return collect([$folders, $files])->collapse();
-        }
-
-        // Get folders and files
-        $folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('parent_id', $root_id)
-            ->where('user_id', Auth::id())
-            ->sortable()
-            ->get();
-
-        $files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('folder_id', $root_id)
-            ->where('user_id', Auth::id())
-            ->sortable()
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])
-            ->collapse();
-    }
-
-    /**
-     * Get latest user uploads
-     *
-     * @return mixed
-     */
-    public function latest()
-    {
-        $user = User::with(['latest_uploads' => function ($query) {
-            $query->sortable(['created_at' => 'desc']);
-        }])
-            ->where('id', Auth::id())
-            ->first();
-
-        return $user->latest_uploads;
-    }
-
-    /**
-     * Get trashed files
-     *
-     * @return Collection
-     */
-    public function trash()
-    {
-        $user_id = Auth::id();
-
-        // Get folders and files
-        $folders_trashed = Folder::onlyTrashed()
-            ->with(['trashed_folders', 'parent'])
-            ->where('user_id', $user_id)
-            ->get(['parent_id', 'id', 'name']);
-
-        $folders = Folder::onlyTrashed()
-            ->with(['parent'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', filter_folders_ids($folders_trashed))
-            ->sortable()
-            ->get();
-
-        // Get files trashed
-        $files_trashed = File::onlyTrashed()
-            ->with(['parent'])
-            ->where('user_id', $user_id)
-            ->where(function ($query) use ($folders_trashed) {
-                $query->whereNull('folder_id');
-                $query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
-            })
-            ->sortable()
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files_trashed])
-            ->collapse();
-    }
-
-    /**
-     * Get user shared items
-     *
-     * @return Collection
-     */
-    public function shared()
-    {
-        $user_id = Auth::id();
-
-        // Get shared folders and files
-        $folder_ids = Share::where('user_id', $user_id)
-            ->where('type', 'folder')
-            ->pluck('item_id');
-
-        $file_ids = Share::where('user_id', $user_id)
-            ->where('type', '!=', 'folder')
-            ->pluck('item_id');
-
-        // Get folders and files
-        $folders = Folder::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', $folder_ids)
-            ->sortable()
-            ->get();
-
-        $files = File::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-            ->where('user_id', $user_id)
-            ->whereIn('id', $file_ids)
-            ->sortable()
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])
-            ->collapse();
-    }
-
-    /**
-     * Get participant uploads
-     *
-     * @return mixed
-     */
-    public function participant_uploads()
-    {
-        return File::with(['parent'])
-            ->where('user_id', Auth::id())
-            ->whereAuthor('visitor')
-            ->sortable()
-            ->get();
-    }
-
-    /**
-     * Get user folder tree
-     *
-     * @return array
-     */
-    public function navigation_tree()
-    {
-        $folders = Folder::with('folders:id,parent_id,id,name')
-            ->where('parent_id', null)
-            ->where('user_id', Auth::id())
-            ->sortable()
-            ->get(['id', 'parent_id', 'id', 'name']);
-
-        return [
-            [
-                'name'     => __t('home'),
-                'location' => 'base',
-                'folders'  => $folders,
-            ],
-        ];
-    }
-
-    /**
-     * Search files
-     *
-     * @param SearchRequest $request
-     * @return Collection
-     */
-    public function search(SearchRequest $request)
-    {
-        $user_id = Auth::id();
-
-        $query = remove_accents($request->input('query'));
-
-        // Search files id db
-        $searched_files = File::search($query)
-            ->where('user_id', $user_id)
-            ->get();
-
-        $searched_folders = Folder::search($query)
-            ->where('user_id', $user_id)
-            ->get();
-
-        // Collect folders and files to single array
-        return collect([$searched_folders, $searched_files])
-            ->collapse();
-    }
-}

src/Domain/Browsing/Controllers/BrowseFolderContentController.php

@@ -0,0 +1,54 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Illuminate\Http\Request;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+class BrowseFolderContentController
+{
+    public function __invoke(
+        Request $request,
+        string $id,
+    ): Collection {
+        $root_id = $id === 'undefined' ? null : $id;
+
+        // Get folder trash items
+        if ($request->query('trash')) {
+            // Get folders and files
+            $folders = Folder::onlyTrashed()
+                ->with('parent')
+                ->where('parent_id', $root_id)
+                ->sortable()
+                ->get();
+
+            $files = File::onlyTrashed()
+                ->with('parent')
+                ->where('folder_id', $root_id)
+                ->sortable()
+                ->get();
+
+            // Collect folders and files to single array
+            return collect([$folders, $files])->collapse();
+        }
+
+        // Get folders and files
+        $folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('parent_id', $root_id)
+            ->where('user_id', Auth::id())
+            ->sortable()
+            ->get();
+
+        $files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('folder_id', $root_id)
+            ->where('user_id', Auth::id())
+            ->sortable()
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])
+            ->collapse();
+    }
+}

src/Domain/Browsing/Controllers/BrowseLatestFilesController.php

@@ -0,0 +1,20 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use App\Users\Models\User;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+class BrowseLatestFilesController
+{
+    public function __invoke(): Collection
+    {
+        $user = User::with([
+            'latestUploads' => fn ($query) => $query->sortable(['created_at' => 'desc'])
+        ])
+            ->where('id', Auth::id())
+            ->first();
+
+        return $user->latestUploads;
+    }
+}

src/Domain/Browsing/Controllers/BrowseParticipantsUploadsController.php

@@ -0,0 +1,18 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Domain\Files\Models\File;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+class BrowseParticipantsUploadsController
+{
+    public function __invoke(): Collection
+    {
+        return File::with(['parent'])
+            ->where('user_id', Auth::id())
+            ->whereAuthor('visitor')
+            ->sortable()
+            ->get();
+    }
+}

src/Domain/Browsing/Controllers/BrowseSharedItemsController.php

@@ -0,0 +1,42 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+class BrowseSharedItemsController
+{
+    public function __invoke(): Collection
+    {
+        $user_id = Auth::id();
+
+        // Get shared folders and files
+        $folder_ids = Share::where('user_id', $user_id)
+            ->where('type', 'folder')
+            ->pluck('item_id');
+
+        $file_ids = Share::where('user_id', $user_id)
+            ->where('type', '!=', 'folder')
+            ->pluck('item_id');
+
+        // Get folders and files
+        $folders = Folder::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', $folder_ids)
+            ->sortable()
+            ->get();
+
+        $files = File::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', $file_ids)
+            ->sortable()
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])
+            ->collapse();
+    }
+}

src/Domain/Browsing/Controllers/BrowseTrashContentController.php

@@ -0,0 +1,43 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+class BrowseTrashContentController
+{
+    public function __invoke(): Collection
+    {
+        $user_id = Auth::id();
+
+        // Get folders and files
+        $folders_trashed = Folder::onlyTrashed()
+            ->with(['trashedFolders', 'parent'])
+            ->where('user_id', $user_id)
+            ->get(['parent_id', 'id', 'name']);
+
+        $folders = Folder::onlyTrashed()
+            ->with(['parent'])
+            ->where('user_id', $user_id)
+            ->whereIn('id', filter_folders_ids($folders_trashed))
+            ->sortable()
+            ->get();
+
+        // Get files trashed
+        $files_trashed = File::onlyTrashed()
+            ->with(['parent'])
+            ->where('user_id', $user_id)
+            ->where(function ($query) use ($folders_trashed) {
+                $query->whereNull('folder_id');
+                $query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
+            })
+            ->sortable()
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$folders, $files_trashed])
+            ->collapse();
+    }
+}

src/Domain/Browsing/Controllers/SearchFilesAndFoldersController.php

@@ -0,0 +1,34 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Domain\Items\Requests\SearchRequest;
+
+class SearchFilesAndFoldersController
+{
+    public function __invoke(
+        SearchRequest $request
+    ): Collection {
+        $user_id = Auth::id();
+
+        $query = remove_accents(
+            $request->input('query')
+        );
+
+        // Search files id db
+        $searched_files = File::search($query)
+            ->where('user_id', $user_id)
+            ->get();
+
+        $searched_folders = Folder::search($query)
+            ->where('user_id', $user_id)
+            ->get();
+
+        // Collect folders and files to single array
+        return collect([$searched_folders, $searched_files])
+            ->collapse();
+    }
+}