Allow including child assets in user.assets table

Author: marcusmoore

app/Http/Controllers/Api/AssetsController.php

@@ -143,6 +143,9 @@ public function index(Request $request, $action = null, $upcoming_status = null)
                 'supplier'
             ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
+        if ($request->input('include_child_assets') === 'true') {
+            $assets->with(['assignedAssets.assignedTo']);
+        }
 
         if ($filter_non_deprecable_assets) {
             $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
@@ -432,6 +435,16 @@ public function index(Request $request, $action = null, $upcoming_status = null)
         $total = $assets->count();
         $assets = $assets->skip($offset)->take($limit)->get();
 
+        if ($request->input('include_child_assets') === 'true') {
+            // Each asset might have a collection of assignedAssets on it.
+            // We need to move those up to the top level so the transformer runs on them.
+            foreach ($assets as $asset) {
+                if ($asset->assignedAssets->count()) {
+                    $assets = $assets->merge($asset->assignedAssets);
+                }
+            }
+        }
+
 
         /**
          * Include additional associated relationships

resources/views/users/view.blade.php

@@ -782,7 +782,7 @@
                     data-bulk-form-id="#assetsBulkForm"
                     id="userAssetsListingTable"
                     class="table table-striped snipe-table"
-                    data-url="{{ route('api.assets.index',['assigned_to' => e($user->id), 'assigned_type' => 'App\Models\User']) }}"
+                    data-url="{{ route('api.assets.index',['assigned_to' => e($user->id), 'assigned_type' => 'App\Models\User', 'include_child_assets' => 'true']) }}"
                     data-export-options='{
                 "fileName": "export-{{ str_slug($user->present()->fullName()) }}-assets-{{ date('Y-m-d') }}",
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

tests/Feature/Assets/Api/AssetIndexTest.php

@@ -171,4 +171,35 @@ public function testAssetApiIndexAdheresToCompanyScoping()
             ->assertResponseDoesNotContainInRows($assetA, 'asset_tag')
             ->assertResponseContainsInRows($assetB, 'asset_tag');
     }
+
+    public function testCanIncludeChildAssetsForGivenUser()
+    {
+        $user = User::factory()->create();
+
+        $parentAsset = Asset::factory()->assignedToUser($user)->create(['asset_tag' => 'parent-asset-tag']);
+        Asset::factory()->assignedToAsset($parentAsset)->create(['asset_tag' => 'child-asset-tag']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.assets.index', [
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                    'assigned_to' => $user->id,
+                    'assigned_type' => 'App\Models\User',
+                    'include_child_assets' => 'true',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson(function (AssertableJson $json) {
+                return $json->has('rows', 2)
+                    ->where('rows.0.asset_tag', 'parent-asset-tag')
+                    ->where('rows.1.asset_tag', 'child-asset-tag')
+                    ->etc();
+            });
+    }
 }

tests/Feature/Notifications/Email/CurrentInventoryTest.php

@@ -80,7 +80,6 @@ public function test_current_inventory_includes_child_assets_when_enabled()
     {
         $this->settings->enableShowingAssignedAssets();
 
-
         $user = User::factory()->create();
 
         $parentAsset = Asset::factory()->assignedToUser($user)->create(['asset_tag' => 'parent-asset-tag']);