DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add scenario

Browse source
This commit is contained in:
Marcus Moore 2024-05-22 13:33:12 -07:00
parent 8ca882d1c8
commit c7fa2c04ad
No known key found for this signature in database
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/AssetsController.php
View file

@ -823,7 +823,6 @@ class AssetsController extends Controller
// This item is checked out to a location // This item is checked out to a location
if (request('checkout_to_type') == 'location') { if (request('checkout_to_type') == 'location') {
$target = Location::find(request('assigned_location')); $target = Location::find(request('assigned_location'));
// @todo: test the setting of ''
$asset->location_id = ($target) ? $target->id : ''; $asset->location_id = ($target) ? $target->id : '';
$error_payload['target_id'] = $request->input('assigned_location'); $error_payload['target_id'] = $request->input('assigned_location');
$error_payload['target_type'] = 'location'; $error_payload['target_type'] = 'location';
@ -836,10 +835,8 @@ class AssetsController extends Controller
$error_payload['target_type'] = 'asset'; $error_payload['target_type'] = 'asset';
} elseif (request('checkout_to_type') == 'user') { } elseif (request('checkout_to_type') == 'user') {
// @todo: test this code path
// Fetch the target and set the asset's new location_id // Fetch the target and set the asset's new location_id
$target = User::find(request('assigned_user')); $target = User::find(request('assigned_user'));
// @todo: test if this is needed or already handled in checkOut method
$asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : ''; $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : '';
$error_payload['target_id'] = $request->input('assigned_user'); $error_payload['target_id'] = $request->input('assigned_user');
$error_payload['target_type'] = 'user'; $error_payload['target_type'] = 'user';

12
tests/Feature/Api/Assets/AssetCheckoutTest.php
View file

@ -85,6 +85,18 @@ class AssetCheckoutTest extends TestCase
public function checkoutTargets(): array public function checkoutTargets(): array
{ {
return [ return [
'Checkout to User without location set' => [
function () {
$userLocation = Location::factory()->create();
$user = User::factory()->for($userLocation)->create(['location_id' => null]);
return [
'checkout_type' => 'user',
'target' => $user,
'expected_location' => null,
];
}
],
'Checkout to User' => [ 'Checkout to User' => [
function () { function () {
$userLocation = Location::factory()->create(); $userLocation = Location::factory()->create();