A free open source IT asset/license management system
Acceptance: replace calls in controllers and listener with action
Marcus Moore7b827f57b69b
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex f1e3502f11..8f37c2e546 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Accessories;+use App\Actions\Acceptances\CreateCheckoutAcceptanceAction;use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;@@ -134,11 +135,7 @@ class AccessoryCheckoutController extends Controller// If requireAcceptance() is false the listener won't have created one; create it now.if (! $acceptance) {- $acceptance = new CheckoutAcceptance;- $acceptance->checkoutable()->associate($accessory);- $acceptance->assignedTo()->associate($targetUser);- $acceptance->qty = $accessory->checkout_qty;- $acceptance->save();+ $acceptance = CreateCheckoutAcceptanceAction::run($accessory, $targetUser, $accessory->checkout_qty);}session([diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.phpindex 0c8e0d7f2e..da8a1cd14f 100644--- a/app/Http/Controllers/Assets/AssetCheckoutController.php+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Assets;+use App\Actions\Acceptances\CreateCheckoutAcceptanceAction;use App\Exceptions\CheckoutNotAllowed;use App\Helpers\Helper;use App\Http\Controllers\Controller;@@ -153,10 +154,7 @@ class AssetCheckoutController extends Controller// If requireAcceptance() is false the listener won't have created one; create it now.if (! $acceptance) {- $acceptance = new CheckoutAcceptance;- $acceptance->checkoutable()->associate($asset);- $acceptance->assignedTo()->associate($target);- $acceptance->save();+ $acceptance = CreateCheckoutAcceptanceAction::run($asset, $target);}session([diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.phpindex 018655fe7c..c5ed4d57ac 100644--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Consumables;+use App\Actions\Acceptances\CreateCheckoutAcceptanceAction;use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;@@ -149,11 +150,7 @@ class ConsumableCheckoutController extends Controller// If requireAcceptance() is false the listener won't have created one; create it now.if (! $acceptance) {- $acceptance = new CheckoutAcceptance;- $acceptance->checkoutable()->associate($consumable);- $acceptance->assignedTo()->associate($user);- $acceptance->qty = $quantity;- $acceptance->save();+ $acceptance = CreateCheckoutAcceptanceAction::run($consumable, $user, $quantity);}session([diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.phpindex 54bcef42f8..4f76a4ccfd 100644--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Licenses;+use App\Actions\Acceptances\CreateCheckoutAcceptanceAction;use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;@@ -165,10 +166,7 @@ class LicenseCheckoutController extends Controller// If requireAcceptance() is false the listener won't have created one; create it now.if (! $acceptance) {- $acceptance = new CheckoutAcceptance;- $acceptance->checkoutable()->associate($licenseSeat);- $acceptance->assignedTo()->associate($checkoutTarget);- $acceptance->save();+ $acceptance = CreateCheckoutAcceptanceAction::run($licenseSeat, $checkoutTarget);}session([diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.phpindex d26fde2ccb..ba83a20afa 100644--- a/app/Listeners/CheckoutableListener.php+++ b/app/Listeners/CheckoutableListener.php@@ -2,6 +2,7 @@namespace App\Listeners;+use App\Actions\Acceptances\CreateCheckoutAcceptanceAction;use App\Events\CheckoutableCheckedOut;use App\Mail\CheckinAccessoryMail;use App\Mail\CheckinAssetMail;@@ -286,25 +287,15 @@ class CheckoutableListenerreturn null;}- $acceptance = new CheckoutAcceptance;- $acceptance->checkoutable()->associate($event->checkoutable);- $acceptance->assignedTo()->associate($event->checkedOutTo);-- $acceptance->qty = 1;-- if (isset($event->checkoutable->checkout_qty)) {- $acceptance->qty = $event->checkoutable->checkout_qty;- }-$category = $this->getCategoryFromCheckoutable($event->checkoutable);+ $alertOnResponseId = $category?->alert_on_response ? auth()->id() : null;- if ($category?->alert_on_response) {- $acceptance->alert_on_response_id = auth()->id();- }-- $acceptance->save();-- return $acceptance;+ return CreateCheckoutAcceptanceAction::run(+ $event->checkoutable,+ $event->checkedOutTo,+ $event->checkoutable->checkout_qty ?? 1,+ $alertOnResponseId,+ );}/**