bunch of cleanup, split cancel out

app/Actions/CheckoutRequests/CancelCheckoutRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Actions\CheckoutRequests;
+
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\RequestAssetCancelation;
+
+class CancelCheckoutRequest
+{
+    public static function run(Asset $asset, User $user)
+    {
+        $asset->cancelRequest();
+
+        $asset->decrement('requests_counter', 1);
+
+        $data['item'] = $asset;
+        $data['target'] = $user;
+        $data['item_quantity'] = 1;
+        $settings = Setting::getSettings();
+
+        $logaction = Actionlog::create([
+            'item_id'     => $data['asset_id'] = $asset->id,
+            'item_type'   => $data['item_type'] = Asset::class,
+            'created_at'  => $data['requested_date'] = date('Y-m-d H:i:s'),
+            'target_id'   => $data['user_id'] = auth()->id(),
+            'target_type' => User::class,
+            'location_id' => $user->location_id ?? null,
+        ]);
+        $logaction->logaction('request canceled');
+
+        try {
+            $settings->notify(new RequestAssetCancelation($data));
+        } catch (\Exception $e) {
+            \Log::warning($e);
+        }
+
+        return true;
+    }
+
+}

app/Actions/CheckoutRequests/CreateCheckoutRequest.php

@@ -21,7 +21,6 @@ class CreateCheckoutRequest
      */
     public static function run(Asset $asset, User $user): string
     {
-        //throw new \Exception();
         if (is_null(Asset::RequestableAssets()->find($asset->id))) {
             throw new AssetNotRequestable($asset);
         }
@@ -34,33 +33,16 @@ class CreateCheckoutRequest
         $data['item_quantity'] = 1;
         $settings = Setting::getSettings();
 
-        $logaction = new Actionlog();
+        $logaction = Actionlog::create([
-        $logaction->item_id = $data['asset_id'] = $asset->id;
+            'target_id'   => $data['asset_id'] = $asset->id,
-        $logaction->item_type = $data['item_type'] = Asset::class;
+            'item_type'   => $data['item_type'] = Asset::class,
-        $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s');
+            'created_at'  => $data['requested_date'] = date('Y-m-d H:i:s'),
-
+            'user_id'     => $data['user_id'] = auth()->id(),
-        if ($user->location_id) {
+            'target_type' => User::class,
-            $logaction->location_id = $user->location_id;
+            'location_id' => $user->location_id ?? null,
-        }
+        ]);
-        $logaction->target_id = $data['user_id'] = auth()->id();
-        $logaction->target_type = User::class;
-
-        // If it's already requested, cancel the request.
-        // this is going into another action class
-        if ($asset->isRequestedBy(auth()->user())) {
-            $asset->cancelRequest();
-            $asset->decrement('requests_counter', 1);
-
-            $logaction->logaction('request canceled');
-            try {
-                $settings->notify(new RequestAssetCancelation($data));
-            } catch (\Exception $e) {
-                \Log::warning($e);
-            }
-            return $status = 'cancelled';
-        }
-
         $logaction->logaction('requested');
+
         $asset->request();
         $asset->increment('requests_counter', 1);
         try {

database/factories/AssetFactory.php

@@ -352,8 +352,7 @@ class AssetFactory extends Factory
             'deployable' => true,
             'pending'    => true,
         ])->id;
-        //return $this->state(['requestable' => true]);
+        return $this->state(['status_id' => $id, 'requestable' => true]);
-        return $this->state(['status_id' => $id]);
     }
 
     public function nonrequestable()
@@ -363,8 +362,7 @@ class AssetFactory extends Factory
             'deployable' => false,
             'pending'    => false,
         ])->id;
-        //return $this->state(['requestable' => false]);
+        return $this->state(['status_id' => $id, 'requestable' => false]);
-        return $this->state(['status_id' => $id]);
     }
 
     public function noPurchaseOrEolDate()

routes/web.php

@@ -294,24 +294,18 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
     Route::get('api', [ProfileController::class, 'api'])->name('user.api');
 
     // View Assets
-    Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets');
+    Route::get('view-assets', [ViewAssetsController::class, 'index'])->name('view-assets');
 
     Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');
 
     // Profile
-    Route::get(
+    Route::get('requestable-assets', [ViewAssetsController::class, 'getRequestableIndex'])->name('requestable-assets');
-        'requestable-assets',
-        [ViewAssetsController::class, 'getRequestableIndex']
-    )->name('requestable-assets');
-    Route::post(
-        'request-asset/{asset}',
-        [ViewAssetsController::class, 'store']
-    )->name('account/request-asset');
 
-    Route::post(
+    Route::post('request-asset/{asset}', [ViewAssetsController::class, 'store'])
-        'request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}',
+        ->name('account/request-asset');
-        [ViewAssetsController::class, 'getRequestItem']
+
-    )->name('account/request-item');
+    Route::post('request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}', [ViewAssetsController::class, 'getRequestItem'])
+        ->name('account/request-item');
 
     // Account Dashboard
     Route::get('/', [ViewAssetsController::class, 'getIndex'])->name('account');