Revert "fix : User 모델 경로 오류로 인해 User 모델만 밖으로 이동"

This reverts commit 2b82483f64.

app/Http/Controllers/Api/V1/ApiController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;

app/Http/Middleware/ApiKeyMiddleware.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Closure;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;

app/Http/Responses/CustomLoginResponse.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Responses;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Support\Facades\Session;
 use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
 

app/Models/Members/User.php

@@ -1,11 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Members;
 
-use App\Models\Commons\File;
 use App\Models\Commons\Role;
-use App\Models\Members\UserRole;
+use App\Models\File;
-use App\Models\Members\UserTenant;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;

app/Models/Members/UserMenuPermission.php

@@ -3,7 +3,6 @@
 namespace App\Models\Members;
 
 use App\Models\Commons\Menu;
-use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class UserMenuPermission extends Model

app/Models/Members/UserRole.php

@@ -4,7 +4,6 @@
 
 use App\Models\Commons\Role;
 use App\Models\Tenants\Tenant;
-use App\Models\User;
 use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Models/Members/UserTenant.php

@@ -3,7 +3,6 @@
 namespace App\Models\Members;
 
 use App\Models\Tenants\Tenant;
-use App\Models\User;
 use App\Traits\BelongsToTenant;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;

app/Models/Tenants/Tenant.php

@@ -4,9 +4,9 @@
 
 use App\Models\Commons\Role;
 use App\Models\File;
+use App\Models\Members\User;
 use App\Models\Members\UserRole;
 use App\Models\Members\UserTenant;
-use App\Models\User;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Services/AdminPermissionService.php

@@ -2,8 +2,8 @@
 
 namespace App\Services;
 
+use App\Models\Members\User;
 use App\Models\SiteAdmin;
-use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
 class AdminPermissionService

app/Services/MemberService.php

@@ -3,7 +3,7 @@
 namespace App\Services;
 
 use App\Helpers\ApiResponse;
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Support\Facades\DB;
 
 class MemberService

config/auth.php

@@ -62,7 +62,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', \App\Models\User::class),
+            'model' => env('AUTH_MODEL', \App\Models\Members\User::class),
         ],
 
         // 'users' => [

database/factories/UserFactory.php

@@ -2,15 +2,15 @@
 
 namespace Database\Factories;
 
+use App\Models\Members\User;
 use App\Models\Team;
-use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Members\User>
  */
 class UserFactory extends Factory
 {

database/seeders/DatabaseSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Database\Seeder;
 
 // use Illuminate\Database\Console\Seeds\WithoutModelEvents;

tests/Feature/ApiTokenPermissionsTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;

tests/Feature/AuthenticationTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 

tests/Feature/BrowserSessionsTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Http\Livewire\LogoutOtherBrowserSessionsForm;
 use Livewire\Livewire;

tests/Feature/CreateApiTokenTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\Http\Livewire\ApiTokenManager;

tests/Feature/DeleteAccountTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\Http\Livewire\DeleteUserForm;

tests/Feature/DeleteApiTokenTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;

tests/Feature/EmailVerificationTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;

tests/Feature/PasswordConfirmationTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 

tests/Feature/PasswordResetTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;

tests/Feature/ProfileInformationTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Http\Livewire\UpdateProfileInformationForm;
 use Livewire\Livewire;

tests/Feature/TwoFactorAuthenticationSettingsTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Fortify\Features;
 use Laravel\Jetstream\Http\Livewire\TwoFactorAuthenticationForm;

tests/Feature/UpdatePasswordTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Jetstream\Http\Livewire\UpdatePasswordForm;