diff --git a/app/Http/Controllers/Api/Admin/DepartmentController.php b/app/Http/Controllers/Api/Admin/DepartmentController.php index 0885bb09..ffde11ad 100644 --- a/app/Http/Controllers/Api/Admin/DepartmentController.php +++ b/app/Http/Controllers/Api/Admin/DepartmentController.php @@ -77,7 +77,7 @@ public function show(Request $request, int $id): JsonResponse { $department = $this->departmentService->getDepartmentById($id); - if (!$department) { + if (! $department) { return response()->json([ 'success' => false, 'message' => '부서를 찾을 수 없습니다.', @@ -104,7 +104,7 @@ public function update(UpdateDepartmentRequest $request, int $id): JsonResponse { $result = $this->departmentService->updateDepartment($id, $request->validated()); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '부서 수정에 실패했습니다.', @@ -133,7 +133,7 @@ public function destroy(Request $request, int $id): JsonResponse { $result = $this->departmentService->deleteDepartment($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '부서 삭제에 실패했습니다. (하위 부서가 존재할 수 있습니다)', @@ -154,4 +154,4 @@ public function destroy(Request $request, int $id): JsonResponse 'message' => '부서가 삭제되었습니다.', ]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Api/Admin/MenuController.php b/app/Http/Controllers/Api/Admin/MenuController.php index 59450fd0..45218a7f 100644 --- a/app/Http/Controllers/Api/Admin/MenuController.php +++ b/app/Http/Controllers/Api/Admin/MenuController.php @@ -28,6 +28,7 @@ public function index(Request $request): JsonResponse // HTMX 요청인 경우 HTML 반환 if ($request->header('HX-Request')) { $html = view('menus.partials.table', compact('menus'))->render(); + return response()->json(['html' => $html]); } @@ -65,7 +66,7 @@ public function show(int $id): JsonResponse { $menu = $this->menuService->getMenuById($id); - if (!$menu) { + if (! $menu) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없습니다.', @@ -95,7 +96,7 @@ public function store(StoreMenuRequest $request): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 생성에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 생성에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -108,7 +109,7 @@ public function update(UpdateMenuRequest $request, int $id): JsonResponse try { $result = $this->menuService->updateMenu($id, $request->validated()); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없거나 수정할 수 없습니다.', @@ -123,7 +124,7 @@ public function update(UpdateMenuRequest $request, int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 수정에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 수정에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -136,7 +137,7 @@ public function destroy(int $id): JsonResponse try { $result = $this->menuService->deleteMenu($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없거나 자식 메뉴가 있어 삭제할 수 없습니다.', @@ -150,7 +151,7 @@ public function destroy(int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 삭제에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 삭제에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -183,7 +184,7 @@ public function restore(Request $request, int $id): JsonResponse public function forceDestroy(Request $request, int $id): JsonResponse { // 슈퍼관리자 권한 체크 - if (!auth()->user()?->is_super_admin) { + if (! auth()->user()?->is_super_admin) { return response()->json([ 'success' => false, 'message' => '권한이 없습니다.', @@ -193,7 +194,7 @@ public function forceDestroy(Request $request, int $id): JsonResponse try { $result = $this->menuService->forceDeleteMenu($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없거나 자식 메뉴가 있어 영구 삭제할 수 없습니다.', @@ -216,7 +217,7 @@ public function forceDestroy(Request $request, int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 영구 삭제에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 영구 삭제에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -229,7 +230,7 @@ public function toggleActive(Request $request, int $id): JsonResponse try { $result = $this->menuService->toggleActive($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없습니다.', @@ -252,7 +253,7 @@ public function toggleActive(Request $request, int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 활성 상태 변경에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 활성 상태 변경에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -265,7 +266,7 @@ public function toggleHidden(Request $request, int $id): JsonResponse try { $result = $this->menuService->toggleHidden($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '메뉴를 찾을 수 없습니다.', @@ -288,7 +289,7 @@ public function toggleHidden(Request $request, int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '메뉴 숨김 상태 변경에 실패했습니다: ' . $e->getMessage(), + 'message' => '메뉴 숨김 상태 변경에 실패했습니다: '.$e->getMessage(), ], 500); } } diff --git a/app/Http/Controllers/Api/Admin/RoleController.php b/app/Http/Controllers/Api/Admin/RoleController.php index 75ab765b..f968895e 100644 --- a/app/Http/Controllers/Api/Admin/RoleController.php +++ b/app/Http/Controllers/Api/Admin/RoleController.php @@ -77,7 +77,7 @@ public function show(Request $request, int $id): JsonResponse { $role = $this->roleService->getRoleById($id); - if (!$role) { + if (! $role) { return response()->json([ 'success' => false, 'message' => '역할을 찾을 수 없습니다.', @@ -140,4 +140,4 @@ public function destroy(Request $request, int $id): JsonResponse 'message' => '역할이 삭제되었습니다.', ]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Api/Admin/TenantController.php b/app/Http/Controllers/Api/Admin/TenantController.php index 83dfd9ff..30b058d3 100644 --- a/app/Http/Controllers/Api/Admin/TenantController.php +++ b/app/Http/Controllers/Api/Admin/TenantController.php @@ -77,7 +77,7 @@ public function show(Request $request, int $id): JsonResponse { $tenant = $this->tenantService->getTenantById($id, true); - if (!$tenant) { + if (! $tenant) { return response()->json([ 'success' => false, 'message' => '테넌트를 찾을 수 없습니다.', @@ -169,7 +169,7 @@ public function restore(Request $request, int $id): JsonResponse public function forceDestroy(Request $request, int $id): JsonResponse { // 슈퍼관리자 권한 체크 - if (!auth()->user()?->is_super_admin) { + if (! auth()->user()?->is_super_admin) { return response()->json([ 'success' => false, 'message' => '권한이 없습니다.', @@ -205,4 +205,4 @@ public function stats(Request $request): JsonResponse 'data' => $stats, ]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Api/Admin/UserController.php b/app/Http/Controllers/Api/Admin/UserController.php index 8a71af77..87350a96 100644 --- a/app/Http/Controllers/Api/Admin/UserController.php +++ b/app/Http/Controllers/Api/Admin/UserController.php @@ -28,6 +28,7 @@ public function index(Request $request): JsonResponse // HTMX 요청인 경우 HTML 반환 if ($request->header('HX-Request')) { $html = view('users.partials.table', compact('users'))->render(); + return response()->json(['html' => $html]); } @@ -51,7 +52,7 @@ public function show(int $id): JsonResponse { $user = $this->userService->getUserById($id); - if (!$user) { + if (! $user) { return response()->json([ 'success' => false, 'message' => '사용자를 찾을 수 없습니다.', @@ -81,7 +82,7 @@ public function store(StoreUserRequest $request): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '사용자 생성에 실패했습니다: ' . $e->getMessage(), + 'message' => '사용자 생성에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -94,7 +95,7 @@ public function update(UpdateUserRequest $request, int $id): JsonResponse try { $result = $this->userService->updateUser($id, $request->validated()); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '사용자를 찾을 수 없습니다.', @@ -109,7 +110,7 @@ public function update(UpdateUserRequest $request, int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '사용자 수정에 실패했습니다: ' . $e->getMessage(), + 'message' => '사용자 수정에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -122,7 +123,7 @@ public function destroy(int $id): JsonResponse try { $result = $this->userService->deleteUser($id); - if (!$result) { + if (! $result) { return response()->json([ 'success' => false, 'message' => '사용자를 찾을 수 없습니다.', @@ -136,7 +137,7 @@ public function destroy(int $id): JsonResponse } catch (\Exception $e) { return response()->json([ 'success' => false, - 'message' => '사용자 삭제에 실패했습니다: ' . $e->getMessage(), + 'message' => '사용자 삭제에 실패했습니다: '.$e->getMessage(), ], 500); } } @@ -169,7 +170,7 @@ public function restore(Request $request, int $id): JsonResponse public function forceDestroy(Request $request, int $id): JsonResponse { // 슈퍼관리자 권한 체크 - if (!auth()->user()?->is_super_admin) { + if (! auth()->user()?->is_super_admin) { return response()->json([ 'success' => false, 'message' => '권한이 없습니다.', @@ -192,4 +193,4 @@ public function forceDestroy(Request $request, int $id): JsonResponse 'message' => '사용자가 영구 삭제되었습니다.', ]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 7fd97a76..dc11fd63 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -55,4 +55,4 @@ public function logout(): RedirectResponse return redirect('/login') ->with('success', '로그아웃되었습니다.'); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/DepartmentController.php b/app/Http/Controllers/DepartmentController.php index 56b40eb6..dba35c27 100644 --- a/app/Http/Controllers/DepartmentController.php +++ b/app/Http/Controllers/DepartmentController.php @@ -37,7 +37,7 @@ public function edit(int $id): View { $department = $this->departmentService->getDepartmentById($id); - if (!$department) { + if (! $department) { abort(404, '부서를 찾을 수 없습니다.'); } @@ -45,4 +45,4 @@ public function edit(int $id): View return view('departments.edit', compact('department', 'departments')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php index 45ad884e..52fbb77d 100644 --- a/app/Http/Controllers/MenuController.php +++ b/app/Http/Controllers/MenuController.php @@ -37,7 +37,7 @@ public function edit(int $id): View { $menu = $this->menuService->getMenuById($id); - if (!$menu) { + if (! $menu) { abort(404, '메뉴를 찾을 수 없습니다.'); } diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index 9cef3c99..ab55171e 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -48,7 +48,7 @@ public function edit(int $id): View { $role = $this->roleService->getRoleById($id); - if (!$role) { + if (! $role) { abort(404, '역할을 찾을 수 없습니다.'); } @@ -70,4 +70,4 @@ public function edit(int $id): View return view('roles.edit', compact('role', 'permissions', 'rolePermissionIds')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/TenantController.php b/app/Http/Controllers/TenantController.php index 953a07ec..82c5ddc9 100644 --- a/app/Http/Controllers/TenantController.php +++ b/app/Http/Controllers/TenantController.php @@ -35,7 +35,7 @@ public function edit(int $id): View { $tenant = $this->tenantService->getTenantById($id); - if (!$tenant) { + if (! $tenant) { abort(404, '테넌트를 찾을 수 없습니다.'); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index cd76c2b4..da61a58d 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -35,10 +35,10 @@ public function edit(int $id): View { $user = $this->userService->getUserById($id); - if (!$user) { + if (! $user) { abort(404, '사용자를 찾을 수 없습니다.'); } return view('users.edit', compact('user')); } -} \ No newline at end of file +} diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php index f27227af..4962a6f2 100644 --- a/app/Http/Requests/Auth/LoginRequest.php +++ b/app/Http/Requests/Auth/LoginRequest.php @@ -51,4 +51,4 @@ public function attributes(): array 'password' => '비밀번호', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/StoreDepartmentRequest.php b/app/Http/Requests/StoreDepartmentRequest.php index 04789300..4e2a8dfa 100644 --- a/app/Http/Requests/StoreDepartmentRequest.php +++ b/app/Http/Requests/StoreDepartmentRequest.php @@ -69,4 +69,4 @@ public function messages(): array 'sort_order.min' => '정렬 순서는 0 이상이어야 합니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/StoreRoleRequest.php b/app/Http/Requests/StoreRoleRequest.php index f0545d92..0ff3ccc2 100644 --- a/app/Http/Requests/StoreRoleRequest.php +++ b/app/Http/Requests/StoreRoleRequest.php @@ -62,4 +62,4 @@ public function messages(): array 'permissions.*.exists' => '유효하지 않은 권한이 포함되어 있습니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/StoreTenantRequest.php b/app/Http/Requests/StoreTenantRequest.php index 838f8d37..3ee5652a 100644 --- a/app/Http/Requests/StoreTenantRequest.php +++ b/app/Http/Requests/StoreTenantRequest.php @@ -92,4 +92,4 @@ public function attributes(): array 'admin_memo' => '관리자 메모', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/StoreUserRequest.php index 3a428273..1b782f3b 100644 --- a/app/Http/Requests/StoreUserRequest.php +++ b/app/Http/Requests/StoreUserRequest.php @@ -3,7 +3,6 @@ namespace App\Http\Requests; use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; class StoreUserRequest extends FormRequest { @@ -68,4 +67,4 @@ public function messages(): array 'password.min' => '비밀번호는 최소 8자 이상이어야 합니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/UpdateDepartmentRequest.php b/app/Http/Requests/UpdateDepartmentRequest.php index 64741e4a..f206f187 100644 --- a/app/Http/Requests/UpdateDepartmentRequest.php +++ b/app/Http/Requests/UpdateDepartmentRequest.php @@ -76,4 +76,4 @@ public function messages(): array 'sort_order.min' => '정렬 순서는 0 이상이어야 합니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/UpdateRoleRequest.php b/app/Http/Requests/UpdateRoleRequest.php index a61ed5e9..ac512cdc 100644 --- a/app/Http/Requests/UpdateRoleRequest.php +++ b/app/Http/Requests/UpdateRoleRequest.php @@ -64,4 +64,4 @@ public function messages(): array 'permissions.*.exists' => '유효하지 않은 권한이 포함되어 있습니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/UpdateTenantRequest.php b/app/Http/Requests/UpdateTenantRequest.php index 6c3bff03..06d93f86 100644 --- a/app/Http/Requests/UpdateTenantRequest.php +++ b/app/Http/Requests/UpdateTenantRequest.php @@ -100,4 +100,4 @@ public function attributes(): array 'admin_memo' => '관리자 메모', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php index 7e404342..8c45c124 100644 --- a/app/Http/Requests/UpdateUserRequest.php +++ b/app/Http/Requests/UpdateUserRequest.php @@ -80,4 +80,4 @@ public function messages(): array 'password.min' => '비밀번호는 최소 8자 이상이어야 합니다.', ]; } -} \ No newline at end of file +} diff --git a/app/Models/Role.php b/app/Models/Role.php index 8d96da8c..14749a91 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use Illuminate\Database\Eloquent\Relations\HasMany; use Spatie\Permission\Models\Permission; class Role extends Model @@ -54,4 +53,4 @@ public function users(): BelongsToMany 'model_id' )->wherePivot('model_type', User::class); } -} \ No newline at end of file +} diff --git a/app/Models/Tenants/Tenant.php b/app/Models/Tenants/Tenant.php index c1e902b4..adf823c5 100644 --- a/app/Models/Tenants/Tenant.php +++ b/app/Models/Tenants/Tenant.php @@ -93,7 +93,7 @@ public function roles(): HasMany */ public function getStatusBadgeColorAttribute(): string { - return match($this->tenant_st_code) { + return match ($this->tenant_st_code) { 'active' => 'success', 'trial' => 'warning', 'suspended', 'expired' => 'error', @@ -106,7 +106,7 @@ public function getStatusBadgeColorAttribute(): string */ public function getStatusLabelAttribute(): string { - return match($this->tenant_st_code) { + return match ($this->tenant_st_code) { 'trial' => '트라이얼', 'active' => '활성', 'suspended' => '정지', @@ -120,11 +120,11 @@ public function getStatusLabelAttribute(): string */ public function getBillingTypeLabelAttribute(): ?string { - if (!$this->billing_tp_code) { + if (! $this->billing_tp_code) { return null; } - return match($this->billing_tp_code) { + return match ($this->billing_tp_code) { 'monthly' => '월간', 'yearly' => '연간', 'free' => '무료', diff --git a/app/Services/AuthService.php b/app/Services/AuthService.php index 6bd98c6a..13970b45 100644 --- a/app/Services/AuthService.php +++ b/app/Services/AuthService.php @@ -31,7 +31,7 @@ public function createToken(array $credentials): ?string { $user = User::where('email', $credentials['email'])->first(); - if (!$user || !Hash::check($credentials['password'], $user->password)) { + if (! $user || ! Hash::check($credentials['password'], $user->password)) { return null; } @@ -45,4 +45,4 @@ public function user(): ?User { return Auth::user(); } -} \ No newline at end of file +} diff --git a/app/Services/DepartmentService.php b/app/Services/DepartmentService.php index 1e3bb5cc..3195a6a8 100644 --- a/app/Services/DepartmentService.php +++ b/app/Services/DepartmentService.php @@ -23,12 +23,12 @@ public function getDepartments(array $filters = [], int $perPage = 15): LengthAw } // 검색 필터 - if (!empty($filters['search'])) { + if (! empty($filters['search'])) { $search = $filters['search']; $query->where(function ($q) use ($search) { $q->where('name', 'like', "%{$search}%") - ->orWhere('code', 'like', "%{$search}%") - ->orWhere('description', 'like', "%{$search}%"); + ->orWhere('code', 'like', "%{$search}%") + ->orWhere('description', 'like', "%{$search}%"); }); } @@ -90,7 +90,7 @@ public function updateDepartment(int $id, array $data): bool { $department = $this->getDepartmentById($id); - if (!$department) { + if (! $department) { return false; } @@ -119,7 +119,7 @@ public function deleteDepartment(int $id): bool { $department = $this->getDepartmentById($id); - if (!$department) { + if (! $department) { return false; } @@ -188,4 +188,4 @@ public function getDepartmentStats(): array 'inactive' => (clone $baseQuery)->where('is_active', false)->count(), ]; } -} \ No newline at end of file +} diff --git a/app/Services/MenuService.php b/app/Services/MenuService.php index 12f0e2d9..e33cb15e 100644 --- a/app/Services/MenuService.php +++ b/app/Services/MenuService.php @@ -135,6 +135,7 @@ public function getMenuTree(?int $tenantId = null): Collection // 부모 메뉴만 필터링하고 자식 메뉴를 재귀적으로 연결 return $allMenus->where('parent_id', null)->map(function ($menu) use ($allMenus) { $menu->children = $this->buildChildren($menu, $allMenus); + return $menu; }); } @@ -148,6 +149,7 @@ private function buildChildren(Menu $parent, Collection $allMenus): Collection return $children->map(function ($child) use ($allMenus) { $child->children = $this->buildChildren($child, $allMenus); + return $child; }); } @@ -269,6 +271,7 @@ public function deleteMenu(int $id): bool public function restoreMenu(int $id): bool { $menu = Menu::onlyTrashed()->findOrFail($id); + return $menu->restore(); } diff --git a/app/Services/RoleService.php b/app/Services/RoleService.php index 35c4e9c2..9c11d4f7 100644 --- a/app/Services/RoleService.php +++ b/app/Services/RoleService.php @@ -25,11 +25,11 @@ public function getRoles(array $filters = [], int $perPage = 15): LengthAwarePag } // 검색 필터 - if (!empty($filters['search'])) { + if (! empty($filters['search'])) { $search = $filters['search']; $query->where(function ($q) use ($search) { $q->where('name', 'like', "%{$search}%") - ->orWhere('description', 'like', "%{$search}%"); + ->orWhere('description', 'like', "%{$search}%"); }); } @@ -75,7 +75,7 @@ public function createRole(array $data): Role ]); // 권한 동기화 (있는 경우) - if (!empty($data['permissions'])) { + if (! empty($data['permissions'])) { $role->syncPermissions($data['permissions']); } @@ -89,7 +89,7 @@ public function updateRole(int $id, array $data): bool { $role = $this->getRoleById($id); - if (!$role) { + if (! $role) { return false; } @@ -113,7 +113,7 @@ public function deleteRole(int $id): bool { $role = $this->getRoleById($id); - if (!$role) { + if (! $role) { return false; } @@ -180,4 +180,4 @@ public function getRoleStats(): array 'with_permissions' => (clone $baseQuery)->has('permissions')->count(), ]; } -} \ No newline at end of file +} diff --git a/app/Services/TenantService.php b/app/Services/TenantService.php index 7c05368e..6650b56e 100644 --- a/app/Services/TenantService.php +++ b/app/Services/TenantService.php @@ -18,17 +18,17 @@ public function getTenants(array $filters = [], int $perPage = 15): LengthAwareP ->withTrashed(); // 검색 필터 - if (!empty($filters['search'])) { + if (! empty($filters['search'])) { $search = $filters['search']; $query->where(function ($q) use ($search) { $q->where('company_name', 'like', "%{$search}%") - ->orWhere('code', 'like', "%{$search}%") - ->orWhere('email', 'like', "%{$search}%"); + ->orWhere('code', 'like', "%{$search}%") + ->orWhere('email', 'like', "%{$search}%"); }); } // 상태 필터 - if (!empty($filters['tenant_st_code'])) { + if (! empty($filters['tenant_st_code'])) { $query->where('tenant_st_code', $filters['tenant_st_code']); } @@ -77,6 +77,7 @@ public function createTenant(array $data): Tenant public function updateTenant(int $id, array $data): bool { $tenant = Tenant::findOrFail($id); + return $tenant->update($data); } @@ -86,6 +87,7 @@ public function updateTenant(int $id, array $data): bool public function deleteTenant(int $id): bool { $tenant = Tenant::findOrFail($id); + return $tenant->delete(); } @@ -95,6 +97,7 @@ public function deleteTenant(int $id): bool public function restoreTenant(int $id): bool { $tenant = Tenant::onlyTrashed()->findOrFail($id); + return $tenant->restore(); } @@ -153,4 +156,4 @@ public function getTenantStats(): array 'trashed' => Tenant::onlyTrashed()->count(), ]; } -} \ No newline at end of file +} diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 89e1fa35..92996c4c 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -140,6 +140,7 @@ public function deleteUser(int $id): bool public function restoreUser(int $id): bool { $user = User::onlyTrashed()->findOrFail($id); + return $user->restore(); }