From 1942f51cf74666bd1825a350e358abe4a694624b Mon Sep 17 00:00:00 2001
From: hskwon <shine1324@gmail.com>
Date: Tue, 29 Jul 2025 13:00:25 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=AA=A8=EB=8D=B8=20=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Actions/Fortify/CreateNewUser.php         | 39 -------------
 .../Fortify/PasswordValidationRules.php       | 18 ------
 app/Actions/Fortify/ResetUserPassword.php     | 29 ----------
 app/Actions/Fortify/UpdateUserPassword.php    | 32 -----------
 .../Fortify/UpdateUserProfileInformation.php  | 56 -------------------
 app/Actions/Jetstream/DeleteUser.php          | 19 -------
 app/Http/Controllers/Api/V1/ApiController.php |  5 +-
 app/Http/Middleware/ApiKeyMiddleware.php      |  2 +-
 app/Http/Responses/CustomLoginResponse.php    |  4 +-
 app/Models/Boards/BoardFile.php               | 15 -----
 app/Models/Boards/Post.php                    |  5 +-
 app/Models/Commons/Category.php               | 43 ++++++++++++++
 app/Models/Commons/File.php                   | 43 ++++++++++++++
 app/Models/{ => Commons}/Menu.php             |  2 +-
 app/Models/{ => Commons}/Role.php             |  4 +-
 .../{ => Commons}/RoleMenuPermission.php      |  2 +-
 app/Models/Estimates/MainRequestEstimate.php  | 24 ++++++++
 app/Models/{ => Materials}/Material.php       |  9 ++-
 .../{ => Materials}/MaterialInspection.php    |  2 +-
 .../MaterialInspectionItem.php                |  2 +-
 .../{ => Materials}/MaterialReceipt.php       |  2 +-
 app/Models/Member.php                         | 50 -----------------
 app/Models/MemberCompany.php                  | 17 ------
 app/Models/{ => Members}/User.php             | 11 +++-
 .../{ => Members}/UserMenuPermission.php      |  3 +-
 app/Models/{ => Members}/UserRole.php         |  6 +-
 app/Models/{ => Members}/UserTenant.php       |  7 ++-
 app/Models/Products/Bom.php                   |  1 +
 app/Models/Products/File.php                  | 12 ----
 app/Models/Products/Product.php               |  5 ++
 app/Models/{ => Qualitys}/Lot.php             |  3 +-
 app/Models/{ => Qualitys}/LotSale.php         |  2 +-
 app/Models/{ => Tenants}/Payment.php          |  2 +-
 app/Models/{ => Tenants}/Plan.php             |  2 +-
 app/Models/{ => Tenants}/Subscription.php     |  2 +-
 app/Models/{ => Tenants}/Tenant.php           | 14 ++++-
 app/Repositories/MainRequestRepository.php    |  4 +-
 app/Services/AdminPermissionService.php       |  4 +-
 app/Services/EstimateService.php              |  2 +-
 app/Services/MemberService.php                |  4 +-
 config/auth.php                               |  2 +-
 database/factories/UserFactory.php            |  4 +-
 database/seeders/DatabaseSeeder.php           |  5 +-
 tests/Feature/ApiTokenPermissionsTest.php     |  2 +-
 tests/Feature/AuthenticationTest.php          |  2 +-
 tests/Feature/BrowserSessionsTest.php         |  2 +-
 tests/Feature/CreateApiTokenTest.php          |  2 +-
 tests/Feature/DeleteAccountTest.php           |  2 +-
 tests/Feature/DeleteApiTokenTest.php          |  2 +-
 tests/Feature/EmailVerificationTest.php       |  2 +-
 tests/Feature/PasswordConfirmationTest.php    |  2 +-
 tests/Feature/PasswordResetTest.php           |  2 +-
 tests/Feature/ProfileInformationTest.php      |  2 +-
 .../TwoFactorAuthenticationSettingsTest.php   |  2 +-
 tests/Feature/UpdatePasswordTest.php          |  2 +-
 55 files changed, 199 insertions(+), 344 deletions(-)
 delete mode 100644 app/Actions/Fortify/CreateNewUser.php
 delete mode 100644 app/Actions/Fortify/PasswordValidationRules.php
 delete mode 100644 app/Actions/Fortify/ResetUserPassword.php
 delete mode 100644 app/Actions/Fortify/UpdateUserPassword.php
 delete mode 100644 app/Actions/Fortify/UpdateUserProfileInformation.php
 delete mode 100644 app/Actions/Jetstream/DeleteUser.php
 delete mode 100644 app/Models/Boards/BoardFile.php
 create mode 100644 app/Models/Commons/Category.php
 create mode 100644 app/Models/Commons/File.php
 rename app/Models/{ => Commons}/Menu.php (93%)
 rename app/Models/{ => Commons}/Role.php (83%)
 rename app/Models/{ => Commons}/RoleMenuPermission.php (92%)
 create mode 100644 app/Models/Estimates/MainRequestEstimate.php
 rename app/Models/{ => Materials}/Material.php (81%)
 rename app/Models/{ => Materials}/MaterialInspection.php (93%)
 rename app/Models/{ => Materials}/MaterialInspectionItem.php (90%)
 rename app/Models/{ => Materials}/MaterialReceipt.php (95%)
 delete mode 100644 app/Models/Member.php
 delete mode 100644 app/Models/MemberCompany.php
 rename app/Models/{ => Members}/User.php (86%)
 rename app/Models/{ => Members}/UserMenuPermission.php (87%)
 rename app/Models/{ => Members}/UserRole.php (86%)
 rename app/Models/{ => Members}/UserTenant.php (89%)
 delete mode 100644 app/Models/Products/File.php
 rename app/Models/{ => Qualitys}/Lot.php (85%)
 rename app/Models/{ => Qualitys}/LotSale.php (89%)
 rename app/Models/{ => Tenants}/Payment.php (93%)
 rename app/Models/{ => Tenants}/Plan.php (94%)
 rename app/Models/{ => Tenants}/Subscription.php (95%)
 rename app/Models/{ => Tenants}/Tenant.php (82%)

diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
deleted file mode 100644
index 200dc04..0000000
--- a/app/Actions/Fortify/CreateNewUser.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Actions\Fortify;
-
-use App\Models\User;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Laravel\Fortify\Contracts\CreatesNewUsers;
-use Laravel\Jetstream\Jetstream;
-
-class CreateNewUser implements CreatesNewUsers
-{
-    use PasswordValidationRules;
-
-    /**
-     * Validate and create a newly registered user.
-     *
-     * @param  array<string, string>  $input
-     */
-    public function create(array $input): User
-    {
-        Validator::make($input, [
-            'USER_ID' => ['required', 'string', 'max:30', 'unique:SITE_USER_INFO,USER_ID'],
-            'USER_PWD' => ['required', 'string', 'min:8'],
-            'USER_EMAIL' => ['nullable', 'string', 'email', 'max:40'],
-            'USER_NCNM' => ['nullable', 'string', 'max:50'],
-        ])->validate();
-
-        return User::create([
-            'USER_ID' => $input['USER_ID'],
-            'USER_PWD' => Hash::make($input['USER_PWD']), // 비밀번호 암호화 저장
-            'USER_NCNM' => $input['USER_NCNM'] ?? null,
-            'USER_EMAIL' => $input['USER_EMAIL'] ?? null,
-            'USER_HP' => $input['USER_HP'] ?? null,
-            'USER_STATUS' => '01', // 기본적으로 활성화 상태
-            'REG_DTTM' => now(), // 등록 날짜 자동 설정
-        ]);
-    }
-}
diff --git a/app/Actions/Fortify/PasswordValidationRules.php b/app/Actions/Fortify/PasswordValidationRules.php
deleted file mode 100644
index 76b19d3..0000000
--- a/app/Actions/Fortify/PasswordValidationRules.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Actions\Fortify;
-
-use Illuminate\Validation\Rules\Password;
-
-trait PasswordValidationRules
-{
-    /**
-     * Get the validation rules used to validate passwords.
-     *
-     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
-     */
-    protected function passwordRules(): array
-    {
-        return ['required', 'string', Password::default(), 'confirmed'];
-    }
-}
diff --git a/app/Actions/Fortify/ResetUserPassword.php b/app/Actions/Fortify/ResetUserPassword.php
deleted file mode 100644
index 7a57c50..0000000
--- a/app/Actions/Fortify/ResetUserPassword.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Actions\Fortify;
-
-use App\Models\User;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Laravel\Fortify\Contracts\ResetsUserPasswords;
-
-class ResetUserPassword implements ResetsUserPasswords
-{
-    use PasswordValidationRules;
-
-    /**
-     * Validate and reset the user's forgotten password.
-     *
-     * @param  array<string, string>  $input
-     */
-    public function reset(User $user, array $input): void
-    {
-        Validator::make($input, [
-            'password' => $this->passwordRules(),
-        ])->validate();
-
-        $user->forceFill([
-            'password' => Hash::make($input['password']),
-        ])->save();
-    }
-}
diff --git a/app/Actions/Fortify/UpdateUserPassword.php b/app/Actions/Fortify/UpdateUserPassword.php
deleted file mode 100644
index 7005639..0000000
--- a/app/Actions/Fortify/UpdateUserPassword.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Actions\Fortify;
-
-use App\Models\User;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Laravel\Fortify\Contracts\UpdatesUserPasswords;
-
-class UpdateUserPassword implements UpdatesUserPasswords
-{
-    use PasswordValidationRules;
-
-    /**
-     * Validate and update the user's password.
-     *
-     * @param  array<string, string>  $input
-     */
-    public function update(User $user, array $input): void
-    {
-        Validator::make($input, [
-            'current_password' => ['required', 'string', 'current_password:web'],
-            'password' => $this->passwordRules(),
-        ], [
-            'current_password.current_password' => __('The provided password does not match your current password.'),
-        ])->validateWithBag('updatePassword');
-
-        $user->forceFill([
-            'password' => Hash::make($input['password']),
-        ])->save();
-    }
-}
diff --git a/app/Actions/Fortify/UpdateUserProfileInformation.php b/app/Actions/Fortify/UpdateUserProfileInformation.php
deleted file mode 100644
index 9738772..0000000
--- a/app/Actions/Fortify/UpdateUserProfileInformation.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Actions\Fortify;
-
-use App\Models\User;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
-
-class UpdateUserProfileInformation implements UpdatesUserProfileInformation
-{
-    /**
-     * Validate and update the given user's profile information.
-     *
-     * @param  array<string, mixed>  $input
-     */
-    public function update(User $user, array $input): void
-    {
-        Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'email', 'max:255', Rule::unique('users')->ignore($user->id)],
-            'photo' => ['nullable', 'mimes:jpg,jpeg,png', 'max:1024'],
-        ])->validateWithBag('updateProfileInformation');
-
-        if (isset($input['photo'])) {
-            $user->updateProfilePhoto($input['photo']);
-        }
-
-        if ($input['email'] !== $user->email &&
-            $user instanceof MustVerifyEmail) {
-            $this->updateVerifiedUser($user, $input);
-        } else {
-            $user->forceFill([
-                'name' => $input['name'],
-                'email' => $input['email'],
-            ])->save();
-        }
-    }
-
-    /**
-     * Update the given verified user's profile information.
-     *
-     * @param  array<string, string>  $input
-     */
-    protected function updateVerifiedUser(User $user, array $input): void
-    {
-        $user->forceFill([
-            'name' => $input['name'],
-            'email' => $input['email'],
-            'email_verified_at' => null,
-        ])->save();
-
-        $user->sendEmailVerificationNotification();
-    }
-}
diff --git a/app/Actions/Jetstream/DeleteUser.php b/app/Actions/Jetstream/DeleteUser.php
deleted file mode 100644
index 083159e..0000000
--- a/app/Actions/Jetstream/DeleteUser.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Actions\Jetstream;
-
-use App\Models\User;
-use Laravel\Jetstream\Contracts\DeletesUsers;
-
-class DeleteUser implements DeletesUsers
-{
-    /**
-     * Delete the given user.
-     */
-    public function delete(User $user): void
-    {
-        $user->deleteProfilePhoto();
-        $user->tokens->each->delete();
-        $user->delete();
-    }
-}
diff --git a/app/Http/Controllers/Api/V1/ApiController.php b/app/Http/Controllers/Api/V1/ApiController.php
index 87755af..bcfc6e9 100644
--- a/app/Http/Controllers/Api/V1/ApiController.php
+++ b/app/Http/Controllers/Api/V1/ApiController.php
@@ -2,12 +2,11 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Models\User;
+use App\Http\Controllers\Controller;
+use App\Models\Members\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
-use App\Http\Controllers\Controller;
 
 
 class ApiController extends Controller
