mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 13:44:06 -08:00
Merge branch 'develop' into bug/sc-24685
This commit is contained in:
commit
6d41c8cf67
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace App\Http\Controllers\Api;
|
namespace App\Http\Controllers\Api;
|
||||||
|
|
||||||
|
use App\Events\CheckoutableCheckedOut;
|
||||||
use App\Helpers\Helper;
|
use App\Helpers\Helper;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Transformers\AccessoriesTransformer;
|
use App\Http\Transformers\AccessoriesTransformer;
|
||||||
|
@ -278,7 +279,7 @@ class AccessoriesController extends Controller
|
||||||
public function checkout(Request $request, $accessoryId)
|
public function checkout(Request $request, $accessoryId)
|
||||||
{
|
{
|
||||||
// Check if the accessory exists
|
// Check if the accessory exists
|
||||||
if (is_null($accessory = Accessory::find($accessoryId))) {
|
if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
|
||||||
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
|
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -302,7 +303,7 @@ class AccessoriesController extends Controller
|
||||||
'note' => $request->get('note'),
|
'note' => $request->get('note'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$accessory->logCheckout($request->input('note'), $user);
|
event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
|
||||||
|
|
||||||
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
|
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AccessoryFactory extends Factory
|
||||||
$this->faker->randomElement(['Keyboard', 'Wired'])
|
$this->faker->randomElement(['Keyboard', 'Wired'])
|
||||||
),
|
),
|
||||||
'user_id' => User::factory()->superuser(),
|
'user_id' => User::factory()->superuser(),
|
||||||
'category_id' => Category::factory(),
|
'category_id' => Category::factory()->forAccessories(),
|
||||||
'model_number' => $this->faker->numberBetween(1000000, 50000000),
|
'model_number' => $this->faker->numberBetween(1000000, 50000000),
|
||||||
'location_id' => Location::factory(),
|
'location_id' => Location::factory(),
|
||||||
'qty' => 1,
|
'qty' => 1,
|
||||||
|
@ -114,4 +114,30 @@ class AccessoryFactory extends Factory
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function withoutItemsRemaining()
|
||||||
|
{
|
||||||
|
return $this->state(function () {
|
||||||
|
return [
|
||||||
|
'qty' => 1,
|
||||||
|
];
|
||||||
|
})->afterCreating(function ($accessory) {
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$accessory->users()->attach($accessory->id, [
|
||||||
|
'accessory_id' => $accessory->id,
|
||||||
|
'created_at' => now(),
|
||||||
|
'user_id' => $user->id,
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
'note' => '',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function requiringAcceptance()
|
||||||
|
{
|
||||||
|
return $this->afterCreating(function ($accessory) {
|
||||||
|
$accessory->category->update(['require_acceptance' => 1]);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,4 +172,10 @@ class CategoryFactory extends Factory
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function forAccessories()
|
||||||
|
{
|
||||||
|
return $this->state([
|
||||||
|
'category_type' => 'accessory',
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
96
tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
Normal file
96
tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Api\Accessories;
|
||||||
|
|
||||||
|
use App\Models\Accessory;
|
||||||
|
use App\Models\Actionlog;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Notifications\CheckoutAccessoryNotification;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Tests\Support\InteractsWithSettings;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AccessoryCheckoutTest extends TestCase
|
||||||
|
{
|
||||||
|
use InteractsWithSettings;
|
||||||
|
|
||||||
|
public function testCheckingOutAccessoryRequiresCorrectPermission()
|
||||||
|
{
|
||||||
|
$this->actingAsForApi(User::factory()->create())
|
||||||
|
->postJson(route('api.accessories.checkout', Accessory::factory()->create()))
|
||||||
|
->assertForbidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidation()
|
||||||
|
{
|
||||||
|
$this->actingAsForApi(User::factory()->checkoutAccessories()->create())
|
||||||
|
->postJson(route('api.accessories.checkout', Accessory::factory()->create()), [
|
||||||
|
// missing assigned_to
|
||||||
|
])
|
||||||
|
->assertStatusMessageIs('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAccessoryMustBeAvailableWhenCheckingOut()
|
||||||
|
{
|
||||||
|
$this->actingAsForApi(User::factory()->checkoutAccessories()->create())
|
||||||
|
->postJson(route('api.accessories.checkout', Accessory::factory()->withoutItemsRemaining()->create()), [
|
||||||
|
'assigned_to' => User::factory()->create()->id,
|
||||||
|
])
|
||||||
|
->assertStatusMessageIs('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAccessoryCanBeCheckedOut()
|
||||||
|
{
|
||||||
|
$accessory = Accessory::factory()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAsForApi(User::factory()->checkoutAccessories()->create())
|
||||||
|
->postJson(route('api.accessories.checkout', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertTrue($accessory->users->contains($user));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUserSentNotificationUponCheckout()
|
||||||
|
{
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$accessory = Accessory::factory()->requiringAcceptance()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAsForApi(User::factory()->checkoutAccessories()->create())
|
||||||
|
->postJson(route('api.accessories.checkout', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
Notification::assertSentTo($user, CheckoutAccessoryNotification::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testActionLogCreatedUponCheckout()
|
||||||
|
{
|
||||||
|
$accessory = Accessory::factory()->create();
|
||||||
|
$actor = User::factory()->checkoutAccessories()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAsForApi($actor)
|
||||||
|
->postJson(route('api.accessories.checkout', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
'note' => 'oh hi there',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
1,
|
||||||
|
Actionlog::where([
|
||||||
|
'action_type' => 'checkout',
|
||||||
|
'target_id' => $user->id,
|
||||||
|
'target_type' => User::class,
|
||||||
|
'item_id' => $accessory->id,
|
||||||
|
'item_type' => Accessory::class,
|
||||||
|
'user_id' => $actor->id,
|
||||||
|
'note' => 'oh hi there',
|
||||||
|
])->count(),
|
||||||
|
'Log entry either does not exist or there are more than expected'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
96
tests/Feature/Checkouts/AccessoryCheckoutTest.php
Normal file
96
tests/Feature/Checkouts/AccessoryCheckoutTest.php
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Checkouts;
|
||||||
|
|
||||||
|
use App\Models\Accessory;
|
||||||
|
use App\Models\Actionlog;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Notifications\CheckoutAccessoryNotification;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Tests\Support\InteractsWithSettings;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AccessoryCheckoutTest extends TestCase
|
||||||
|
{
|
||||||
|
use InteractsWithSettings;
|
||||||
|
|
||||||
|
public function testCheckingOutAccessoryRequiresCorrectPermission()
|
||||||
|
{
|
||||||
|
$this->actingAs(User::factory()->create())
|
||||||
|
->post(route('accessories.checkout.store', Accessory::factory()->create()))
|
||||||
|
->assertForbidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testValidation()
|
||||||
|
{
|
||||||
|
$this->actingAs(User::factory()->checkoutAccessories()->create())
|
||||||
|
->post(route('accessories.checkout.store', Accessory::factory()->create()), [
|
||||||
|
// missing assigned_to
|
||||||
|
])
|
||||||
|
->assertSessionHas('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAccessoryMustBeAvailableWhenCheckingOut()
|
||||||
|
{
|
||||||
|
$this->actingAs(User::factory()->checkoutAccessories()->create())
|
||||||
|
->post(route('accessories.checkout.store', Accessory::factory()->withoutItemsRemaining()->create()), [
|
||||||
|
'assigned_to' => User::factory()->create()->id,
|
||||||
|
])
|
||||||
|
->assertSessionHas('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAccessoryCanBeCheckedOut()
|
||||||
|
{
|
||||||
|
$accessory = Accessory::factory()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAs(User::factory()->checkoutAccessories()->create())
|
||||||
|
->post(route('accessories.checkout.store', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertTrue($accessory->users->contains($user));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUserSentNotificationUponCheckout()
|
||||||
|
{
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$accessory = Accessory::factory()->requiringAcceptance()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAs(User::factory()->checkoutAccessories()->create())
|
||||||
|
->post(route('accessories.checkout.store', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
Notification::assertSentTo($user, CheckoutAccessoryNotification::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testActionLogCreatedUponCheckout()
|
||||||
|
{
|
||||||
|
$accessory = Accessory::factory()->create();
|
||||||
|
$actor = User::factory()->checkoutAccessories()->create();
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$this->actingAs($actor)
|
||||||
|
->post(route('accessories.checkout.store', $accessory), [
|
||||||
|
'assigned_to' => $user->id,
|
||||||
|
'note' => 'oh hi there',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
1,
|
||||||
|
Actionlog::where([
|
||||||
|
'action_type' => 'checkout',
|
||||||
|
'target_id' => $user->id,
|
||||||
|
'target_type' => User::class,
|
||||||
|
'item_id' => $accessory->id,
|
||||||
|
'item_type' => Accessory::class,
|
||||||
|
'user_id' => $actor->id,
|
||||||
|
'note' => 'oh hi there',
|
||||||
|
])->count(),
|
||||||
|
'Log entry either does not exist or there are more than expected'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue