gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow checking in from unfound targets

Browse Source
This commit is contained in:
Marcus Moore
2026-02-23 17:23:42 -08:00
parent 1cc7ef0543
commit cada43f34d
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/LicenseSeatsController.php
View File

@@ -174,7 +174,11 @@ class LicenseSeatsController extends Controller
}
if ($assignmentTouched && is_null($target)){
return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
// if both asset_id and assigned_to are null then we are "checking-in"
// a related model that does not exist (possible purged or bad data).
if (!is_null($request->input('asset_id')) || !is_null($request->input('assigned_to'))) {
return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
}
}
if ($licenseSeat->save()) {

41
tests/Feature/LicenseSeats/Api/LicenseSeatUpdateTest.php
View File

@@ -109,12 +109,13 @@ class LicenseSeatUpdateTest extends TestCase
$licenseSeat->refresh();
$this->assertNull($licenseSeat->assigned_to);
$this->assertNull($licenseSeat->asset_id);
$this->assertDatabaseHas('action_logs', [
'action_type' => 'checkin from',
'target_id' => $asset->id,
'target_type' => Asset::class,
'note' => '',
'note' => null,
'item_type' => License::class,
'item_id' => $licenseSeat->license_id,
'quantity' => 1,
@@ -150,20 +151,13 @@ class LicenseSeatUpdateTest extends TestCase
'notes' => 'Attempting to reassign an unreassignable seat',
])
->assertStatus(200)
->assertStatusMessageIs('error');
->assertStatusMessageIs('error')
->assertJsonFragment([
'messages' => trans('admin/licenses/message.checkout.unavailable'),
]);
$licenseSeat->refresh();
$this->assertNull($licenseSeat->asset_id);
$this->assertDatabaseHas('action_logs', [
'action_type' => 'checkin from',
'target_id' => $user->id,
'target_type' => User::class,
'note' => 'Attempting to reassign an unreassignable seat',
'item_type' => License::class,
'item_id' => $licenseSeat->license_id,
'quantity' => 1,
]);
$this->assertEquals($user->id, $licenseSeat->assigned_to);
}
/**************************************************************************
@@ -333,12 +327,12 @@ class LicenseSeatUpdateTest extends TestCase
public function test_license_seat_checked_out_to_purged_asset_can_be_checked_in_when_updating()
{
$asset = Asset::factory()->create();
$licenseSeat = LicenseSeat::factory()->assignedToAsset($asset)->create(['asset_id' => 100000]);
$licenseSeat = LicenseSeat::factory()->create(['asset_id' => 100000]);
$this->actingAsForApi(User::factory()->checkoutLicenses()->create())
->patchJson($this->route($licenseSeat), [
'asset_id' => null,
'assigned_to' => null,
'notes' => 'Checking in the seat',
])
->assertStatus(200)
@@ -350,8 +344,10 @@ class LicenseSeatUpdateTest extends TestCase
$this->assertDatabaseHas('action_logs', [
'action_type' => 'checkin from',
'target_id' => $asset->id,
'target_type' => Asset::class,
// this will be null and not 100000
// because the asset is not in the system
'target_id' => null,
'target_type' => null,
'note' => 'Checking in the seat',
'item_type' => License::class,
'item_id' => $licenseSeat->license_id,
@@ -361,11 +357,12 @@ class LicenseSeatUpdateTest extends TestCase
public function test_license_seat_checked_out_to_purged_user_can_be_checked_in_when_updating()
{
$user = User::factory()->create();
$licenseSeat = LicenseSeat::factory()->unreassignable()->assignedToUser($user)->create(['assigned_to' => 100000]);
$licenseSeat = LicenseSeat::factory()->unreassignable()->create(['assigned_to' => 100000]);
$this->actingAsForApi(User::factory()->checkoutLicenses()->create())
->patchJson($this->route($licenseSeat), [
// purposefully leaving asset_id off here
// because it is a realistic scenario.
'assigned_to' => null,
'notes' => 'Checking in the seat',
])
@@ -378,8 +375,10 @@ class LicenseSeatUpdateTest extends TestCase
$this->assertDatabaseHas('action_logs', [
'action_type' => 'checkin from',
'target_id' => $user->id,
'target_type' => User::class,
// this will be null and not 100000
// because the user is not in the system
'target_id' => null,
'target_type' => null,
'note' => 'Checking in the seat',
'item_type' => License::class,
'item_id' => $licenseSeat->license_id,

2
tests/Support/CustomTestMacros.php
View File

@@ -112,8 +112,6 @@ trait CustomTestMacros
function (array|string $keys) {
Assert::assertArrayHasKey('messages', $this, 'Response did not contain any messages');
Assert::assertIsArray($this['messages'], '"messages" not an array so specific message existence cannot be checked.');
if (is_string($keys)) {
$keys = [$keys];
}