diff --git a/app/Http/Middleware/ApiKeyMiddleware.php b/app/Http/Middleware/ApiKeyMiddleware.php
index b341cf9..ef031c1 100644
--- a/app/Http/Middleware/ApiKeyMiddleware.php
+++ b/app/Http/Middleware/ApiKeyMiddleware.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Middleware;
 
+use App\Models\Members\User;
 use Closure;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use App\Models\User;
 use Illuminate\Support\Facades\Log;
 use Laravel\Sanctum\PersonalAccessToken;
 
diff --git a/app/Http/Responses/CustomLoginResponse.php b/app/Http/Responses/CustomLoginResponse.php
index c9d3457..1ac3409 100644
--- a/app/Http/Responses/CustomLoginResponse.php
+++ b/app/Http/Responses/CustomLoginResponse.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Responses;
 
-use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use App\Models\Members\User;
 use Illuminate\Support\Facades\Session;
-use App\Models\User;
+use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
 
 class CustomLoginResponse implements LoginResponseContract
 {
diff --git a/app/Models/Boards/BoardFile.php b/app/Models/Boards/BoardFile.php
deleted file mode 100644
index c16a080..0000000
--- a/app/Models/Boards/BoardFile.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Models\Boards;
-
-use Illuminate\Database\Eloquent\Model;
-
-class BoardFile extends Model
-{
-    protected $table = 'board_files';
-    protected $fillable = ['post_id', 'file_path', 'file_name', 'file_size', 'file_type'];
-
-    public function post() {
-        return $this->belongsTo(Post::class, 'post_id');
-    }
-}
diff --git a/app/Models/Boards/Post.php b/app/Models/Boards/Post.php
index 62a536c..c21968e 100644
--- a/app/Models/Boards/Post.php
+++ b/app/Models/Boards/Post.php
@@ -15,11 +15,8 @@ class Post extends Model
         'ip_address', 'is_notice', 'is_secret', 'views', 'status'
     ];
 
