DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

added some more check out assertions

Browse source
This commit is contained in:
spencerrlongg 2023-11-30 11:53:26 -06:00
parent 151ceb5fbe
commit 135b7bde7d
3 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -533,7 +533,6 @@ class AssetsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
* @param \App\Http\Requests\ImageUploadRequest $request
* @since [v4.0]
* @return \Illuminate\Http\JsonResponse
*/
public function store(StoreAssetRequest $request): JsonResponse
{
@ -546,7 +545,7 @@ class AssetsController extends Controller
// @todo: verify eol is working as expected - move to request? or do I want this at all?
// might just remove this and then use the method from here https://github.com/snipe/snipe-it/pull/13846
$asset->asset_eol_date = $request->validated()['asset_eol_date'] ?? $asset->present()->eol_date(); // so this isn't really necessary, because it's happening on the observer - but that might change?
$asset->archived = '0';
$asset->archived = false;
$asset->physical = '1';
$asset->depreciate = '0';

14
app/Models/Asset.php
View file

@ -70,6 +70,8 @@ class Asset extends Depreciable
protected $injectUniqueIdentifier = true;
protected $casts = [
'archived' => 'boolean',
'physical' => 'boolean',
'purchase_date' => 'date',
'eol_explicit' => 'boolean',
'last_checkout' => 'datetime',
@ -94,7 +96,7 @@ class Asset extends Depreciable
'status_id' => 'required|integer|exists:status_labels,id',
'company_id' => 'nullable|integer|exists:companies,id',
'warranty_months' => 'nullable|numeric|digits_between:0,240',
'physical' => 'nullable|numeric|max:1',
'physical' => 'nullable|boolean',
'last_checkout' => 'nullable|date_format:Y-m-d H:i:s',
'expected_checkin' => 'nullable|date',
'location_id' => 'nullable|exists:locations,id',
@ -471,6 +473,16 @@ class Asset extends Depreciable
return $this->assignedType() === self::USER;
}
public function checkedOutToLocation()
{
return $this->assignedType() === self::LOCATION;
}
public function checkedOutToAsset()
{
return $this->assignedType() === self::ASSET;
}
/**
* Get the target this asset is checked out to
*

22
tests/Feature/Api/Assets/AssetStoreTest.php
View file

@ -37,12 +37,12 @@ class AssetStoreTest extends TestCase
$response = $this->actingAsForApi($user)
->postJson(route('api.assets.store'), [
'archived' => true,
'archived' => false, // set explicitly in controller
'asset_eol_date' => '2024-06-02',
'asset_tag' => 'random_string',
'assigned_user' => $userAssigned->id, // assigned_to is set in the request, assigned_to isn't set through the api request
'company_id' => $company->id,
'depreciate' => true,
//'depreciate' => true, // set explicitly in controller
'last_audit_date' => '2023-09-03',
'location_id' => $location->id,
'model_id' => $model->id,
@ -57,6 +57,7 @@ class AssetStoreTest extends TestCase
'status_id' => $status->id,
'supplier_id' => $supplier->id,
'warranty_months' => 10,
//'physical' => true, // set explicitly in controller
])
->assertOk()
->assertStatusMessageIs('success')
@ -67,13 +68,14 @@ class AssetStoreTest extends TestCase
$this->assertTrue($asset->adminuser->is($user));
// @todo: this is explicitly set 0 in the controller but they docs say they are customizable
// $this->assertTrue($asset->archived);
$this->assertFalse($asset->archived);
$this->assertTrue($asset->physical);
// @todo: This isn't in the docs but it's in the controller
$this->assertEquals('2024-06-02', $asset->asset_eol_date);
$this->assertEquals('random_string', $asset->asset_tag);
// @todo: This isn't in the docs but it's in the controller (should it be removed?)
$this->assertEquals($userAssigned->id, $asset->assigned_to);
// @todo: This is not in the docs but it's in the controller
// @todo: This is not in the docs but it's in the controller (company_id)
$this->assertTrue($asset->company->is($company));
// @todo: this is explicitly set 0 in the controller but they docs say they are customizable
// $this->assertTrue($asset->depreciate);
@ -136,7 +138,7 @@ class AssetStoreTest extends TestCase
$this->assertNull($asset->asset_eol_date);
}
public function testAssetEolExplicitIsSetIfAssetEolDateIsSet()
public function testAssetEolExplicitIsSetIfAssetEolDateIsExplicitlySet()
{
$model = AssetModel::factory()->mbp13Model()->create();
$status = Statuslabel::factory()->create();
@ -164,14 +166,17 @@ class AssetStoreTest extends TestCase
$status = Statuslabel::factory()->create();
$this->settings->enableAutoIncrement();
$response = $this->actingAsForApi(User::factory()->superuser()->create())
->postJson(route('api.assets.store'), [
'model_id' => $model->id,
'status_id' => $status->id,
])
->assertOk()
->assertStatusMessageIs('success');
$asset = Asset::find($response->json()['payload']['id']);
->assertStatusMessageIs('success')
->json();
$asset = Asset::find($response['payload']['id']);
$this->assertNotNull($asset->asset_tag);
}
@ -326,6 +331,7 @@ class AssetStoreTest extends TestCase
$asset = Asset::find($response['payload']['id']);
$this->assertTrue($asset->adminuser->is($user));
$this->assertTrue($asset->checkedOutToUser());
$this->assertTrue($asset->assignedTo->is($userAssigned));
}
@ -351,6 +357,7 @@ class AssetStoreTest extends TestCase
$asset = Asset::find($response['payload']['id']);
$this->assertTrue($asset->adminuser->is($user));
$this->assertTrue($asset->checkedOutToLocation());
$this->assertTrue($asset->location->is($location));
}
@ -376,6 +383,7 @@ class AssetStoreTest extends TestCase
$apiAsset = Asset::find($response['payload']['id']);
$this->assertTrue($apiAsset->adminuser->is($user));
$this->assertTrue($apiAsset->checkedOutToAsset());
// I think this makes sense, but open to a sanity check
$this->assertTrue($asset->assignedAssets()->find($response['payload']['id'])->is($apiAsset));
}