From ff25015595ddab927136fb05d8fb6ad1333db0c9 Mon Sep 17 00:00:00 2001 From: snipe Date: Sun, 10 Aug 2025 13:24:14 +0100 Subject: [PATCH] Renamed more files Signed-off-by: snipe --- ...troller.php => MaintenancesController.php} | 53 +++++----- ...troller.php => MaintenancesController.php} | 96 +++++++++---------- ...former.php => MaintenancesTransformer.php} | 17 ++-- 3 files changed, 80 insertions(+), 86 deletions(-) rename app/Http/Controllers/Api/{AssetMaintenancesController.php => MaintenancesController.php} (77%) rename app/Http/Controllers/{AssetMaintenancesController.php => MaintenancesController.php} (59%) rename app/Http/Transformers/{AssetMaintenancesTransformer.php => MaintenancesTransformer.php} (88%) diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php similarity index 77% rename from app/Http/Controllers/Api/AssetMaintenancesController.php rename to app/Http/Controllers/Api/MaintenancesController.php index e486848730..86f561c86c 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/MaintenancesController.php @@ -5,11 +5,10 @@ namespace App\Http\Controllers\Api; use App\Helpers\Helper; use App\Http\Controllers\Controller; use App\Http\Requests\ImageUploadRequest; -use App\Http\Transformers\AssetMaintenancesTransformer; +use App\Http\Transformers\MaintenancesTransformer; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Company; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; @@ -19,13 +18,13 @@ use Illuminate\Http\JsonResponse; * * @version v2.0 */ -class AssetMaintenancesController extends Controller +class MaintenancesController extends Controller { /** * Generates the JSON response for asset maintenances listing view. * - * @see AssetMaintenancesController::getIndex() method that generates view + * @see MaintenancesController::getIndex() method that generates view * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -34,7 +33,7 @@ class AssetMaintenancesController extends Controller { $this->authorize('view', Asset::class); - $maintenances = AssetMaintenance::select('asset_maintenances.*') + $maintenances = Maintenance::select('maintenances.*') ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser'); if ($request->filled('search')) { @@ -46,11 +45,11 @@ class AssetMaintenancesController extends Controller } if ($request->filled('supplier_id')) { - $maintenances->where('asset_maintenances.supplier_id', '=', $request->input('supplier_id')); + $maintenances->where('maintenances.supplier_id', '=', $request->input('supplier_id')); } if ($request->filled('created_by')) { - $maintenances->where('asset_maintenances.created_by', '=', $request->input('created_by')); + $maintenances->where('maintenances.created_by', '=', $request->input('created_by')); } if ($request->filled('asset_maintenance_type')) { @@ -64,7 +63,7 @@ class AssetMaintenancesController extends Controller $allowed_columns = [ 'id', - 'title', + 'name', 'asset_maintenance_time', 'asset_maintenance_type', 'cost', @@ -113,7 +112,7 @@ class AssetMaintenancesController extends Controller $total = $maintenances->count(); $maintenances = $maintenances->skip($offset)->take($limit)->get(); - return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total); + return (new MaintenancesTransformer())->transformMaintenances($maintenances, $total); } @@ -122,7 +121,7 @@ class AssetMaintenancesController extends Controller /** * Validates and stores the new asset maintenance * - * @see AssetMaintenancesController::getCreate() method for the form + * @see MaintenancesController::getCreate() method for the form * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -132,13 +131,13 @@ class AssetMaintenancesController extends Controller $this->authorize('update', Asset::class); // create a new model instance - $maintenance = new AssetMaintenance(); + $maintenance = new Maintenance(); $maintenance->fill($request->all()); $maintenance->created_by = auth()->id(); $maintenance = $request->handleImages($maintenance); // Was the asset maintenance created? if ($maintenance->save()) { - return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.create.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.create.success'))); } @@ -159,11 +158,11 @@ class AssetMaintenancesController extends Controller { $this->authorize('update', Asset::class); - if ($maintenance = AssetMaintenance::with('asset')->find($id)) { + if ($maintenance = Maintenance::with('asset')->find($id)) { // Can this user manage this asset? if (! Company::isCurrentUserHasAccess($maintenance->asset)) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')]))); } // The asset this miantenance is attached to is not valid or has been deleted @@ -174,13 +173,13 @@ class AssetMaintenancesController extends Controller $maintenance->fill($request->all()); if ($maintenance->save()) { - return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.edit.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.edit.success'))); } return response()->json(Helper::formatStandardApiResponse('error', null, $maintenance->getErrors())); } - return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id]))); } @@ -188,20 +187,20 @@ class AssetMaintenancesController extends Controller * Delete an asset maintenance * * @author A. Gianotto - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v4.0] */ - public function destroy($assetMaintenanceId) : JsonResponse | array + public function destroy($maintenanceId) : JsonResponse | array { $this->authorize('update', Asset::class); // Check if the asset maintenance exists - $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); + $maintenance = Maintenance::findOrFail($maintenanceId); - $assetMaintenance->delete(); + $maintenance->delete(); - return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success'))); + return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.delete.success'))); } @@ -210,19 +209,19 @@ class AssetMaintenancesController extends Controller * View an asset maintenance * * @author A. Gianotto - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v4.0] */ - public function show($assetMaintenanceId) : JsonResponse | array + public function show($maintenanceId) : JsonResponse | array { $this->authorize('view', Asset::class); - $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId); - if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) { + $maintenance = Maintenance::findOrFail($maintenanceId); + if (! Company::isCurrentUserHasAccess($maintenance->asset)) { return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset')); } - return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance); + return (new MaintenancesTransformer())->transformMaintenance($maintenance); } } diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/MaintenancesController.php similarity index 59% rename from app/Http/Controllers/AssetMaintenancesController.php rename to app/Http/Controllers/MaintenancesController.php index 3405d592ab..e893b75f39 100644 --- a/app/Http/Controllers/AssetMaintenancesController.php +++ b/app/Http/Controllers/MaintenancesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Http\Requests\ImageUploadRequest; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use App\Models\Company; use Illuminate\Support\Facades\Auth; use Carbon\Carbon; @@ -18,29 +18,23 @@ use \Illuminate\Http\RedirectResponse; * * @version v2.0 */ -class AssetMaintenancesController extends Controller +class MaintenancesController extends Controller { /** * Returns a view that invokes the ajax tables which actually contains - * the content for the asset maintenances listing, which is generated in getDatatable. - * - * @todo This should be replaced with middleware and/or policies - * @see AssetMaintenancesController::getDatatable() method that generates the JSON response - * @author Vincent Sposato - * @version v1.0 - * @since [v1.8] + * the content for the asset maintenances listing. */ public function index() : View { $this->authorize('view', Asset::class); - return view('asset_maintenances/index'); + return view('maintenances.index'); } /** * Returns a form view to create a new asset maintenance. * - * @see AssetMaintenancesController::postCreate() method that stores the data + * @see MaintenancesController::postCreate() method that stores the data * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -56,16 +50,16 @@ class AssetMaintenancesController extends Controller $asset->asset_id = $asset->id; } - return view('asset_maintenances/edit') - ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions()) + return view('maintenances/edit') + ->with('maintenanceType', Maintenance::getImprovementOptions()) ->with('asset', $asset) - ->with('item', new AssetMaintenance); + ->with('item', new Maintenance); } /** * Validates and stores the new asset maintenance * - * @see AssetMaintenancesController::getCreate() method for the form + * @see MaintenancesController::getCreate() method for the form * @author Vincent Sposato * @version v1.0 * @since [v1.8] @@ -79,73 +73,73 @@ class AssetMaintenancesController extends Controller // Loop through the selected assets foreach ($assets as $asset) { - $assetMaintenance = new AssetMaintenance(); - $assetMaintenance->supplier_id = $request->input('supplier_id'); - $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = $request->input('cost'); - $assetMaintenance->notes = $request->input('notes'); + $maintenance = new Maintenance(); + $maintenance->supplier_id = $request->input('supplier_id'); + $maintenance->is_warranty = $request->input('is_warranty'); + $maintenance->cost = $request->input('cost'); + $maintenance->notes = $request->input('notes'); // Save the asset maintenance data - $assetMaintenance->asset_id = $asset->id; - $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $assetMaintenance->title = $request->input('title'); - $assetMaintenance->start_date = $request->input('start_date'); - $assetMaintenance->completion_date = $request->input('completion_date'); - $assetMaintenance->created_by = auth()->id(); + $maintenance->asset_id = $asset->id; + $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); + $maintenance->name = $request->input('name'); + $maintenance->start_date = $request->input('start_date'); + $maintenance->completion_date = $request->input('completion_date'); + $maintenance->created_by = auth()->id(); - if (($assetMaintenance->completion_date !== null) - && ($assetMaintenance->start_date !== '') - && ($assetMaintenance->start_date !== '0000-00-00') + if (($maintenance->completion_date !== null) + && ($maintenance->start_date !== '') + && ($maintenance->start_date !== '0000-00-00') ) { - $startDate = Carbon::parse($assetMaintenance->start_date); - $completionDate = Carbon::parse($assetMaintenance->completion_date); - $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true); + $startDate = Carbon::parse($maintenance->start_date); + $completionDate = Carbon::parse($maintenance->completion_date); + $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true); } - $assetMaintenance = $request->handleImages($assetMaintenance); + $maintenance = $request->handleImages($maintenance); // Was the asset maintenance created? - if (!$assetMaintenance->save()) { - return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors()); + if (!$maintenance->save()) { + return redirect()->back()->withInput()->withErrors($maintenance->getErrors()); } } return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.create.success')); + ->with('success', trans('admin/maintenances/message.create.success')); } /** * Returns a form view to edit a selected asset maintenance. * - * @see AssetMaintenancesController::postEdit() method that stores the data + * @see MaintenancesController::postEdit() method that stores the data * @author Vincent Sposato * @version v1.0 * @since [v1.8] */ - public function edit(AssetMaintenance $maintenance) : View | RedirectResponse + public function edit(Maintenance $maintenance) : View | RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); - return view('asset_maintenances/edit') + return view('maintenances/edit') ->with('selected_assets', $maintenance->asset->pluck('id')->toArray()) ->with('asset_ids', request()->input('asset_ids', [])) - ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions()) + ->with('maintenanceType', Maintenance::getImprovementOptions()) ->with('item', $maintenance); } /** * Validates and stores an update to an asset maintenance * - * @see AssetMaintenancesController::postEdit() method that stores the data + * @see MaintenancesController::postEdit() method that stores the data * @author Vincent Sposato * @param Request $request - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function update(ImageUploadRequest $request, AssetMaintenance $maintenance) : View | RedirectResponse + public function update(ImageUploadRequest $request, Maintenance $maintenance) : View | RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); @@ -155,7 +149,7 @@ class AssetMaintenancesController extends Controller $maintenance->cost = $request->input('cost'); $maintenance->notes = $request->input('notes'); $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type'); - $maintenance->title = $request->input('title'); + $maintenance->name = $request->input('name'); $maintenance->start_date = $request->input('start_date'); $maintenance->completion_date = $request->input('completion_date'); @@ -182,7 +176,7 @@ class AssetMaintenancesController extends Controller if ($maintenance->save()) { return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.edit.success')); + ->with('success', trans('admin/maintenances/message.edit.success')); } return redirect()->back()->withInput()->withErrors($maintenance->getErrors()); @@ -192,11 +186,11 @@ class AssetMaintenancesController extends Controller * Delete an asset maintenance * * @author Vincent Sposato - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function destroy(AssetMaintenance $maintenance) : RedirectResponse + public function destroy(Maintenance $maintenance) : RedirectResponse { $this->authorize('update', Asset::class); $this->authorize('update', $maintenance->asset); @@ -204,19 +198,19 @@ class AssetMaintenancesController extends Controller $maintenance->delete(); // Redirect to the asset_maintenance management page return redirect()->route('maintenances.index') - ->with('success', trans('admin/asset_maintenances/message.delete.success')); + ->with('success', trans('admin/maintenances/message.delete.success')); } /** * View an asset maintenance * * @author Vincent Sposato - * @param int $assetMaintenanceId + * @param int $maintenanceId * @version v1.0 * @since [v1.8] */ - public function show(AssetMaintenance $maintenance) : View | RedirectResponse + public function show(Maintenance $maintenance) : View | RedirectResponse { - return view('asset_maintenances/view')->with('assetMaintenance', $maintenance); + return view('maintenances.view')->with('maintenance', $maintenance); } } diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php similarity index 88% rename from app/Http/Transformers/AssetMaintenancesTransformer.php rename to app/Http/Transformers/MaintenancesTransformer.php index 6106f134e4..c2fc8a0e14 100644 --- a/app/Http/Transformers/AssetMaintenancesTransformer.php +++ b/app/Http/Transformers/MaintenancesTransformer.php @@ -4,24 +4,24 @@ namespace App\Http\Transformers; use App\Helpers\Helper; use App\Models\Asset; -use App\Models\AssetMaintenance; +use App\Models\Maintenance; use Illuminate\Support\Facades\Gate; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Storage; -class AssetMaintenancesTransformer +class MaintenancesTransformer { - public function transformAssetMaintenances(Collection $assetmaintenances, $total) + public function transformMaintenances(Collection $maintenances, $total) { $array = []; - foreach ($assetmaintenances as $assetmaintenance) { - $array[] = self::transformAssetMaintenance($assetmaintenance); + foreach ($maintenances as $assetmaintenance) { + $array[] = self::transformMaintenance($assetmaintenance); } return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformAssetMaintenance(AssetMaintenance $assetmaintenance) + public function transformMaintenance(Maintenance $assetmaintenance) { $array = [ 'id' => (int) $assetmaintenance->id, @@ -34,7 +34,7 @@ class AssetMaintenancesTransformer 'created_at' => Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime'), ] : null, - 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('asset_maintenances/'.e($assetmaintenance->image)) : null, + 'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('maintenances/'.e($assetmaintenance->image)) : null, 'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [ 'id' => (int) $assetmaintenance->asset->model->id, 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null, @@ -50,7 +50,8 @@ class AssetMaintenancesTransformer 'name'=> ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null, ] : null, - 'title' => ($assetmaintenance->title) ? e($assetmaintenance->title) : null, + 'name' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null, + 'title' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null, // legacy to not change the shape of the API 'location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->location)) ? [ 'id' => (int) $assetmaintenance->asset->location->id, 'name'=> e($assetmaintenance->asset->location->name),