-    public function customFieldValues() {
-        return $this->hasMany(PostCustomFieldValue::class, 'post_id');
-    }
     public function files() {
-        return $this->hasMany(BoardFile::class, 'post_id');
+        return $this->morphMany(File::class, 'fileable');
     }
     public function comments() {
         return $this->hasMany(BoardComment::class, 'post_id')->whereNull('parent_id')->where('status', 'active');
diff --git a/app/Models/Commons/Category.php b/app/Models/Commons/Category.php
new file mode 100644
index 0000000..b308ff3
--- /dev/null
+++ b/app/Models/Commons/Category.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models\Commons;
+
+use App\Traits\BelongsToTenant;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Category extends Model
+{
+    use SoftDeletes, BelongsToTenant;
+
+    protected $table = 'common_codes';
+
+    protected $fillable = [
+        'tenant_id',
+        'code_group',
+        'code',
+        'name',
+        'parent_id',
+        'attributes',
+        'description',
+        'is_active',
+        'sort_order'
+    ];
+
+    protected $casts = [
+        'attributes' => 'array',
+        'is_active' => 'boolean',
+    ];
+
+    // 관계: 상위 코드
+    public function parent()
+    {
+        return $this->belongsTo(self::class, 'parent_id');
+    }
+
+    // 관계: 하위 코드들
+    public function children()
+    {
+        return $this->hasMany(self::class, 'parent_id');
+    }
+}
diff --git a/app/Models/Commons/File.php b/app/Models/Commons/File.php
new file mode 100644
index 0000000..b1456d9
--- /dev/null
+++ b/app/Models/Commons/File.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models\Commons;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class File extends Model
+{
+    use SoftDeletes;
+
+    protected $table = 'files';
+
+    protected $fillable = [
+        'tenant_id',
+        'file_path',
+        'original_name',
+        'file_name',
+        'file_name_old',
+        'file_size',
+        'mime_type',
+        'description',
+        'fileable_id',
+        'fileable_type',
+        'uploaded_by',
+    ];
+
+    /**
+     * 연관된 모델 (Polymorphic)
+     */
+    public function fileable()
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * 업로더 (User 등)
+     */
+    public function uploader()
+    {
+        return $this->belongsTo(User::class, 'uploaded_by');
+    }
+}
diff --git a/app/Models/Menu.php b/app/Models/Commons/Menu.php
similarity index 93%
rename from app/Models/Menu.php
rename to app/Models/Commons/Menu.php
index 9a0bc27..81848a0 100644
--- a/app/Models/Menu.php
+++ b/app/Models/Commons/Menu.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Commons;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/Role.php b/app/Models/Commons/Role.php
similarity index 83%
rename from app/Models/Role.php
rename to app/Models/Commons/Role.php
index cc2521b..e250709 100644
--- a/app/Models/Role.php
+++ b/app/Models/Commons/Role.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Commons;
 
+use App\Models\Members\UserRole;
+use App\Models\Tenants\Tenant;
 use Illuminate\Database\Eloquent\Model;
 
 class Role extends Model
diff --git a/app/Models/RoleMenuPermission.php b/app/Models/Commons/RoleMenuPermission.php
similarity index 92%
rename from app/Models/RoleMenuPermission.php
rename to app/Models/Commons/RoleMenuPermission.php
index de4350a..7266b15 100644
--- a/app/Models/RoleMenuPermission.php
+++ b/app/Models/Commons/RoleMenuPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Commons;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/Estimates/MainRequestEstimate.php b/app/Models/Estimates/MainRequestEstimate.php
new file mode 100644
index 0000000..41520f4
--- /dev/null
+++ b/app/Models/Estimates/MainRequestEstimate.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models\Estimates;
+
+use App\Enums\EstimateStatus;
+use Illuminate\Database\Eloquent\Model;
+
+class MainRequestEstimate extends Model
+{
+    protected $table = 'main_request_estimates';
+
+    protected $casts = [
+        'status_code' => EstimateStatus::class,
+    ];
+
+    protected $fillable = [
+        'main_request_id',
+        'estimate_no',
+        // ... 기타 필드
+        'status_code',
+    ];
+
+    // 관계 메서드 등 추가
+}
diff --git a/app/Models/Material.php b/app/Models/Materials/Material.php
similarity index 81%
rename from app/Models/Material.php
rename to app/Models/Materials/Material.php
index b5f272d..2dbcf38 100644
--- a/app/Models/Material.php
+++ b/app/Models/Materials/Material.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Materials;
 
+use App\Models\File;
+use App\Models\Qualitys\Lot;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -32,4 +34,9 @@ public function lots()
     {
         return $this->hasMany(Lot::class, 'material_id');
     }
+
+    public function files()
+    {
+        return $this->morphMany(File::class, 'fileable');
+    }
 }
