From b00f8b5c40d96a39b30c96dd64e138078fd7bd93 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 30 Oct 2024 19:37:51 -0500 Subject: [PATCH] a couple more tests passing --- app/Actions/Assets/StoreAssetAction.php | 8 ++- app/Http/Controllers/Api/AssetsController.php | 51 +++++++++--------- .../Controllers/Assets/AssetsController.php | 53 +++++++++---------- 3 files changed, 55 insertions(+), 57 deletions(-) diff --git a/app/Actions/Assets/StoreAssetAction.php b/app/Actions/Assets/StoreAssetAction.php index e162af60f3..b1dcb573d3 100644 --- a/app/Actions/Assets/StoreAssetAction.php +++ b/app/Actions/Assets/StoreAssetAction.php @@ -46,7 +46,7 @@ class StoreAssetAction $assigned_location = null, $custom_fields = null, $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, + $last_audit_date = null, ) { $settings = Setting::getSettings(); @@ -72,6 +72,8 @@ class StoreAssetAction $asset->requestable = $requestable; $asset->rtd_location_id = $rtd_location_id; $asset->byod = $byod; + $asset->last_audit_date = $last_audit_date; + $asset->location_id = $location_id; // set up next audit date if (!empty($settings->audit_interval)) { @@ -172,10 +174,6 @@ class StoreAssetAction if ($asset->image) { $asset->image = $asset->getImageUrl(); } - - } - - if ($asset->save()) { return $asset; } else { return $asset->getErrors(); diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 09de4fbccd..e28d66afbd 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -603,31 +603,32 @@ class AssetsController extends Controller return starts_with($key, '_snipeit_'); }); $asset = StoreAssetAction::run( - $request->validated('model_id'), - $request->validated('status_id'), - $request->validated('name'), - $request->validated('serial'), - $request->validated('company_id'), - $request->validated('asset_tag'), - $request->validated('order_number'), - $request->validated('notes'), - $request->validated('user_id'), - $request->validated('warranty_months'), - $request->validated('purchase_cost'), - $request->validated('asset_eol_date'), - $request->validated('purchase_date'), - $request->validated('assigned_to'), - $request->validated('supplier_id'), - $request->validated('requestable'), - $request->validated('rtd_location_id'), - $request->validated('location_id'), - $request->validated('files'), - $request->validated('byod'), - $request->validated('assigned_user'), - $request->validated('assigned_asset'), - $request->validated('assigned_location'), - $custom_fields, - $request, + model_id: $request->validated('model_id'), + status_id: $request->validated('status_id'), + name: $request->validated('name'), + serial: $request->validated('serial'), + company_id: $request->validated('company_id'), + asset_tag: $request->validated('asset_tag'), + order_number: $request->validated('order_number'), + notes: $request->validated('notes'), + user_id: $request->validated('user_id'), + warranty_months: $request->validated('warranty_months'), + purchase_cost: $request->validated('purchase_cost'), + asset_eol_date: $request->validated('asset_eol_date'), + purchase_date: $request->validated('purchase_date'), + assigned_to: $request->validated('assigned_to'), + supplier_id: $request->validated('supplier_id'), + requestable: $request->validated('requestable'), + rtd_location_id: $request->validated('rtd_location_id'), + location_id: $request->validated('location_id'), + files: $request->validated('files'), + byod: $request->validated('byod'), + assigned_user: $request->validated('assigned_user'), + assigned_asset: $request->validated('assigned_asset'), + assigned_location: $request->validated('assigned_location'), + custom_fields: $custom_fields, + request: $request, //this is just for the handleImages method... + last_audit_date: $request->validated('last_audit_date'), ); return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success'))); diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 71ffde0aed..1dc5034e9b 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -114,31 +114,32 @@ class AssetsController extends Controller //DB::transaction(function () use ($request, $asset_tags, $serials, $custom_fields) { foreach ($asset_tags as $key => $asset_tag) { $asset = StoreAssetAction::run( - $request->validated('model_id'), - $request->validated('status_id'), - $request->validated('name'), - $serials[$key], - $request->validated('company_id'), - $asset_tag, - $request->validated('order_number'), - $request->validated('notes'), - $request->validated('user_id'), - $request->validated('warranty_months'), - $request->validated('purchase_cost'), - $request->validated('asset_eol_date'), - $request->validated('purchase_date'), - $request->validated('assigned_to'), - $request->validated('supplier_id'), - $request->validated('requestable'), - $request->validated('rtd_location_id'), - $request->validated('location_id'), - $request->validated('files'), - $request->validated('byod'), - $request->validated('assigned_user'), - $request->validated('assigned_asset'), - $request->validated('assigned_location'), - $custom_fields, - $request, //this is just for the handleImages method... + model_id: $request->validated('model_id'), + status_id: $request->validated('status_id'), + name: $request->validated('name'), + serial: $serials[$key], + company_id: $request->validated('company_id'), + asset_tag: $asset_tag, + order_number: $request->validated('order_number'), + notes: $request->validated('notes'), + user_id: $request->validated('user_id'), + warranty_months: $request->validated('warranty_months'), + purchase_cost: $request->validated('purchase_cost'), + asset_eol_date: $request->validated('asset_eol_date'), + purchase_date: $request->validated('purchase_date'), + assigned_to: $request->validated('assigned_to'), + supplier_id: $request->validated('supplier_id'), + requestable: $request->validated('requestable'), + rtd_location_id: $request->validated('rtd_location_id'), + location_id: $request->validated('location_id'), + files: $request->validated('files'), + byod: $request->validated('byod'), + assigned_user: $request->validated('assigned_user'), + assigned_asset: $request->validated('assigned_asset'), + assigned_location: $request->validated('assigned_location'), + custom_fields: $custom_fields, + request: $request, //this is just for the handleImages method... + last_audit_date: $request->validated('last_audit_date'), ); } //}); @@ -150,8 +151,6 @@ class AssetsController extends Controller } catch (\Exception $e) { return redirect()->back()->with('error', trans('admin/hardware/message.create.error')); } - // (obviously then this would move up to the request) - $this->validate($request, ['asset_tags' => ['required', 'array']]); }