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

Fixed behavior for null model numbers

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-08-17 00:27:44 +01:00
parent e96b9b2f4f
commit 318aff1ef0
4 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
View file

@ -16,10 +16,12 @@ trait TwoColumnUniqueUndeletedTrait
$column = $parameters[0]; $column = $parameters[0];
$value = $this->{$parameters[0]}; $value = $this->{$parameters[0]};
// This is an existing model we're updating so ignore the current ID ($this->getKey())
if ($this->exists) { if ($this->exists) {
return 'two_column_unique_undeleted:'.$this->table.','.$this->getKey().','.$column.','.$value; return 'two_column_unique_undeleted:'.$this->table.','.$this->getKey().','.$column.','.$value;
} }
// This is a new record, so we can ignore the current ID
return 'two_column_unique_undeleted:'.$this->table.',0,'.$column.','.$value; return 'two_column_unique_undeleted:'.$this->table.',0,'.$column.','.$value;
} }
} }

17
app/Providers/ValidationServiceProvider.php
View file

@ -88,18 +88,25 @@ class ValidationServiceProvider extends ServiceProvider
* *
* $parameters[0] - the name of the first table we're looking at * $parameters[0] - the name of the first table we're looking at
* $parameters[1] - the ID (this will be 0 on new creations) * $parameters[1] - the ID (this will be 0 on new creations)
* $parameters[2] - the name of the second table we're looking at * $parameters[2] - the name of the second field we're looking at
* $parameters[3] - the value that the request is passing for the second table we're * $parameters[3] - the value that the request is passing for the second table we're
* checking for uniqueness across * checking for uniqueness across
* *
*/ */
Validator::extend('two_column_unique_undeleted', function ($attribute, $value, $parameters, $validator) { Validator::extend('two_column_unique_undeleted', function ($attribute, $value, $parameters, $validator) {
if (count($parameters)) { if (count($parameters)) {
$count = DB::table($parameters[0]) $count = DB::table($parameters[0])
->select('id')->where($attribute, '=', $value) ->select('id')
->where('id', '!=', $parameters[1]) ->where($attribute, '=', $value)
->where($parameters[2], $parameters[3]) ->where('id', '!=', $parameters[1]);
->whereNull('deleted_at')
if ($parameters[3]!='') {
$count = $count->where($parameters[2], $parameters[3]);
}
$count = $count->whereNull('deleted_at')
->count(); ->count();
return $count < 1; return $count < 1;

5
tests/Feature/AssetModels/Api/CreateAssetModelsTest.php
View file

@ -24,7 +24,7 @@ class CreateAssetModelsTest extends TestCase
$response = $this->actingAsForApi(User::factory()->superuser()->create()) $response = $this->actingAsForApi(User::factory()->superuser()->create())
->postJson(route('api.models.store'), [ ->postJson(route('api.models.store'), [
'name' => 'Test AssetModel', 'name' => 'Test AssetModel',
'category_id' => Category::factory()->create()->id 'category_id' => Category::factory()->assetLaptopCategory()->create()->id
]) ])
->assertOk() ->assertOk()
->assertStatusMessageIs('success') ->assertStatusMessageIs('success')
@ -65,6 +65,7 @@ class CreateAssetModelsTest extends TestCase
->postJson(route('api.models.store'), [ ->postJson(route('api.models.store'), [
'name' => 'Test Model', 'name' => 'Test Model',
'model_number' => '1234', 'model_number' => '1234',
'category_id' => Category::factory()->assetLaptopCategory()->create()->id
]) ])
->assertStatus(200) ->assertStatus(200)
->assertOk() ->assertOk()
@ -86,6 +87,7 @@ class CreateAssetModelsTest extends TestCase
$this->actingAsForApi(User::factory()->superuser()->create()) $this->actingAsForApi(User::factory()->superuser()->create())
->postJson(route('api.models.store'), [ ->postJson(route('api.models.store'), [
'name' => 'Test Model', 'name' => 'Test Model',
'category_id' => Category::factory()->assetLaptopCategory()->create()->id
]) ])
->assertStatus(200) ->assertStatus(200)
->assertOk() ->assertOk()
@ -93,7 +95,6 @@ class CreateAssetModelsTest extends TestCase
->assertJson([ ->assertJson([
'messages' => [ 'messages' => [
'name' => ['The name must be unique across models and model number. '], 'name' => ['The name must be unique across models and model number. '],
'model_number' => ['The model number must be unique across models and name. '],
], ],
]) ])
->json(); ->json();

5
tests/Feature/AssetModels/Ui/CreateAssetModelsTest.php
View file

@ -24,6 +24,7 @@ class CreateAssetModelsTest extends TestCase
$this->assertFalse(AssetModel::where('name', 'Test Model')->exists()); $this->assertFalse(AssetModel::where('name', 'Test Model')->exists());
$this->actingAs(User::factory()->superuser()->create()) $this->actingAs(User::factory()->superuser()->create())
->from(route('models.create'))
->post(route('models.store'), [ ->post(route('models.store'), [
'name' => 'Test Model', 'name' => 'Test Model',
'category_id' => Category::factory()->create()->id 'category_id' => Category::factory()->create()->id
@ -85,9 +86,9 @@ class CreateAssetModelsTest extends TestCase
'category_id' => Category::factory()->create()->id 'category_id' => Category::factory()->create()->id
]) ])
->assertStatus(302) ->assertStatus(302)
->assertSessionHasErrors(['name','model_number']) ->assertSessionHasErrors(['name'])
->assertRedirect(route('models.create')) ->assertRedirect(route('models.create'))
->assertInvalid(['name','model_number']); ->assertInvalid(['name']);
$this->followRedirects($response)->assertSee(trans('general.error')); $this->followRedirects($response)->assertSee(trans('general.error'));