diff --git a/app/Models/MaterialInspection.php b/app/Models/Materials/MaterialInspection.php
similarity index 93%
rename from app/Models/MaterialInspection.php
rename to app/Models/Materials/MaterialInspection.php
index 8426d8b..5e6af9a 100644
--- a/app/Models/MaterialInspection.php
+++ b/app/Models/Materials/MaterialInspection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Materials;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/MaterialInspectionItem.php b/app/Models/Materials/MaterialInspectionItem.php
similarity index 90%
rename from app/Models/MaterialInspectionItem.php
rename to app/Models/Materials/MaterialInspectionItem.php
index 43162bc..742030f 100644
--- a/app/Models/MaterialInspectionItem.php
+++ b/app/Models/Materials/MaterialInspectionItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Materials;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/MaterialReceipt.php b/app/Models/Materials/MaterialReceipt.php
similarity index 95%
rename from app/Models/MaterialReceipt.php
rename to app/Models/Materials/MaterialReceipt.php
index 17c1b49..8fee6c7 100644
--- a/app/Models/MaterialReceipt.php
+++ b/app/Models/Materials/MaterialReceipt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Materials;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Member.php b/app/Models/Member.php
deleted file mode 100644
index 43fbe6a..0000000
--- a/app/Models/Member.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Fortify\TwoFactorAuthenticatable;
-use Laravel\Sanctum\HasApiTokens;
-
-class Member extends Authenticatable
-{
-    use HasApiTokens, Notifiable, TwoFactorAuthenticatable;
-
-    protected $primaryKey = 'mb_num'; // 기본 키 변경
-
-    protected $fillable = [
-        'mb_id', 'mb_pass', 'mb_name', 'mb_phone', 'mb_mail',
-        'email_verified_at', 'mb_type', 'mb_level', 'last_login',
-        'reg_date', 'remember_token'
-    ];
-
-    protected $hidden = [
-        'mb_pass', 'remember_token',
-    ];
-
-    protected $casts = [
-        'reg_date' => 'datetime',
-    ];
-
-    public function getAuthPassword()
-    {
-        return $this->mb_pass; // 기본 비밀번호 필드를 mb_pass로 설정
-    }
-
-    public function getAuthIdentifierName()
-    {
-        return 'mb_id'; // 기본 로그인 필드를 mb_id로 변경
-    }
-
-    public function company()
-    {
-        return $this->belongsTo(MemberCompany::class, 'tn_num', 'mc_num');
-        // members.tn_num = member_company.mc_num
-    }
-
-    public function tenant()
-    {
-        return $this->belongsTo(Tenant::class, 'tn_num');
-    }
-}
diff --git a/app/Models/MemberCompany.php b/app/Models/MemberCompany.php
deleted file mode 100644
index 641597c..0000000
--- a/app/Models/MemberCompany.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Models;
-use Illuminate\Database\Eloquent\Model;
-
-
-class MemberCompany extends Model
-{
-    protected $table = 'member_company';
-    protected $primaryKey = 'mc_num'; // 기본 키 변경
-
-    public function members()
-    {
-        return $this->hasMany(Member::class, 'tn_num', 'mc_num');
-        // member_company.mc_num = members.tn_num
-    }
-}
diff --git a/app/Models/User.php b/app/Models/Members/User.php
similarity index 86%
rename from app/Models/User.php
rename to app/Models/Members/User.php
index 4cf302a..acd343e 100644
--- a/app/Models/User.php
+++ b/app/Models/Members/User.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Members;
 
