namespaces refactoring part 2

src/App/Console/Commands/SetupDevEnvironment.php

@@ -1,12 +1,12 @@
 <?php
 namespace App\Console\Commands;
 
+use App\Users\Models\User;
 use Illuminate\Support\Str;
+use Domain\Files\Models\File;
 use Illuminate\Console\Command;
-use Domain\Settings\Models\File;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Folder;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Domain\Settings\Models\Setting;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Foundation\Testing\WithFaker;

src/App/Console/Commands/SetupProdEnvironment.php

@@ -1,8 +1,8 @@
 <?php
 namespace App\Console\Commands;
 
+use App\Users\Models\User;
 use Illuminate\Console\Command;
-use Domain\Settings\Models\User;
 use Domain\Settings\Models\Setting;
 use Domain\SetupWizard\Services\SetupService;
 

src/App/Users/Actions/CreateNewUserAction.php

@@ -1,14 +1,14 @@
 <?php
 namespace App\Users\Actions;
 
+use App\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
-use Domain\Settings\Models\User;
+use App\Users\Models\UserSettings;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Registered;
-use Domain\Settings\Models\UserSettings;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Contracts\Auth\StatefulGuard;
 

src/App/Users/Controllers/AccountController.php

@@ -1,19 +1,19 @@
 <?php
 namespace App\Users\Controllers;
 
+use App\Users\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use App\Users\Resources\UserResource;
 use Illuminate\Http\RedirectResponse;
-use Domain\Admin\Resources\UserResource;
+use Support\Demo\Actions\DemoService;
 use Laravel\Sanctum\PersonalAccessToken;
 use Illuminate\Support\Facades\Validator;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\Admin\Resources\InvoiceCollection;
-use Domain\Admin\Resources\UserStorageResource;
+use App\Users\Resources\UserStorageResource;
+use Domain\Invoices\Resources\InvoiceCollection;
 use App\Users\Requests\UpdateUserPasswordRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use App\Users\Requests\UserCreateAccessTokenRequest;

src/App/Users/Controllers/AuthController.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Users\Controllers;
 
-use Domain\Settings\Models\User;
+use App\Users\Models\User;
 use App\Http\Controllers\Controller;
 use App\Users\Requests\CheckAccountRequest;
 

src/App/Users/Models/User.php

@@ -2,17 +2,21 @@
 namespace App\Users\Models;
 
 use ByteUnits\Metric;
+use Database\Factories\UserFactory;
+use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
+use Domain\Traffic\Models\Traffic;
 use Illuminate\Support\Str;
 use Laravel\Cashier\Billable;
 use Laravel\Sanctum\HasApiTokens;
 use Kyslik\ColumnSortable\Sortable;
+use Support\Services\HelperService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
+use App\Users\Notifications\ResetPassword;
 use Laravel\Fortify\TwoFactorAuthenticatable;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Domain\Sharing\Notifications\ResetPassword;
+use Domain\Subscriptions\Services\StripeService;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
@@ -60,6 +64,11 @@ class User extends Authenticatable implements MustVerifyEmail
 
     protected $keyType = 'string';
 
+    protected static function newFactory(): UserFactory
+    {
+        return UserFactory::new();
+    }
+
     /**
      * Get tax rate id for user
      *

src/App/Users/Resources/UserStorageResource.php

@@ -2,7 +2,7 @@
 namespace App\Users\Resources;
 
 use ByteUnits\Metric;
-use Domain\Settings\Models\File;
+use Domain\Files\Models\File;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserStorageResource extends JsonResource