A free open source IT asset/license management system
Fixed #19642 - remaining count for requestable asset models always 0
snipec96e856920e7
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.phpindex fce0a03206..0f01715e89 100644--- a/app/Http/Controllers/Api/AssetModelsController.php+++ b/app/Http/Controllers/Api/AssetModelsController.php@@ -432,7 +432,7 @@ class AssetModelsController extends Controller$limit = app('api_limit_value');$order = $request->input('order') === 'asc' ? 'asc' : 'desc';- $sort = in_array($request->input('sort'), ['name', 'created_at'], true) ? $request->input('sort') : 'name';+ $sort = in_array($request->input('sort'), ['name', 'created_at', 'remaining'], true) ? $request->input('sort') : 'name';$rows = $query->orderBy($sort, $order)->skip($offset)->take($limit)->get();diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.phpindex 67c5cae9c3..659eef4818 100644--- a/app/Http/Transformers/AssetModelsTransformer.php+++ b/app/Http/Transformers/AssetModelsTransformer.php@@ -59,7 +59,9 @@ class AssetModelsTransformer'assets_count' => (int) $assetmodel->assets_count,'assets_assigned_count' => (int) $assetmodel->assets_assigned_count,'assets_archived_count' => (int) $assetmodel->assets_archived_count,- 'remaining' => (int) ($assetmodel->assets_count - (int) $assetmodel->assets_assigned_count) - (int) $assetmodel->assets_archived_count,+ 'remaining' => $assetmodel->remaining !== null+ ? (int) $assetmodel->remaining+ : (int) ($assetmodel->assets_count - (int) $assetmodel->assets_assigned_count) - (int) $assetmodel->assets_archived_count,'percent_remaining' => round($assetmodel->percentRemaining()),'category' => ($assetmodel->category) ? ['id' => (int) $assetmodel->category->id,diff --git a/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php b/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.phpindex e23568b649..0e34d45a43 100644--- a/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php+++ b/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php@@ -149,4 +149,31 @@ class RequestableAssetModelsApiTest extends TestCase$this->assertTrue($rowWith['available_actions']['view']);$this->assertFalse($rowWithout['available_actions']['view']);}++ public function test_remaining_reflects_deployable_asset_count(): void+ {+ $model = AssetModel::factory()->create(['requestable' => 1]);+ $rtd = \App\Models\Statuslabel::factory()->rtd()->create();++ // Three deployable + unassigned assets of this model, one already+ // assigned. `remaining` should count only the three unassigned.+ \App\Models\Asset::factory()->count(3)->create([+ 'model_id' => $model->id,+ 'status_id' => $rtd->id,+ 'assigned_to' => null,+ ]);+ \App\Models\Asset::factory()->create([+ 'model_id' => $model->id,+ 'status_id' => $rtd->id,+ 'assigned_to' => User::factory()->create()->id,+ 'assigned_type' => User::class,+ ]);++ $row = $this->actingAsForApi(User::factory()->create())+ ->getJson(route('api.assetmodels.requestable'))+ ->assertOk()+ ->json('rows.0');++ $this->assertSame(3, $row['remaining']);+ }}