+use App\Models\Commons\Role;
+use App\Models\File;
+use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
-use App\Traits\ModelTrait;
 
 class User extends Authenticatable
 {
@@ -43,4 +45,9 @@ public function userTenantById($tenantId)
     {
         return $this->hasOne(UserTenant::class)->where('tenant_id', $tenantId);
     }
+
+    public function files()
+    {
+        return $this->morphMany(File::class, 'fileable');
+    }
 }
diff --git a/app/Models/UserMenuPermission.php b/app/Models/Members/UserMenuPermission.php
similarity index 87%
rename from app/Models/UserMenuPermission.php
rename to app/Models/Members/UserMenuPermission.php
index d1ec319..078db39 100644
--- a/app/Models/UserMenuPermission.php
+++ b/app/Models/Members/UserMenuPermission.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Members;
 
+use App\Models\Commons\Menu;
 use Illuminate\Database\Eloquent\Model;
 
 class UserMenuPermission extends Model
diff --git a/app/Models/UserRole.php b/app/Models/Members/UserRole.php
similarity index 86%
rename from app/Models/UserRole.php
rename to app/Models/Members/UserRole.php
index d3f4955..e683dc1 100644
--- a/app/Models/UserRole.php
+++ b/app/Models/Members/UserRole.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Members;
 
