From 19d099d451665be69230ee12e4e907b33b6eef4f Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sat, 27 Sep 2025 11:32:07 +0330 Subject: [PATCH 1/2] create new item for mission when they need add new mission when they entri enther mission --- .../Mission/RequestPortalController.php | 53 +++++++++++++++ .../RequestPortal/StoreContinueRequest.php | 66 +++++++++++++++++++ routes/v3.php | 1 + 3 files changed, 120 insertions(+) create mode 100644 app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 23d8bd74..3bead011 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -9,6 +9,7 @@ use App\Enums\MissionZones; use App\Http\Controllers\Controller; use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController; use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest; +use App\Http\Requests\V3\Mission\RequestPortal\StoreContinueRequest; use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest; use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest; use App\Http\Traits\ApiResponse; @@ -81,6 +82,58 @@ class RequestPortalController extends Controller return $this->successResponse($mission); } + public function continueMission(StoreContinueRequest $request , Mission $mission): JsonResponse + { + $oldMission = $mission; + + DB::transaction(function () use ($request, $oldMission) { + $user = auth()->user(); + + $oldMission->update(['finish_time' => now()]); + + $state = MissionStates::REQUEST_CREATED->value; + $category = $request->category_id; + + $newMission = Mission::query()->create([ + 'user_id' => $user->id, + 'username' => $user->username, + 'province_id' => $user->province_id, + 'province_name' => $user->province_fa, + 'edare_shahri_id' => $user->edarate_shahri_id ?? null, + 'edare_shahri_name' => $user->edarate_shahri_name ?? null, + 'state_id' => $state, + 'state_name' => MissionStates::name($state), + 'type' => $request->type, + 'type_fa' => MissionTypes::name($request->type), + 'zone' => $request->zone, + 'zone_fa' => MissionZones::name($request->zone), + 'start_date' => $request->start_date, + 'end_date' => $request->end_date, + 'request_date' => now(), + 'description' => $request->description, + 'end_point' => $request->end_point, + 'area' => json_encode($request->area), + 'category_id' => $category, + 'category_name' => MissionCategory::name($category), + 'explanation' => $request->explanation, + 'start_time' => now() + ]); + + $newMission->rahdaran()->sync($request->rahdaran); + $newMission->machines()->attach($request->machines); + $newMission->rahdaran()->attach($request->driver, ['is_driver' => true]); + + if ($category == 3){ + RoadObserved::query() + ->find($request->road_observed_id) + ->missions() + ->attach( $newMission->id); + } + }); + + return $this->successResponse(); + } + public function update(UpdateRequest $request, Mission $mission): JsonResponse { DB::transaction(function () use ($mission, $request) { diff --git a/app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php new file mode 100644 index 00000000..628a8a65 --- /dev/null +++ b/app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php @@ -0,0 +1,66 @@ +mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::START_MISSION->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'rahdaran' => 'array', + 'rahdaran.*' => 'exists:rahdaran,id', + 'machines' => 'required|array', + 'machines.*' => 'required|integer|exists:cmms_machines,id', + 'driver' => 'required|integer|exists:rahdaran,id', + 'type' => 'required|in:1,2', + 'zone' => 'required|in:1,2,3', + 'start_date' => 'required|date', + 'end_date' => 'required|date', + 'description' => 'string', + 'end_point' => 'required|string', + 'area' => 'required|array', + 'area.type' => 'required|string', + 'area.coordinates' => 'required|array', + 'explanation' => 'required|string', + 'category_id' => 'required|in:1,2,3', + 'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id', + ]; + } + public function after(): array + { + return [ + function (Validator $validator) { + if ($this->type == 1){ + $start = Carbon::parse($this->start_date); + $end = Carbon::parse($this->end_date); + + if ($start->diffInMinutes($end) > 480){ + $validator->errors()->add( + 'end_date', + 'مدت زمان مأموریت ساعتی نباید بیشتر از ۸ ساعت باشد.' + ); + } + } + } + ]; + } +} diff --git a/routes/v3.php b/routes/v3.php index 2bd4a693..b81afd99 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -488,6 +488,7 @@ Route::prefix('missions') Route::get('/', 'index')->name('index'); Route::post('/', 'store')->name('store'); Route::post('/no_process','noProcess')->name('noProcess'); + Route::post('/continue','continueMission')->name('continueMission'); Route::get('/{mission}', 'show')->name('show'); Route::post('/{mission}', 'update')->name('update'); Route::delete('/{mission}', 'destroy')->name('destroy'); From f6810f3e474a90afd415e6b7eb7592d68b1ae71b Mon Sep 17 00:00:00 2001 From: joddyabott Date: Sat, 27 Sep 2025 13:39:31 +0330 Subject: [PATCH 2/2] fix and debug code --- .../V3/Dashboard/Mission/RequestPortalController.php | 10 ++++------ ...eContinueRequest.php => ContinueMissionRequest.php} | 2 +- routes/v3.php | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) rename app/Http/Requests/V3/Mission/RequestPortal/{StoreContinueRequest.php => ContinueMissionRequest.php} (97%) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 3bead011..f5dc950c 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -9,7 +9,7 @@ use App\Enums\MissionZones; use App\Http\Controllers\Controller; use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController; use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest; -use App\Http\Requests\V3\Mission\RequestPortal\StoreContinueRequest; +use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest; use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest; use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest; use App\Http\Traits\ApiResponse; @@ -82,14 +82,12 @@ class RequestPortalController extends Controller return $this->successResponse($mission); } - public function continueMission(StoreContinueRequest $request , Mission $mission): JsonResponse + public function continueMission(ContinueMissionRequest $request , Mission $mission): JsonResponse { - $oldMission = $mission; - - DB::transaction(function () use ($request, $oldMission) { + DB::transaction(function () use ($request, $mission) { $user = auth()->user(); - $oldMission->update(['finish_time' => now()]); + $mission->update(['finish_time' => now()]); $state = MissionStates::REQUEST_CREATED->value; $category = $request->category_id; diff --git a/app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php similarity index 97% rename from app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php rename to app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php index 628a8a65..345f2505 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/StoreContinueRequest.php +++ b/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php @@ -8,7 +8,7 @@ use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; -class StoreContinueRequest extends FormRequest +class ContinueMissionRequest extends FormRequest { /** * Determine if the user is authorized to make this request. diff --git a/routes/v3.php b/routes/v3.php index b81afd99..37496c5c 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -574,7 +574,7 @@ Route::prefix('harim') ->group(function () { Route::post('/receive_new_request', 'receiveNewRequest')->name('receiveNewRequest'); Route::post('/receive_access_road','getAccessRoad')->name('getAccessRoad'); - Route::post('/get_reject_request','getRejectRequest')->name('getRejectRequest'); + Route::post('/get_status_request','getRejectRequest')->name('getRejectRequest'); Route::post('/get_final_polygons','getFinalPolygons')->name('getFinalPolygons'); }); });