From 355941d1e1abb4f2ae40afdda947266f6affab82 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 19 May 2025 10:31:52 +0330 Subject: [PATCH] compleate controller and routs --- .../Dashboard/Mission/CartableController.php | 20 +++++++++---------- .../{ => RequestPortal}/StoreRequest.php | 6 +++--- .../{ => RequestPortal}/UpdateRequest.php | 6 +++--- routes/v3.php | 11 ++++++++++ 4 files changed, 26 insertions(+), 17 deletions(-) rename app/Http/Requests/V3/Mission/{ => RequestPortal}/StoreRequest.php (86%) rename app/Http/Requests/V3/Mission/{ => RequestPortal}/UpdateRequest.php (86%) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php b/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php index fde01024..1964af7c 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/CartableController.php @@ -2,18 +2,14 @@ namespace App\Http\Controllers\V3\Dashboard\Mission; -use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; -use App\Http\Requests\V3\Mission\StoreRequest; -use App\Http\Requests\V3\Mission\UpdateRequest; +use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest; +use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest; use App\Http\Traits\ApiResponse; -use App\Models\CMMSMachine; use App\Models\Mission; -use App\Models\Rahdaran; use App\Services\Missions\CartableService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; class CartableController extends Controller { @@ -42,7 +38,7 @@ class CartableController extends Controller 'end_point' =>$request->end_point, ]); - $mission->rahdaran()->attach($request->rahdaran_id); + $mission->rahdaran()->attach($request->rahdaran); return $this->successResponse(); @@ -53,7 +49,7 @@ class CartableController extends Controller return $this->successResponse($mission); } - public function update(UpdateRequest $request,Mission $mission) + public function update(UpdateRequest $request,Mission $mission): JsonResponse { $mission->update([ 'state_id' => $request->state_id, @@ -67,18 +63,20 @@ class CartableController extends Controller 'description' =>$request->description, 'start_point' =>$request->start_point, 'end_point' =>$request->end_point, + ]); - $mission->rahdaran()->attach($request->rahdaran_id); + $mission->rahdaran()->sync($request->rahdaran); return $this->successResponse(); } - public function destroy(Mission $mission) + public function destroy(Mission $mission): JsonResponse { + $mission->rahdaran()->detach(); $mission->delete(); - return $this->successResponse($mission); + return $this->successResponse(); } } diff --git a/app/Http/Requests/V3/Mission/StoreRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php similarity index 86% rename from app/Http/Requests/V3/Mission/StoreRequest.php rename to app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php index ef3a86e3..62bd1984 100644 --- a/app/Http/Requests/V3/Mission/StoreRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php @@ -1,6 +1,6 @@ 'required|array', - 'rahdaran_id.*' => 'exists:rahdaran,id', + 'rahdaran' => 'required|array', + 'rahdaran.*' => 'exists:rahdaran,id', 'requested_machine_type' => 'required|string|max:255', 'requested_machine_numbers'=> 'required|integer|max:255', 'type' => 'required|string|max:50', diff --git a/app/Http/Requests/V3/Mission/UpdateRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php similarity index 86% rename from app/Http/Requests/V3/Mission/UpdateRequest.php rename to app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php index fb913c6f..c463fc53 100644 --- a/app/Http/Requests/V3/Mission/UpdateRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php @@ -1,6 +1,6 @@ 'required|array', - 'rahdaran_id.*' => 'exists:rahdaran,id', + 'rahdaran' => 'required|array', + 'rahdaran.*' => 'exists:rahdaran,id', 'requested_machine_type' => 'required|string|max:255', 'requested_machine_numbers'=> 'required|integer|max:255', 'type' => 'required|string|max:50', diff --git a/routes/v3.php b/routes/v3.php index 4de8e0bc..5810034a 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -7,6 +7,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshController; use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController; use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController; use App\Http\Controllers\V3\Dashboard\ItemsManagementController; +use App\Http\Controllers\V3\Dashboard\Mission\CartableController; use App\Http\Controllers\V3\Dashboard\ObservedItemController; use App\Http\Controllers\V3\Dashboard\AccidentReceiptController; use App\Http\Controllers\V3\Dashboard\OtpManagementController; @@ -424,3 +425,13 @@ Route::prefix('road_maintenance_station') Route::post('/{rahdariPoint}', 'update')->name('update')->middleware('permission:edit-tollhouse|edit-tollhouse-province'); Route::delete('/{rahdariPoint}', 'destroy')->name('destroy')->middleware('permission:delete-tollhouse|delete-tollhouse-province'); }); +Route::prefix('missions') + ->name('missions.') + ->controller(CartableController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{mission}', 'show')->name('show'); + Route::post('/{mission}', 'update')->name('update'); + Route::delete('/{mission}', 'destroy')->name('destroy'); + });