DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

a couple more tests passing

Browse source
This commit is contained in:
spencerrlongg 2024-10-30 19:37:51 -05:00
parent c0ea1fbe78
commit b00f8b5c40
3 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Actions/Assets/StoreAssetAction.php
View file

@ -46,7 +46,7 @@ class StoreAssetAction
$assigned_location = null, $assigned_location = null,
$custom_fields = 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? $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(); $settings = Setting::getSettings();
@ -72,6 +72,8 @@ class StoreAssetAction
$asset->requestable = $requestable; $asset->requestable = $requestable;
$asset->rtd_location_id = $rtd_location_id; $asset->rtd_location_id = $rtd_location_id;
$asset->byod = $byod; $asset->byod = $byod;
$asset->last_audit_date = $last_audit_date;
$asset->location_id = $location_id;
// set up next audit date // set up next audit date
if (!empty($settings->audit_interval)) { if (!empty($settings->audit_interval)) {
@ -172,10 +174,6 @@ class StoreAssetAction
if ($asset->image) { if ($asset->image) {
$asset->image = $asset->getImageUrl(); $asset->image = $asset->getImageUrl();
} }
}
if ($asset->save()) {
return $asset; return $asset;
} else { } else {
return $asset->getErrors(); return $asset->getErrors();

51
app/Http/Controllers/Api/AssetsController.php
View file

@ -603,31 +603,32 @@ class AssetsController extends Controller
return starts_with($key, '_snipeit_'); return starts_with($key, '_snipeit_');
}); });
$asset = StoreAssetAction::run( $asset = StoreAssetAction::run(
$request->validated('model_id'), model_id: $request->validated('model_id'),
$request->validated('status_id'), status_id: $request->validated('status_id'),
$request->validated('name'), name: $request->validated('name'),
$request->validated('serial'), serial: $request->validated('serial'),
$request->validated('company_id'), company_id: $request->validated('company_id'),
$request->validated('asset_tag'), asset_tag: $request->validated('asset_tag'),
$request->validated('order_number'), order_number: $request->validated('order_number'),
$request->validated('notes'), notes: $request->validated('notes'),
$request->validated('user_id'), user_id: $request->validated('user_id'),
$request->validated('warranty_months'), warranty_months: $request->validated('warranty_months'),
$request->validated('purchase_cost'), purchase_cost: $request->validated('purchase_cost'),
$request->validated('asset_eol_date'), asset_eol_date: $request->validated('asset_eol_date'),
$request->validated('purchase_date'), purchase_date: $request->validated('purchase_date'),
$request->validated('assigned_to'), assigned_to: $request->validated('assigned_to'),
$request->validated('supplier_id'), supplier_id: $request->validated('supplier_id'),
$request->validated('requestable'), requestable: $request->validated('requestable'),
$request->validated('rtd_location_id'), rtd_location_id: $request->validated('rtd_location_id'),
$request->validated('location_id'), location_id: $request->validated('location_id'),
$request->validated('files'), files: $request->validated('files'),
$request->validated('byod'), byod: $request->validated('byod'),
$request->validated('assigned_user'), assigned_user: $request->validated('assigned_user'),
$request->validated('assigned_asset'), assigned_asset: $request->validated('assigned_asset'),
$request->validated('assigned_location'), assigned_location: $request->validated('assigned_location'),
$custom_fields, custom_fields: $custom_fields,
$request, 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'))); return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));

53
app/Http/Controllers/Assets/AssetsController.php
View file

@ -114,31 +114,32 @@ class AssetsController extends Controller
//DB::transaction(function () use ($request, $asset_tags, $serials, $custom_fields) { //DB::transaction(function () use ($request, $asset_tags, $serials, $custom_fields) {
foreach ($asset_tags as $key => $asset_tag) { foreach ($asset_tags as $key => $asset_tag) {
$asset = StoreAssetAction::run( $asset = StoreAssetAction::run(
$request->validated('model_id'), model_id: $request->validated('model_id'),
$request->validated('status_id'), status_id: $request->validated('status_id'),
$request->validated('name'), name: $request->validated('name'),
$serials[$key], serial: $serials[$key],
$request->validated('company_id'), company_id: $request->validated('company_id'),
$asset_tag, asset_tag: $asset_tag,
$request->validated('order_number'), order_number: $request->validated('order_number'),
$request->validated('notes'), notes: $request->validated('notes'),
$request->validated('user_id'), user_id: $request->validated('user_id'),
$request->validated('warranty_months'), warranty_months: $request->validated('warranty_months'),
$request->validated('purchase_cost'), purchase_cost: $request->validated('purchase_cost'),
$request->validated('asset_eol_date'), asset_eol_date: $request->validated('asset_eol_date'),
$request->validated('purchase_date'), purchase_date: $request->validated('purchase_date'),
$request->validated('assigned_to'), assigned_to: $request->validated('assigned_to'),
$request->validated('supplier_id'), supplier_id: $request->validated('supplier_id'),
$request->validated('requestable'), requestable: $request->validated('requestable'),
$request->validated('rtd_location_id'), rtd_location_id: $request->validated('rtd_location_id'),
$request->validated('location_id'), location_id: $request->validated('location_id'),
$request->validated('files'), files: $request->validated('files'),
$request->validated('byod'), byod: $request->validated('byod'),
$request->validated('assigned_user'), assigned_user: $request->validated('assigned_user'),
$request->validated('assigned_asset'), assigned_asset: $request->validated('assigned_asset'),
$request->validated('assigned_location'), assigned_location: $request->validated('assigned_location'),
$custom_fields, custom_fields: $custom_fields,
$request, //this is just for the handleImages method... 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) { } catch (\Exception $e) {
return redirect()->back()->with('error', trans('admin/hardware/message.create.error')); 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']]);
} }