namespaces refactoring part 3

src/Domain/Files/Models/File.php

@@ -2,11 +2,11 @@
 namespace Domain\Files\Models;
 
 use ByteUnits\Metric;
-use Database\Factories\FileFactory;
-use Domain\Folders\Models\Folder;
-use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Database\Factories\FileFactory;
 use Kyslik\ColumnSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;

src/Domain/Files/Requests/UploadRequest.php

@@ -26,7 +26,7 @@ class UploadRequest extends FormRequest
         return [
             'filename'  => 'required|string',
             'folder_id' => 'nullable|uuid',
-            'is_last'   => 'sometimes|boolean',
+            'is_last'   => 'sometimes|string',
             'file'      => ['required', 'file', new DisabledMimetypes],
         ];
     }

src/Domain/Folders/Models/Folder.php

@@ -1,12 +1,12 @@
 <?php
 namespace Domain\Folders\Models;
 
-use Database\Factories\FolderFactory;
-use Domain\Files\Models\File;
-use Domain\Sharing\Models\Share;
 use Illuminate\Support\Str;
+use Domain\Files\Models\File;
 use Laravel\Scout\Searchable;
+use Domain\Sharing\Models\Share;
 use Kyslik\ColumnSortable\Sortable;
+use Database\Factories\FolderFactory;
 use Illuminate\Database\Eloquent\Model;
 use TeamTNT\TNTSearch\Indexer\TNTIndexer;
 use \Illuminate\Database\Eloquent\SoftDeletes;

src/Domain/Homepage/Controllers/AppFunctionsController.php

@@ -74,11 +74,15 @@ class AppFunctionsController extends Controller
      */
     public function og_site(Share $shared)
     {
+        $namespace = match ($shared->type) {
+            'folder' => 'Domain\\Folders\\Models\\Folder',
+            'file'   => 'Domain\\Files\\Models\\File',
+        };
+
         // Get file/folder record
-        $item = ('App\\Models\\' . ucfirst($shared->type))
-            ::where('user_id', $shared->user->id)
-                ->where('id', $shared->item_id)
-                ->first();
+        $item = ($namespace)::where('user_id', $shared->user->id)
+            ->where('id', $shared->item_id)
+            ->first();
 
         if ($item->thumbnail) {
             $item->setPublicUrl($shared->token);

src/Domain/Sharing/Models/Share.php

@@ -1,8 +1,9 @@
 <?php
 namespace Domain\Sharing\Models;
 
-use Database\Factories\ShareFactory;
+use App\Users\Models\User;
 use Illuminate\Support\Str;
+use Database\Factories\ShareFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

src/Domain/Zipping/Models/Zip.php

@@ -2,8 +2,8 @@
 namespace Domain\Zipping\Models;
 
 use App\Users\Models\User;
-use Database\Factories\ZipFactory;
 use Illuminate\Support\Str;
+use Database\Factories\ZipFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Factories\HasFactory;