From cc6f1cd585469b34b03db2e95407f3524afb68b2 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 4 Jul 2024 20:50:11 +0100 Subject: [PATCH] Added asset model request :( Signed-off-by: snipe --- .../Controllers/AssetModelsController.php | 74 ++++++------------- app/Http/Requests/StoreAssetModelRequest.php | 48 ++++++++++++ 2 files changed, 70 insertions(+), 52 deletions(-) create mode 100644 app/Http/Requests/StoreAssetModelRequest.php diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index a2deb616b0..17254a6d0d 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -4,19 +4,20 @@ namespace App\Http\Controllers; use App\Helpers\Helper; use App\Http\Requests\ImageUploadRequest; +use App\Http\Requests\StoreAssetModelRequest; use App\Models\Actionlog; -use App\Models\Asset; use App\Models\AssetModel; use App\Models\CustomField; use App\Models\User; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\Validator; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; -use Symfony\Component\HttpFoundation\JsonResponse; use Illuminate\Support\Facades\Log; +use \Illuminate\Contracts\View\View; +use \Illuminate\Http\RedirectResponse; + /** * This class controls all actions related to asset models for @@ -33,10 +34,8 @@ class AssetModelsController extends Controller * * @author [A. Gianotto] [] * @since [v1.0] - * @return View - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function index() + public function index() : View { $this->authorize('index', AssetModel::class); @@ -48,10 +47,8 @@ class AssetModelsController extends Controller * * @author [A. Gianotto] [] * @since [v1.0] - * @return View - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function create() + public function create() : View { $this->authorize('create', AssetModel::class); @@ -66,16 +63,12 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param ImageUploadRequest $request - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function store(ImageUploadRequest $request) + public function store(ImageUploadRequest $request) : RedirectResponse { $this->authorize('create', AssetModel::class); - // Create a new asset model $model = new AssetModel; - // Save the model data $model->eol = $request->input('eol'); $model->depreciation_id = $request->input('depreciation_id'); $model->name = $request->input('name'); @@ -93,7 +86,6 @@ class AssetModelsController extends Controller $model = $request->handleImages($model); - // Was it created? if ($model->save()) { if ($this->shouldAddDefaultValues($request->input())) { if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){ @@ -113,18 +105,14 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $modelId - * @return View - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function edit($modelId = null) + public function edit($modelId = null) : View | RedirectResponse { $this->authorize('update', AssetModel::class); if ($item = AssetModel::find($modelId)) { $category_type = 'asset'; - $view = View::make('models/edit', compact('item', 'category_type')); - $view->with('depreciation_list', Helper::depreciationList()); + return view('models/edit', compact('item', 'category_type'))->with('depreciation_list', Helper::depreciationList()); - return $view; } return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist')); @@ -142,12 +130,11 @@ class AssetModelsController extends Controller * @return \Illuminate\Http\RedirectResponse * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function update(ImageUploadRequest $request, $modelId = null) + public function update(StoreAssetModelRequest $request, $modelId = null) : RedirectResponse { $this->authorize('update', AssetModel::class); - // Check if the model exists + if (is_null($model = AssetModel::find($modelId))) { - // Redirect to the models management page return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist')); } @@ -173,9 +160,6 @@ class AssetModelsController extends Controller } } - - - if ($model->save()) { if ($model->wasChanged('eol')) { if ($model->eol > 0) { @@ -200,10 +184,8 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $modelId - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function destroy($modelId) + public function destroy($modelId) : RedirectResponse { $this->authorize('delete', AssetModel::class); // Check if the model exists @@ -237,10 +219,8 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $id - * @return \Illuminate\Http\RedirectResponse - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function getRestore($id) + public function getRestore($id) : RedirectResponse { $this->authorize('create', AssetModel::class); @@ -255,7 +235,7 @@ class AssetModelsController extends Controller $logaction->item_type = User::class; $logaction->item_id = $model->id; $logaction->created_at = date('Y-m-d H:i:s'); - $logaction->user_id = Auth::user()->id; + $logaction->user_id = auth()->id(); $logaction->logaction('restore'); @@ -282,10 +262,8 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $modelId - * @return View - * @throws \Illuminate\Auth\Access\AuthorizationException */ - public function show($modelId = null) + public function show($modelId = null) : View | RedirectResponse { $this->authorize('view', AssetModel::class); $model = AssetModel::withTrashed()->find($modelId); @@ -303,9 +281,8 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $modelId - * @return View */ - public function getClone($modelId = null) + public function getClone($modelId = null) : View | RedirectResponse { $this->authorize('create', AssetModel::class); // Check if the model exists @@ -331,9 +308,8 @@ class AssetModelsController extends Controller * @author [B. Wetherington] [] * @since [v2.0] * @param int $modelId - * @return View */ - public function getCustomFields($modelId) + public function getCustomFields($modelId) : View { return view('models.custom_fields_form')->with('model', AssetModel::find($modelId)); } @@ -345,9 +321,8 @@ class AssetModelsController extends Controller * * @author [A. Gianotto] [] * @since [v1.7] - * @return \Illuminate\Contracts\View\View */ - public function postBulkEdit(Request $request) + public function postBulkEdit(Request $request) : View | RedirectResponse { $models_raw_array = $request->input('ids'); @@ -389,9 +364,8 @@ class AssetModelsController extends Controller * * @author [A. Gianotto] [] * @since [v1.7] - * @return \Illuminate\Contracts\View\View */ - public function postBulkEditSave(Request $request) + public function postBulkEditSave(Request $request) : RedirectResponse { $models_raw_array = $request->input('ids'); $update_array = []; @@ -429,9 +403,8 @@ class AssetModelsController extends Controller * @author [A. Gianotto] [] * @since [v1.0] * @param int $modelId - * @return \Illuminate\Http\RedirectResponse */ - public function postBulkDelete(Request $request) + public function postBulkDelete(Request $request) : RedirectResponse { $models_raw_array = $request->input('ids'); @@ -470,9 +443,8 @@ class AssetModelsController extends Controller * any default values were entered into the form. * * @param array $input - * @return bool */ - private function shouldAddDefaultValues(array $input) + private function shouldAddDefaultValues(array $input) : bool { return ! empty($input['add_default_values']) && ! empty($input['default_values']) @@ -484,7 +456,6 @@ class AssetModelsController extends Controller * * @param AssetModel $model * @param array $defaultValues - * @return void */ private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool { @@ -527,9 +498,8 @@ class AssetModelsController extends Controller /** * Removes all default values * - * @return void */ - private function removeCustomFieldsDefaultValues(AssetModel $model) + private function removeCustomFieldsDefaultValues(AssetModel $model) : void { $model->defaultValues()->detach(); } diff --git a/app/Http/Requests/StoreAssetModelRequest.php b/app/Http/Requests/StoreAssetModelRequest.php new file mode 100644 index 0000000000..407f064039 --- /dev/null +++ b/app/Http/Requests/StoreAssetModelRequest.php @@ -0,0 +1,48 @@ +category_type = Category::select('category_type')->find($this->category_id); + + \Log::error('Category Type: '.$this->category_type); + + $this->merge([ + 'model_category_type' => $this->category_type, + ]); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array|string> + */ + public function rules(): array + { + return array_merge( + ['model_category_type' => 'required|in:asset'], + parent::rules(), + ); + } + + public function messages(): array + { + $messages = ['model_category_type.in' => 'The category must be an asset category, dummy.']; + return $messages; + } +}