+use App\Models\Commons\Role;
+use App\Models\Tenants\Tenant;
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\BelongsToTenant;
 
 class UserRole extends Model
 {
diff --git a/app/Models/UserTenant.php b/app/Models/Members/UserTenant.php
similarity index 89%
rename from app/Models/UserTenant.php
rename to app/Models/Members/UserTenant.php
index 6c6b114..05777b4 100644
--- a/app/Models/UserTenant.php
+++ b/app/Models/Members/UserTenant.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Members;
 
+use App\Models\Tenants\Tenant;
+use App\Traits\BelongsToTenant;
+use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\ModelTrait;
-use App\Traits\BelongsToTenant;
 
 class UserTenant extends Model
 {
diff --git a/app/Models/Products/Bom.php b/app/Models/Products/Bom.php
index 3b9196d..472145f 100644
--- a/app/Models/Products/Bom.php
+++ b/app/Models/Products/Bom.php
@@ -2,6 +2,7 @@
 
 namespace App\Models\Products;
 
+use App\Models\Commons\File;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
diff --git a/app/Models/Products/File.php b/app/Models/Products/File.php
deleted file mode 100644
index ae38a0d..0000000
--- a/app/Models/Products/File.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Models\Products;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class File extends Model
-{
-    use SoftDeletes;
-    protected $fillable = ['tenant_id','file_path','file_name','file_size','mime_type','description'];
-}
diff --git a/app/Models/Products/Product.php b/app/Models/Products/Product.php
index 610f75a..dec6da5 100644
--- a/app/Models/Products/Product.php
+++ b/app/Models/Products/Product.php
@@ -16,4 +16,9 @@ public function category() {
     public function boms() {
         return $this->hasMany(Bom::class);
     }
+
+    public function files()
+    {
+        return $this->morphMany(File::class, 'fileable');
+    }
 }
diff --git a/app/Models/Lot.php b/app/Models/Qualitys/Lot.php
similarity index 85%
rename from app/Models/Lot.php
rename to app/Models/Qualitys/Lot.php
index b509c3b..83dc527 100644
--- a/app/Models/Lot.php
+++ b/app/Models/Qualitys/Lot.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Qualitys;
 
+use App\Models\Materials\Material;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
diff --git a/app/Models/LotSale.php b/app/Models/Qualitys/LotSale.php
similarity index 89%
rename from app/Models/LotSale.php
rename to app/Models/Qualitys/LotSale.php
index 6369713..2660e26 100644
--- a/app/Models/LotSale.php
+++ b/app/Models/Qualitys/LotSale.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Models;
+namespace App\Models\Qualitys;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Payment.php b/app/Models/Tenants/Payment.php
similarity index 93%
rename from app/Models/Payment.php
rename to app/Models/Tenants/Payment.php
index a307739..2ee4879 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Tenants/Payment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Tenants;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Plan.php b/app/Models/Tenants/Plan.php
similarity index 94%
rename from app/Models/Plan.php
rename to app/Models/Tenants/Plan.php
index 011329a..5ac11bc 100644
--- a/app/Models/Plan.php
+++ b/app/Models/Tenants/Plan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Tenants;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Subscription.php b/app/Models/Tenants/Subscription.php
similarity index 95%
rename from app/Models/Subscription.php
rename to app/Models/Tenants/Subscription.php
index 11c591e..14d22a9 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Tenants/Subscription.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Tenants;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Tenant.php b/app/Models/Tenants/Tenant.php
similarity index 82%
rename from app/Models/Tenant.php
rename to app/Models/Tenants/Tenant.php
index 67e8b22..c6f0ce5 100644
--- a/app/Models/Tenant.php
+++ b/app/Models/Tenants/Tenant.php
@@ -1,10 +1,15 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Tenants;
 
+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\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\ModelTrait;
 
 class Tenant extends Model
 {
@@ -63,4 +68,9 @@ public function userRoles()
     {
         return $this->hasMany(UserRole::class);
     }
+
+    public function files()
+    {
+        return $this->morphMany(File::class, 'fileable');
+    }
 }
diff --git a/app/Repositories/MainRequestRepository.php b/app/Repositories/MainRequestRepository.php
index 63328fb..1920afb 100644
--- a/app/Repositories/MainRequestRepository.php
+++ b/app/Repositories/MainRequestRepository.php
@@ -1,10 +1,10 @@
 <?php
 namespace App\Repositories;
 
+use App\Models\Estimates\MainRequestEstimate;
 use App\Models\MainRequest;
-use App\Models\MainRequestEstimate;
-use App\Models\MainRequestOrder;
 use App\Models\MainRequestFlow;
+use App\Models\MainRequestOrder;
 
 class MainRequestRepository
 {
diff --git a/app/Services/AdminPermissionService.php b/app/Services/AdminPermissionService.php
index a9c80aa..a7c56c8 100644
--- a/app/Services/AdminPermissionService.php
+++ b/app/Services/AdminPermissionService.php
@@ -2,9 +2,9 @@
 
 namespace App\Services;
 
-use Illuminate\Support\Facades\DB;
-use App\Models\User;
+use App\Models\Members\User;
 use App\Models\SiteAdmin;
+use Illuminate\Support\Facades\DB;
 
 class AdminPermissionService
 {
diff --git a/app/Services/EstimateService.php b/app/Services/EstimateService.php
index 941a6ad..7921802 100644
--- a/app/Services/EstimateService.php
+++ b/app/Services/EstimateService.php
@@ -2,8 +2,8 @@
 namespace App\Services;
 
 use App\Enums\EstimateStatus;
+use App\Models\Estimates\MainRequestEstimate;
 use App\Repositories\MainRequestRepository;
-use App\Models\MainRequestEstimate;
 
 class EstimateService
 {
diff --git a/app/Services/MemberService.php b/app/Services/MemberService.php
index 25e610d..3a78199 100644
--- a/app/Services/MemberService.php
+++ b/app/Services/MemberService.php
@@ -3,10 +3,8 @@
 namespace App\Services;
 
 use App\Helpers\ApiResponse;
-use App\Models\User;
+use App\Models\Members\User;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Http\Request;
-use Illuminate\Auth\AuthenticationException;
 
 class MemberService
 {
diff --git a/config/auth.php b/config/auth.php
index 0ba5d5d..6d03f6a 100644
--- a/config/auth.php
+++ b/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' => [
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index ea955ad..818f993 100644
--- a/database/factories/UserFactory.php
+++ b/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
 {
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index d01a0ef..9a05b4d 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -2,10 +2,11 @@
 
 namespace Database\Seeders;
 
-use App\Models\User;
-// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use App\Models\Members\User;
 use Illuminate\Database\Seeder;
 
+// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+
 class DatabaseSeeder extends Seeder
 {
     /**
diff --git a/tests/Feature/ApiTokenPermissionsTest.php b/tests/Feature/ApiTokenPermissionsTest.php
index b15bdbd..bcb5a82 100644
--- a/tests/Feature/ApiTokenPermissionsTest.php
+++ b/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;
diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php
index 7bfcae2..db371d2 100644
--- a/tests/Feature/AuthenticationTest.php
+++ b/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;
 
diff --git a/tests/Feature/BrowserSessionsTest.php b/tests/Feature/BrowserSessionsTest.php
index 770c435..c5f7755 100644
--- a/tests/Feature/BrowserSessionsTest.php
+++ b/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;
diff --git a/tests/Feature/CreateApiTokenTest.php b/tests/Feature/CreateApiTokenTest.php
index fab69d9..cc1ef61 100644
--- a/tests/Feature/CreateApiTokenTest.php
+++ b/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;
diff --git a/tests/Feature/DeleteAccountTest.php b/tests/Feature/DeleteAccountTest.php
index 561d692..e2f55f6 100644
--- a/tests/Feature/DeleteAccountTest.php
+++ b/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;
diff --git a/tests/Feature/DeleteApiTokenTest.php b/tests/Feature/DeleteApiTokenTest.php
index 1903e17..cedc01b 100644
--- a/tests/Feature/DeleteApiTokenTest.php
+++ b/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;
diff --git a/tests/Feature/EmailVerificationTest.php b/tests/Feature/EmailVerificationTest.php
index 5d3e336..2fa8eeb 100644
--- a/tests/Feature/EmailVerificationTest.php
+++ b/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;
diff --git a/tests/Feature/PasswordConfirmationTest.php b/tests/Feature/PasswordConfirmationTest.php
index 34c860a..abb4f95 100644
--- a/tests/Feature/PasswordConfirmationTest.php
+++ b/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;
 
diff --git a/tests/Feature/PasswordResetTest.php b/tests/Feature/PasswordResetTest.php
index a30e8cd..90aac0f 100644
--- a/tests/Feature/PasswordResetTest.php
+++ b/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;
diff --git a/tests/Feature/ProfileInformationTest.php b/tests/Feature/ProfileInformationTest.php
index ce1a8e7..15656c2 100644
--- a/tests/Feature/ProfileInformationTest.php
+++ b/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;
diff --git a/tests/Feature/TwoFactorAuthenticationSettingsTest.php b/tests/Feature/TwoFactorAuthenticationSettingsTest.php
index 1321659..3775ba7 100644
--- a/tests/Feature/TwoFactorAuthenticationSettingsTest.php
+++ b/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;
diff --git a/tests/Feature/UpdatePasswordTest.php b/tests/Feature/UpdatePasswordTest.php
index 57dbe2d..4fda1b2 100644
--- a/tests/Feature/UpdatePasswordTest.php
+++ b/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;