A free open source IT asset/license management system
Company API: Eager load on show API endpoint
snipec3119457feb7
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.phpindex 2d56642cc8..60083df7b1 100644--- a/app/Http/Controllers/Api/CompaniesController.php+++ b/app/Http/Controllers/Api/CompaniesController.php@@ -140,6 +140,9 @@ class CompaniesController extends Controller$company = $request->handleImages($company);if ($company->save()) {+ $company->loadMissing('parent');+ $company->loadCount(['children as children_count' => fn ($q) => $q->withoutGlobalScopes()]);+return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.create.success')));}@@ -159,11 +162,12 @@ class CompaniesController extends Controllerpublic function show($id): array{$this->authorize('view', Company::class);- $company = Company::findOrFail($id);+ $company = Company::with('parent')+ ->withCount(['children as children_count' => fn ($q) => $q->withoutGlobalScopes()])+ ->findOrFail($id);$this->authorize('view', $company);return (new CompaniesTransformer)->transformCompany($company);-}/**@@ -184,6 +188,9 @@ class CompaniesController extends Controller$company = $request->handleImages($company);if ($company->save()) {+ $company->loadMissing('parent');+ $company->loadCount(['children as children_count' => fn ($q) => $q->withoutGlobalScopes()]);+return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.update.success')));}diff --git a/app/Models/User.php b/app/Models/User.phpindex e73ca7cad1..d5a237f540 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -1512,9 +1512,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo*/public function scopeOrderCompany($query, $order){+ // The MIN(...) aggregate has to go through DB::raw, which bypasses+ // Laravel's grammar — so the `companies` table reference inside the+ // raw string won't get DB_PREFIX applied automatically. Same pattern+ // as Api\AssetsController::index's natural-sort branch.+ $prefix = DB::getTablePrefix();$sub = DB::table('company_user')->join('companies', 'companies.id', '=', 'company_user.company_id')- ->select('company_user.user_id', DB::raw('MIN(companies.name) as min_company_name'))+ ->select('company_user.user_id', DB::raw('MIN('.$prefix.'companies.name) as min_company_name'))->groupBy('company_user.user_id');return $query