A free open source IT asset/license management system
Use query clone to prevent n+1
snipefe308ef2e487
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.phpindex a4cb7a8d56..4a2bef8072 100644--- a/app/Http/Controllers/Api/AccessoriesController.php+++ b/app/Http/Controllers/Api/AccessoriesController.php@@ -405,11 +405,11 @@ class AccessoriesController extends Controllerpublic function history(Request $request, Accessory $accessory): JsonResponse|array{$this->authorize('history', $accessory);- $history = $accessory->getHistory($request);- $total = $accessory->getHistory($request)->count();+ $historyQuery = $accessory->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.phpindex bf7d674b10..139e627fe1 100644--- a/app/Http/Controllers/Api/AssetModelsController.php+++ b/app/Http/Controllers/Api/AssetModelsController.php@@ -343,11 +343,11 @@ class AssetModelsController extends Controllerpublic function history(Request $request, AssetModel $model): JsonResponse|array{$this->authorize('history', $model);- $history = $model->getHistory($request);- $total = $model->getHistory($request)->count();+ $historyQuery = $model->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 4c1a0edc28..7a0ce050d6 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -1468,11 +1468,11 @@ class AssetsController extends Controllerpublic function history(Request $request, Asset $asset): JsonResponse|array{$this->authorize('history', $asset);- $history = $asset->getHistory($request);- $total = $asset->getHistory($request)->count();+ $historyQuery = $asset->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.phpindex f75b316bc3..8731140c2f 100644--- a/app/Http/Controllers/Api/ComponentsController.php+++ b/app/Http/Controllers/Api/ComponentsController.php@@ -391,11 +391,11 @@ class ComponentsController extends Controllerpublic function history(Request $request, Component $component): JsonResponse|array{$this->authorize('history', $component);- $history = $component->getHistory($request);- $total = $component->getHistory($request)->count();+ $historyQuery = $component->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.phpindex 325b0cc134..b41b72a645 100644--- a/app/Http/Controllers/Api/ConsumablesController.php+++ b/app/Http/Controllers/Api/ConsumablesController.php@@ -361,11 +361,11 @@ class ConsumablesController extends Controllerpublic function history(Request $request, Consumable $consumable): JsonResponse|array{$this->authorize('history', $consumable);- $history = $consumable->getHistory($request);- $total = $consumable->getHistory($request)->count();+ $historyQuery = $consumable->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.phpindex 5eece6fd6e..d7a647fc54 100644--- a/app/Http/Controllers/Api/LicensesController.php+++ b/app/Http/Controllers/Api/LicensesController.php@@ -282,11 +282,11 @@ class LicensesController extends Controllerpublic function history(Request $request, License $license): JsonResponse|array{$this->authorize('history', $license);- $history = $license->getHistory($request);- $total = $license->getHistory($request)->count();+ $historyQuery = $license->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.phpindex 2bf9d3f5f1..3093d3de4d 100644--- a/app/Http/Controllers/Api/LocationsController.php+++ b/app/Http/Controllers/Api/LocationsController.php@@ -462,11 +462,11 @@ class LocationsController extends Controllerpublic function history(Request $request, Location $location): JsonResponse|array{$this->authorize('history', $location);- $history = $location->getHistory($request);- $total = $location->getHistory($request)->count();+ $historyQuery = $location->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.phpindex 1c95e88fc2..1f14ffa08a 100644--- a/app/Http/Controllers/Api/MaintenancesController.php+++ b/app/Http/Controllers/Api/MaintenancesController.php@@ -260,11 +260,11 @@ class MaintenancesController extends Controller$this->authorize('view', Asset::class);$asset = $maintenance->asset;$this->authorize('history', $asset);- $history = $maintenance->getHistory($request);- $total = $maintenance->getHistory($request)->count();+ $historyQuery = $maintenance->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.phpindex 9b374f343d..f17d46d395 100644--- a/app/Http/Controllers/Api/UsersController.php+++ b/app/Http/Controllers/Api/UsersController.php@@ -939,11 +939,11 @@ class UsersController extends Controllerpublic function history(Request $request, User $user): JsonResponse|array{$this->authorize('history', $user);- $history = $user->getHistory($request);- $total = $user->getHistory($request)->count();+ $historyQuery = $user->getHistory($request);+ $total = (clone $historyQuery)->count();$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');$limit = app('api_limit_value');- $history = $history->skip($offset)->take($limit)->get();+ $history = (clone $historyQuery)->skip($offset)->take($limit)->get();return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);}