svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #18905 - update location of child assets if parent asset is checked in

Browse Source
This commit is contained in:
snipe
2026-05-07 12:20:25 +01:00
parent 9b5ead39d3
commit c22e4c00a5
4 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/AssetsController.php
+6
View File
@@ -1067,6 +1067,12 @@ class AssetsController extends Controller
});
if ($asset->save()) {
// Update the location of any child assets
Asset::where('assigned_type', Asset::class)
->where('assigned_to', $asset->id)
->update(['location_id' => $asset->location_id]);
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
return response()->json(Helper::formatStandardApiResponse('success', [
app/Http/Controllers/Assets/AssetCheckinController.php
+4
View File
@@ -175,6 +175,10 @@ class AssetCheckinController extends Controller
$asset->customFieldsForCheckinCheckout('display_checkin');
if ($asset->save()) {
// Update the location of any child assets
Asset::where('assigned_type', Asset::class)
->where('assigned_to', $asset->id)
->update(['location_id' => $asset->location_id]);
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
tests/Feature/Checkins/Api/AssetCheckinTest.php
+29
View File
@@ -120,6 +120,35 @@ class AssetCheckinTest extends TestCase
$this->assertNull($asset->refresh()->licenseseats->first()->assigned_to);
}
public function test_checking_in_asset_updates_location_of_assets_assigned_to_it()
{
$originalLocation = Location::factory()->create();
$checkedOutLocation = Location::factory()->create();
$parentAsset = Asset::factory()->assignedToLocation($checkedOutLocation)->create([
'location_id' => $checkedOutLocation->id,
'rtd_location_id' => $originalLocation->id,
]);
$childAsset = Asset::factory()->create([
'assigned_to' => $parentAsset->id,
'assigned_type' => Asset::class,
'location_id' => $checkedOutLocation->id,
'rtd_location_id' => $originalLocation->id,
]);
$this->actingAsForApi(User::factory()->checkinAssets()->create())
->postJson(route('api.asset.checkin', $parentAsset), [
'location_id' => $originalLocation->id,
])
->assertOk();
$this->assertEquals($originalLocation->id, $parentAsset->fresh()->location_id);
$this->assertEquals($originalLocation->id, $childAsset->fresh()->location_id);
$this->assertEquals($parentAsset->id, $childAsset->fresh()->assigned_to);
$this->assertEquals(Asset::class, $childAsset->fresh()->assigned_type);
}
public function test_legacy_location_values_set_to_zero_are_updated()
{
$asset = Asset::factory()->canBeInvalidUponCreation()->assignedToUser()->create([
tests/Feature/Checkins/Ui/AssetCheckinTest.php
+28
View File
@@ -206,6 +206,34 @@ class AssetCheckinTest extends TestCase
$this->assertNull($asset->refresh()->licenseseats->first()->assigned_to);
}
public function test_checking_in_asset_updates_location_of_assets_assigned_to_it()
{
$originalLocation = Location::factory()->create();
$checkedOutLocation = Location::factory()->create();
$parentAsset = Asset::factory()->assignedToLocation($checkedOutLocation)->create([
'location_id' => $checkedOutLocation->id,
'rtd_location_id' => $originalLocation->id,
]);
$childAsset = Asset::factory()->create([
'assigned_to' => $parentAsset->id,
'assigned_type' => Asset::class,
'location_id' => $checkedOutLocation->id,
'rtd_location_id' => $originalLocation->id,
]);
$this->actingAs(User::factory()->checkinAssets()->create())
->post(route('hardware.checkin.store', [$parentAsset]), [
'location_id' => $originalLocation->id,
]);
$this->assertEquals($originalLocation->id, $parentAsset->fresh()->location_id);
$this->assertEquals($originalLocation->id, $childAsset->fresh()->location_id);
$this->assertEquals($parentAsset->id, $childAsset->fresh()->assigned_to);
$this->assertEquals(Asset::class, $childAsset->fresh()->assigned_type);
}
public function test_legacy_location_values_set_to_zero_are_updated()
{
$asset = Asset::factory()->canBeInvalidUponCreation()->assignedToUser()->create([