From 698434dcf861c32825fb7cbdf9de212381f68cf9 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 30 Oct 2024 13:48:14 -0500
Subject: [PATCH] no more base action, scaffolded update and delete

---
 app/Actions/Assets/DestroyAssetAction.php            | 12 ++++++++++++
 app/Actions/Assets/StoreAssetAction.php              |  5 ++---
 app/Actions/Assets/UpdateAssetAction.php             | 12 ++++++++++++
 app/Actions/BaseAction.php                           |  8 --------
 app/Http/Controllers/Api/AssetsController.php        |  4 ++--
 app/Http/Controllers/Assets/AssetsController.php     |  3 ++-
 app/Http/Requests/{ => Assets}/StoreAssetRequest.php |  3 ++-
 .../Requests/{ => Assets}/UpdateAssetRequest.php     |  3 ++-
 8 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 app/Actions/Assets/DestroyAssetAction.php
 create mode 100644 app/Actions/Assets/UpdateAssetAction.php
 delete mode 100644 app/Actions/BaseAction.php
 rename app/Http/Requests/{ => Assets}/StoreAssetRequest.php (97%)
 rename app/Http/Requests/{ => Assets}/UpdateAssetRequest.php (95%)

diff --git a/app/Actions/Assets/DestroyAssetAction.php b/app/Actions/Assets/DestroyAssetAction.php
new file mode 100644
index 0000000000..46b5f20c0b
--- /dev/null
+++ b/app/Actions/Assets/DestroyAssetAction.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Actions\Assets;
+
+class DestroyAssetAction
+{
+    public static function run()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Actions/Assets/StoreAssetAction.php b/app/Actions/Assets/StoreAssetAction.php
index b6ca0a900c..e162af60f3 100644
--- a/app/Actions/Assets/StoreAssetAction.php
+++ b/app/Actions/Assets/StoreAssetAction.php
@@ -2,7 +2,6 @@
 
 namespace App\Actions\Assets;
 
-use App\Actions\BaseAction;
 use App\Exceptions\CheckoutNotAllowed;
 use App\Models\Asset;
 use App\Models\AssetModel;
@@ -16,7 +15,7 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\MessageBag;
 
-class StoreAssetAction extends BaseAction
+class StoreAssetAction
 {
     /**
      * @throws CheckoutNotAllowed
@@ -46,7 +45,7 @@ class StoreAssetAction extends BaseAction
         $assigned_asset = null,
         $assigned_location = null,
         $custom_fields = null,
-        $request = null, //temp for handleImages
+        $request = null, //temp for handleImages - i'd like to see that moved to a helper or something - or maybe just invoked at the extended request level so that it doesn't need to be done in the action?
         $next_audit_date = null,
     )
     {
diff --git a/app/Actions/Assets/UpdateAssetAction.php b/app/Actions/Assets/UpdateAssetAction.php
new file mode 100644
index 0000000000..a6651ba856
--- /dev/null
+++ b/app/Actions/Assets/UpdateAssetAction.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Actions\Assets;
+
+class UpdateAssetAction
+{
+    public static function run()
+    {
+        //    stuff
+    }
+
+}
\ No newline at end of file
diff --git a/app/Actions/BaseAction.php b/app/Actions/BaseAction.php
deleted file mode 100644
index 10794ecbbb..0000000000
--- a/app/Actions/BaseAction.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Actions;
-
-class BaseAction
-{
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index c248624d98..aad21f01aa 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Api;
 use App\Actions\Assets\StoreAssetAction;
 use App\Events\CheckoutableCheckedIn;
 use App\Exceptions\CheckoutNotAllowed;
-use App\Http\Requests\StoreAssetRequest;
-use App\Http\Requests\UpdateAssetRequest;
+use App\Http\Requests\Assets\StoreAssetRequest;
+use App\Http\Requests\Assets\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 3ee352dc89..a127f2d0e3 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -8,7 +8,7 @@ use App\Exceptions\CheckoutNotAllowed;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
-use App\Http\Requests\StoreAssetRequest;
+use App\Http\Requests\Assets\StoreAssetRequest;
 use App\Models\Actionlog;
 use App\Http\Requests\UploadFileRequest;
 use Illuminate\Support\Facades\Log;
@@ -107,6 +107,7 @@ class AssetsController extends Controller
             $custom_fields = $request->collect()->filter(function ($value, $key) {
                 return starts_with($key, '_snipeit_');
             });
+            
             //DB::transaction(function () use ($request, $asset_tags, $serials, $custom_fields) {
             foreach ($asset_tags as $key => $asset_tag) {
                 $asset = StoreAssetAction::run(
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/Assets/StoreAssetRequest.php
similarity index 97%
rename from app/Http/Requests/StoreAssetRequest.php
rename to app/Http/Requests/Assets/StoreAssetRequest.php
index fb7469ac88..574216afdf 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/Assets/StoreAssetRequest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Assets;
 
+use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
 use App\Models\Company;
diff --git a/app/Http/Requests/UpdateAssetRequest.php b/app/Http/Requests/Assets/UpdateAssetRequest.php
similarity index 95%
rename from app/Http/Requests/UpdateAssetRequest.php
rename to app/Http/Requests/Assets/UpdateAssetRequest.php
index 1b379358f9..9a8684d213 100644
--- a/app/Http/Requests/UpdateAssetRequest.php
+++ b/app/Http/Requests/Assets/UpdateAssetRequest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Assets;
 
+use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
 use App\Models\Setting;