controller refactoring part 23

src/Domain/Browsing/Controllers/VisitorBrowseFolderContentController.php

@@ -1,6 +1,8 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
 use Domain\Sharing\Models\Share;
 use Illuminate\Support\Collection;
 use Support\Services\HelperService;
@@ -12,8 +14,7 @@ class VisitorBrowseFolderContentController
 {
     public function __construct(
         public HelperService $helper,
-    ) {
-    }
+    ) {}
 
     public function __invoke(
         string $id,
@@ -26,12 +27,18 @@ class VisitorBrowseFolderContentController
         $this->helper->check_item_access($id, $shared);
 
         // Get files and folders
-        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
+        $folders = Folder::where('user_id', $shared->user_id)
+            ->where('parent_id', $id)
+            ->sortable()
+            ->get();
+
+        $files = File::where('user_id', $shared->user_id)
+            ->where('folder_id', $id)
+            ->sortable()
+            ->get();
 
         // Set thumbnail links for public files
-        $files->map(function ($file) use ($shared) {
-            $file->setPublicUrl($shared->token);
-        });
+        $files->map(fn ($file) => $file->setPublicUrl($shared->token));
 
         // Collect folders and files to single array
         return collect([$folders, $files])

src/Domain/Files/Controllers/FileAccess/GetFileController.php

@@ -0,0 +1,42 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetFileController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ){}
+
+    /**
+     * Get file
+     */
+    public function __invoke(
+        Request $request,
+        string $filename,
+    ): StreamedResponse {
+
+        // Get file record
+        $file = UserFile::withTrashed()
+            ->where('user_id', Auth::id())
+            ->where('basename', $filename)
+            ->firstOrFail();
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: Auth::id(),
+        );
+
+        return $this->helper->download_file($file, Auth::id());
+    }
+}

src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php

@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetThumbnailController extends Controller
+{
+    /**
+     * Get image thumbnail
+     */
+    public function __invoke(
+        Request $request,
+        string $filename,
+    ): FileNotFoundException|StreamedResponse {
+
+        $file = UserFile::withTrashed()
+            ->whereUserId(Auth::id())
+            ->whereThumbnail($filename)
+            ->firstOrFail();
+
+        return $this->helper->download_thumbnail_file($file, Auth::id());
+    }
+}

src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Sharing\Models\Share;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * Get file public
+ */
+class VisitorGetFileController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload
+    ){}
+
+    public function __invoke(
+        $filename,
+        Share $shared,
+    ): StreamedResponse {
+
+        // Check ability to access protected share files
+        $this->helper->check_protected_share_record($shared);
+
+        // Get file record
+        $file = UserFile::where('user_id', $shared->user_id)
+            ->where('basename', $filename)
+            ->firstOrFail();
+
+        // Check file access
+        $this->helper->check_guest_access_to_shared_items($shared, $file);
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: $shared->user_id,
+        );
+
+        return $this->helper->download_file($file, $shared->user_id);
+    }
+}

src/Domain/Files/Controllers/FileAccess/VisitorGetThumbnailController.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Sharing\Models\Share;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * Get public image thumbnail
+ */
+class VisitorGetThumbnailController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ) {}
+
+    public function __invoke(
+
+        $filename,
+        Share $shared,
+    ): StreamedResponse {
+        // Check ability to access protected share files
+        $this->helper->check_protected_share_record($shared);
+
+        // Get file record
+        $file = UserFile::where('user_id', $shared->user_id)
+            ->where('thumbnail', $filename)
+            ->firstOrFail();
+
+        // Check file access
+        $this->helper->check_guest_access_to_shared_items($shared, $file);
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: $shared->user_id,
+        );
+
+        return $this->helper->download_thumbnail_file($file, $shared->user_id);
+    }
+}

src/Domain/Files/Controllers/FileAccessController.php

