Merge pull request #16676 from marcusmoore/fixes/acceptance-logging

Store accepted_at and declined_at in action log when accepting/declining assets
This commit is contained in:
snipe 2025-04-14 09:18:54 +01:00 committed by GitHub
commit 102f26cac1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 165 additions and 0 deletions

View file

@ -65,6 +65,7 @@ class LogListener
$logaction->filename = $event->acceptance->stored_eula_file;
$logaction->note = $event->acceptance->note;
$logaction->action_type = 'accepted';
$logaction->action_date = $event->acceptance->accepted_at;
// TODO: log the actual license seat that was checked out
if ($event->acceptance->checkoutable instanceof LicenseSeat) {
@ -82,6 +83,7 @@ class LogListener
$logaction->accept_signature = $event->acceptance->signature_filename;
$logaction->note = $event->acceptance->note;
$logaction->action_type = 'declined';
$logaction->action_date = $event->acceptance->declined_at;
// TODO: log the actual license seat that was checked out
if ($event->acceptance->checkoutable instanceof LicenseSeat) {

View file

@ -0,0 +1,163 @@
<?php
namespace Tests\Feature\CheckoutAcceptances\Ui;
use App\Events\CheckoutAccepted;
use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\CheckoutAcceptance;
use App\Models\User;
use Illuminate\Support\Facades\Event;
use Tests\TestCase;
class AssetAcceptanceTest extends TestCase
{
public function testAssetCheckoutAcceptPageRenders()
{
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->actingAs($checkoutAcceptance->assignedTo)
->get(route('account.accept.item', $checkoutAcceptance))
->assertViewIs('account.accept.create');
}
public function testCannotAcceptAssetAlreadyAccepted()
{
Event::fake([CheckoutAccepted::class]);
$checkoutAcceptance = CheckoutAcceptance::factory()->accepted()->create();
$this->assertFalse($checkoutAcceptance->isPending());
$this->actingAs($checkoutAcceptance->assignedTo)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'accepted',
'note' => 'my note',
])
->assertRedirectToRoute('account.accept')
->assertSessionHas('error');
Event::assertNotDispatched(CheckoutAccepted::class);
}
public function testCannotAcceptAssetForAnotherUser()
{
Event::fake([CheckoutAccepted::class]);
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->assertTrue($checkoutAcceptance->isPending());
$anotherUser = User::factory()->create();
$this->actingAs($anotherUser)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'accepted',
'note' => 'my note',
])
->assertRedirectToRoute('account.accept')
->assertSessionHas('error');
$this->assertTrue($checkoutAcceptance->fresh()->isPending());
Event::assertNotDispatched(CheckoutAccepted::class);
}
public function testUserCanAcceptAsset()
{
Event::fake([CheckoutAccepted::class]);
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->assertTrue($checkoutAcceptance->isPending());
$this->actingAs($checkoutAcceptance->assignedTo)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'accepted',
'note' => 'my note',
])
->assertRedirectToRoute('account.accept')
->assertSessionHas('success');
$checkoutAcceptance->refresh();
$this->assertFalse($checkoutAcceptance->isPending());
$this->assertNotNull($checkoutAcceptance->accepted_at);
$this->assertNull($checkoutAcceptance->declined_at);
Event::assertDispatched(CheckoutAccepted::class);
}
public function testUserCanDeclineAsset()
{
Event::fake([CheckoutAccepted::class]);
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->assertTrue($checkoutAcceptance->isPending());
$this->actingAs($checkoutAcceptance->assignedTo)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'declined',
'note' => 'my note',
])
->assertRedirectToRoute('account.accept')
->assertSessionHas('success');
$checkoutAcceptance->refresh();
$this->assertFalse($checkoutAcceptance->isPending());
$this->assertNull($checkoutAcceptance->accepted_at);
$this->assertNotNull($checkoutAcceptance->declined_at);
Event::assertNotDispatched(CheckoutAccepted::class);
}
public function testActionLoggedWhenAcceptingAsset()
{
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->actingAs($checkoutAcceptance->assignedTo)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'accepted',
'note' => 'my note',
]);
$this->assertTrue(Actionlog::query()
->where([
'action_type' => 'accepted',
'target_id' => $checkoutAcceptance->assignedTo->id,
'target_type' => User::class,
'note' => 'my note',
'item_type' => Asset::class,
'item_id' => $checkoutAcceptance->checkoutable->id,
])
->whereNotNull('action_date')
->exists()
);
}
public function testActionLoggedWhenDecliningAsset()
{
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
$this->actingAs($checkoutAcceptance->assignedTo)
->post(route('account.store-acceptance', $checkoutAcceptance), [
'asset_acceptance' => 'declined',
'note' => 'my note',
]);
$this->assertTrue(Actionlog::query()
->where([
'action_type' => 'declined',
'target_id' => $checkoutAcceptance->assignedTo->id,
'target_type' => User::class,
'note' => 'my note',
'item_type' => Asset::class,
'item_id' => $checkoutAcceptance->checkoutable->id,
])
->whereNotNull('action_date')
->exists()
);
}
}