Skip to content

A free open source IT asset/license management system

pr-review: fixup logical mistakes in db queries

Steven Danielee06910c843dc
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index af5c0c27d2..0d063db4d1 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -491,8 +491,7 @@ class AssetsController extends Controller
$assets = $assets->withTrashed();
}
- $total = $assets->count();
- if (($assets = $assets->get()) && $total > 0) {
+ if (($assets = $assets->get()) && ($total = $assets->count()) > 0) {
// If there is exactly one result and the deleted parameter is not passed, we should pull the first (and only)
// asset from the returned collection, since transformAsset() expects an Asset object, NOT a collection
@@ -548,7 +547,7 @@ class AssetsController extends Controller
$assets = $assets->skip($offset)->take($limit)->get();
- if (($assets) && $total > 0) {
+ if (($assets) && ($assets->count()) > 0) {
return (new AssetsTransformer)->transformAssets($assets, $total);
}
diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
index 5dedbfbbed..000510e64a 100644
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -52,8 +52,7 @@ class UploadedFilesController extends Controller
$uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
->with('adminuser');
- $total = $uploads->count();
- $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $offset = ($request->input('offset') > $uploads->count()) ? $uploads->count() : app('api_offset_value');
$limit = app('api_limit_value');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -71,6 +70,7 @@ class UploadedFilesController extends Controller
);
}
+ $total = $uploads->count();
$uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->get();
return (new UploadedFilesTransformer)->transformFiles($uploads, $total);