Skip to content

Commit

Permalink
Ensure notification is sent when consumable is checked out via api
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusmoore committed Jan 30, 2024
1 parent 13c37e7 commit 2e0e39c
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 18 deletions.
16 changes: 5 additions & 11 deletions app/Http/Controllers/Api/ConsumablesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http\Controllers\Api;

use App\Events\CheckoutableCheckedOut;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Transformers\ConsumablesTransformer;
Expand All @@ -11,6 +12,7 @@
use App\Models\User;
use Illuminate\Http\Request;
use App\Http\Requests\ImageUploadRequest;
use Illuminate\Support\Facades\Auth;

class ConsumablesController extends Controller
{
Expand Down Expand Up @@ -290,17 +292,9 @@ public function checkout(Request $request, $id)
]
);

// Log checkout event
$logaction = $consumable->logCheckout($request->input('note'), $user);
$data['log_id'] = $logaction->id;
$data['eula'] = $consumable->getEula();
$data['first_name'] = $user->first_name;
$data['item_name'] = $consumable->name;
$data['checkout_date'] = $logaction->created_at;
$data['note'] = $logaction->note;
$data['require_acceptance'] = $consumable->requireAcceptance();

return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));
event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));

return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));

}

Expand Down
7 changes: 7 additions & 0 deletions database/factories/ConsumableFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,11 @@ public function withoutItemsRemaining()
]);
});
}

public function requiringAcceptance()
{
return $this->afterCreating(function (Consumable $consumable) {
$consumable->category->update(['require_acceptance' => 1]);
});
}
}
69 changes: 62 additions & 7 deletions tests/Feature/Api/Consumables/ConsumableCheckoutTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

namespace Tests\Feature\Api\Consumables;

use App\Models\Actionlog;
use App\Models\Consumable;
use App\Models\User;
use App\Notifications\CheckoutConsumableNotification;
use Illuminate\Support\Facades\Notification;
use Tests\Support\InteractsWithSettings;
use Tests\TestCase;

Expand All @@ -11,31 +16,81 @@ class ConsumableCheckoutTest extends TestCase

public function testCheckingOutConsumableRequiresCorrectPermission()
{
$this->markTestIncomplete();
$this->actingAsForApi(User::factory()->create())
->postJson(route('api.consumables.checkout', Consumable::factory()->create()))
->assertForbidden();
}

public function testValidationWhenCheckingOutConsumable()
{
$this->markTestIncomplete();
$this->actingAsForApi(User::factory()->checkoutConsumables()->create())
->postJson(route('api.consumables.checkout', Consumable::factory()->create()), [
// missing assigned_to
])
->assertStatusMessageIs('error');
}

public function testConsumableMustBeAvailableWhenCheckingOut()
{
$this->markTestIncomplete();
$this->actingAsForApi(User::factory()->checkoutConsumables()->create())
->postJson(route('api.consumables.checkout', Consumable::factory()->withoutItemsRemaining()->create()), [
'assigned_to' => User::factory()->create()->id,
])
->assertStatusMessageIs('error');
}

public function testConsumableCanBeCheckedOut()
{
$this->markTestIncomplete();
$consumable = Consumable::factory()->create();
$user = User::factory()->create();

$this->actingAsForApi(User::factory()->checkoutConsumables()->create())
->postJson(route('api.consumables.checkout', $consumable), [
'assigned_to' => $user->id,
]);

$this->assertTrue($user->consumables->contains($consumable));
}

public function testUserSentNotificationUponCheckout()
{
$this->markTestIncomplete();
Notification::fake();

$consumable = Consumable::factory()->requiringAcceptance()->create();

$user = User::factory()->create();

$this->actingAsForApi(User::factory()->checkoutConsumables()->create())
->postJson(route('api.consumables.checkout', $consumable), [
'assigned_to' => $user->id,
]);

Notification::assertSentTo($user, CheckoutConsumableNotification::class);
}

public function testActionLogCreatedUponCheckout()
{
$this->markTestIncomplete();
{$consumable = Consumable::factory()->create();
$actor = User::factory()->checkoutConsumables()->create();
$user = User::factory()->create();

$this->actingAsForApi($actor)
->postJson(route('api.consumables.checkout', $consumable), [
'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' => $consumable->id,
'item_type' => Consumable::class,
'user_id' => $actor->id,
'note' => 'oh hi there',
])->count(),
'Log entry either does not exist or there are more than expected'
);
}
}

0 comments on commit 2e0e39c

Please sign in to comment.