@@ -1,144 +0,0 @@
-<?php
-namespace Domain\Files\Controllers;
-
-use Illuminate\Http\Request;
-use Domain\Zipping\Models\Zip;
-use Support\Services\HelperService;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Domain\Files\Models\File as UserFile;
-use Domain\Traffic\Actions\RecordDownloadAction;
-
-class FileAccessController extends Controller
-{
-    public function __construct(
-        public HelperService $helper,
-        public RecordDownloadAction $recordDownload,
-    ) {
-    }
-
-    /**
-     * Get avatar
-     *
-     * @param $basename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_avatar($basename)
-    {
-        // Check if file exist
-        if (! Storage::exists("/avatars/$basename")) {
-            abort(404);
-        }
-
-        // Return avatar
-        return Storage::download("/avatars/$basename", $basename);
-    }
-
-    /**
-     * Get system image
-     *
-     * @param $basename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_system_image($basename)
-    {
-        // Check if file exist
-        if (! Storage::exists("/system/$basename")) {
-            abort(404);
-        }
-
-        // Return avatar
-        return Storage::download("/system/$basename", $basename);
-    }
-
-    /**
-     * Get file
-     *
-     * @param Request $request
-     * @param $filename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_file(Request $request, $filename)
-    {
-        // Get file record
-        $file = UserFile::withTrashed()
-            ->where('user_id', Auth::id())
-            ->where('basename', $filename)
-            ->firstOrFail();
-
-        // Check user permission
-        /*if (!$request->user()->tokenCan('master')) {
-
-            // Get shared token
-            $shared = get_shared($request->cookie('shared_token'));
-
-            // Check access to file
-            $this->check_file_access($shared, $file);
-        }*/
-
-        // Store user download size
-        ($this->recordDownload)(
-            (int) $file->getRawOriginal('filesize'),
-            Auth::id()
-        );
-
-        return $this->helper->download_file($file, Auth::id());
-    }
-
-    /**
-     * Get generated zip for user
-     *
-     * @param $id
-     * @return \Symfony\Component\HttpFoundation\StreamedResponse
-     */
-    public function get_zip($id)
-    {
-        $disk = Storage::disk('local');
-
-        $zip = Zip::whereId($id)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
-
-        // Store user download size
-        ($this->recordDownload)(
-            $disk->size("zip/$zip->basename"),
-            $zip->user_id
-        );
-
-        return $disk->download("zip/$zip->basename", $zip->basename, [
-            'Content-Type'        => 'application/zip',
-            'Content-Length'      => $disk->size("zip/$zip->basename"),
-            'Accept-Ranges'       => 'bytes',
-            'Content-Range'       => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
-            'Content-Disposition' => "attachment; filename=$zip->basename",
-        ]);
-    }
-
-    /**
-     * Get image thumbnail
-     *
-     * @param Request $request
-     * @param $filename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_thumbnail(Request $request, $filename)
-    {
-        // Get file record
-        $file = UserFile::withTrashed()
-            ->whereUserId(Auth::id())
-            ->whereThumbnail($filename)
-            ->firstOrFail();
-
-        // Check user permission
-        /*if (!$request->user()->tokenCan('master')) {
-            $this->check_file_access($request, $file);
-        }*/
-
-        return $this->helper->download_thumbnail_file($file, Auth::id());
-    }
-}

src/Domain/Files/Controllers/VisitorShowFileController.php

@@ -10,7 +10,7 @@ use Domain\Files\Resources\FileResource;
 /**
  * Get shared file record
  */
-class VisitorGetSingleFileInfoController
+class VisitorShowFileController
 {
     public function __construct(
         public HelperService $helper,

src/Domain/Files/Controllers/VisitorUploadFileController.php

@@ -12,7 +12,7 @@ use Support\Demo\Actions\FakeUploadFileAction;
 /**
  * guest user upload file into shared folder
  */
-class VisitorUploadFilesController extends Controller
+class VisitorUploadFileController extends Controller
 {
     public function __construct(
         public HelperService $helper,

src/Domain/Settings/Controllers/GetIAppController.php

@@ -0,0 +1,28 @@
+<?php
+
+
+namespace Domain\Settings\Controllers;
+
+
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetIAppController
+{
+    /**
+     * Get system image
+     */
+    public function __invoke(
+        string $basename
+    ): StreamedResponse|FileNotFoundException {
+
+        // Check if file exist
+        if (! Storage::exists("/system/$basename")) {
+            abort(404);
+        }
+
+        // Return avatar
+        return Storage::download("/system/$basename", $basename);
+    }
+}

src/Domain/Sharing/Controllers/FileSharedAccessController.php

@@ -1,108 +0,0 @@
-<?php
-namespace Domain\Sharing\Controllers;
-
-use Domain\Zipping\Models\Zip;
-use Domain\Sharing\Models\Share;
-use Support\Services\HelperService;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Storage;
-use Domain\Files\Models\File as UserFile;
-use Domain\Traffic\Actions\RecordDownloadAction;
-
-class FileSharedAccessController extends Controller
-{
-    public function __construct(
-        private HelperService $helper,
-        public RecordDownloadAction $recordDownload,
-    ) {
-    }
-
-    /**
-     * Get generated zip for guest
-     *
-     * @param $id
-     * @param $token
-     * @return \Symfony\Component\HttpFoundation\StreamedResponse
-     */
-    public function get_zip_public($id, $token)
-    {
-        $disk = Storage::disk('local');
-
-        $zip = Zip::where('id', $id)
-            ->where('shared_token', $token)
-            ->first();
-
-        // Store user download size
-        ($this->recordDownload)(
-            $disk->size("zip/$zip->basename"),
-            $zip->user_id
-        );
-
-        return $disk
-            ->download("zip/$zip->basename", $zip->basename, [
-                'Content-Type'        => 'application/zip',
-                'Content-Length'      => $disk->size("zip/$zip->basename"),
-                'Accept-Ranges'       => 'bytes',
-                'Content-Range'       => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
-                'Content-Disposition' => 'attachment; filename=' . $zip->basename,
-            ]);
-    }
-
-    /**
-     * Get file public
-     *
-     * @param $filename
-     * @param Share $shared
-     * @return mixed
-     */
-    public function get_file_public($filename, Share $shared)
-    {
-        // Check ability to access protected share files
-        $this->helper->check_protected_share_record($shared);
-
-        // Get file record
-        $file = UserFile::where('user_id', $shared->user_id)
-            ->where('basename', $filename)
-            ->firstOrFail();
-
-        // Check file access
-        $this->helper->check_guest_access_to_shared_items($shared, $file);
-
-        // Store user download size
-        ($this->recordDownload)(
-            (int) $file->getRawOriginal('filesize'),
-            $shared->user_id
-        );
-
-        return $this->helper->download_file($file, $shared->user_id);
-    }
-
-    /**
-     * Get public image thumbnail
-     *
-     * @param $filename
-     * @param Share $shared
-     * @return mixed
-     */
-    public function get_thumbnail_public($filename, Share $shared)
-    {
-        // Check ability to access protected share files
-        $this->helper->check_protected_share_record($shared);
-
-        // Get file record
-        $file = UserFile::where('user_id', $shared->user_id)
-            ->where('thumbnail', $filename)
-            ->firstOrFail();
-
-        // Check file access
-        $this->helper->check_guest_access_to_shared_items($shared, $file);
-
-        // Store user download size
-        ($this->recordDownload)(
-            (int) $file->getRawOriginal('filesize'),
-            $shared->user_id
-        );
-
-        return $this->helper->download_thumbnail_file($file, $shared->user_id);
-    }
-}

src/Domain/Zipping/Controllers/GetZipController.php

@@ -0,0 +1,48 @@
+<?php
+
+
+namespace Domain\Zipping\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Domain\Zipping\Models\Zip;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetZipController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ){}
+
+    /**
+     * Get generated zip for user
+     */
+    public function __invoke(
+
+        string $id,
+    ): StreamedResponse
+    {
+        $disk = Storage::disk('local');
+
+        $zip = Zip::whereId($id)
+            ->where('user_id', Auth::id())
+            ->firstOrFail();
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: $disk->size("zip/$zip->basename"),
+            user_id: $zip->user_id,
+        );
+
+        return $disk->download("zip/$zip->basename", $zip->basename, [
+            'Content-Type'        => 'application/zip',
+            'Content-Length'      => $disk->size("zip/$zip->basename"),
+            'Accept-Ranges'       => 'bytes',
+            'Content-Range'       => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
+            'Content-Disposition' => "attachment; filename=$zip->basename",
+        ]);
+    }
+}

src/Domain/Zipping/Controllers/VisitorGetZipController.php

@@ -0,0 +1,47 @@
+<?php
+
+
+namespace Domain\Zipping\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Domain\Zipping\Models\Zip;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class VisitorGetZipController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ){}
+
+    /**
+     * Get generated zip for visitor
+     */
+    public function __invoke(
+        $id,
+        $token,
+    ): StreamedResponse
+    {
+        $disk = Storage::disk('local');
+
+        $zip = Zip::where('id', $id)
+            ->where('shared_token', $token)
+            ->first();
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: $disk->size("zip/$zip->basename"),
+            user_id: $zip->user_id,
+        );
+
+        return $disk->download("zip/$zip->basename", $zip->basename, [
+            'Content-Type'        => 'application/zip',
+            'Content-Length'      => $disk->size("zip/$zip->basename"),
+            'Accept-Ranges'       => 'bytes',
+            'Content-Range'       => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
+            'Content-Disposition' => 'attachment; filename=' . $zip->basename,
+        ]);
+    }
+}

src/Domain/Zipping/Controllers/VisitorZipFilesController.php

@@ -12,7 +12,7 @@ use Domain\Zipping\Actions\ZipFilesAction;
 /**
  * Guest download multiple files via zip
  */
-class EditorZipFilesController extends Controller
+class VisitorZipFilesController extends Controller
 {
     public function __construct(
         public HelperService $helper,
@@ -45,10 +45,7 @@ class EditorZipFilesController extends Controller
 
         // Get file
         return response([
-            'url' => route('zip_public', [
-                'id'    => $zip->id,
-                'token' => $shared->token,
-            ]),
+            'url' => url("/zip/{$zip->id}/public/{$shared->token}"),
             'name' => $zip->basename,
         ], 201);
     }

src/Domain/Zipping/Controllers/VisitorZipFolderController.php

@@ -11,12 +11,11 @@ use Domain\Zipping\Actions\ZipFolderAction;
 /**
  * Guest download folder via zip
  */
-class EditorZipFolderController extends Controller
+class VisitorZipFolderController extends Controller
 {
     public function __construct(
         public HelperService $helper,
-    ) {
-    }
+    ) {}
 
     public function __invoke(
         ZipFolderAction $zipFolder,
@@ -41,10 +40,7 @@ class EditorZipFolderController extends Controller
 
         // Get file
         return response([
-            'url' => route('zip_public', [
-                'id'    => $zip->id,
-                'token' => $shared->token,
-            ]),
+            'url' => url("/zip/{$zip->id}/public/{$shared->token}"),
             'name' => $zip->basename,
         ], 201);
     }