From 71f72e13578a9522489f9a6b4b91109a25aa52f5 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sat, 12 Jul 2025 16:32:50 +0330
Subject: [PATCH] create new options for mission

---
 app/Enums/MissionCategory.php                        |  8 ++++----
 .../V3/Dashboard/Mission/RequestPortalController.php | 12 ++++--------
 .../V3/Mission/RequestPortal/StoreRequest.php        |  4 ++--
 .../V3/Mission/RequestPortal/UpdateRequest.php       |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/Enums/MissionCategory.php b/app/Enums/MissionCategory.php
index 2cf0e26a..686135e9 100644
--- a/app/Enums/MissionCategory.php
+++ b/app/Enums/MissionCategory.php
@@ -2,11 +2,11 @@
 
 namespace App\Enums;
 
-enum CategoryTypeMission: int
+enum MissionCategory: int
 {
-    case FALETE_ROZANEH= 0;
-    case GASHTEH_RAHDARY = 1;
-    case VAKONESH_SARE = 2;
+    case ROAD_ITEM= 0;
+    case ROAD_PATROL = 1;
+    case ROAD_OBSERVATION = 2;
 
 
     public static function name(int $state): string
diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
index 8735f4fc..9543f208 100644
--- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission;
 
-use App\Enums\CategoryTypeMission;
+use App\Enums\MissionCategory;
 use App\Enums\MissionStates;
 use App\Enums\MissionTypes;
 use App\Enums\MissionZones;
@@ -30,7 +30,6 @@ class RequestPortalController extends Controller
         DB::transaction(function () use ($request) {
             $user = auth()->user();
             $state = MissionStates::REQUEST_CREATED->value;
-            $code = $request->category_id == 2 ? $request->code : null;
 
             $mission = Mission::query()->create([
                 'user_id' => $user->id,
@@ -53,9 +52,9 @@ class RequestPortalController extends Controller
                 'end_point' => $request->end_point,
                 'area' => json_encode($request->area),
                 'category_id' => $request->category_id,
-                'category_name' => CategoryTypeMission::name($request->category_id),
+                'category_name' => MissionCategory::name($request->category_id),
                 'explanation' => $request->explanation,
-                'code' => $code,
+                'code' => rand(100000, 999999),
             ]);
 
             $mission->rahdaran()->attach($request->rahdaran);
@@ -73,8 +72,6 @@ class RequestPortalController extends Controller
     {
         DB::transaction(function () use ($mission, $request) {
             $state = MissionStates::REQUEST_CREATED->value;
-            $code = $request->category_id == 2 ? $request->code : null;
-
             $mission->update([
                 'state_id' => $state,
                 'state_name' => MissionStates::name($state),
@@ -90,9 +87,8 @@ class RequestPortalController extends Controller
                 'end_point' => $request->end_point,
                 'area' => json_encode($request->area),
                 'category_id' => $request->category_id,
-                'category_name' => CategoryTypeMission::name($request->category_id),
+                'category_name' => MissionCategory::name($request->category_id),
                 'explanation' => $request->explanation,
-                'code' => $code,
             ]);
 
             $mission->rahdaran()->sync($request->rahdaran);
diff --git a/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php
index 02a713dd..0a466b8b 100644
--- a/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php
+++ b/app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\V3\Mission\RequestPortal;
 
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class StoreRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array<string, ValidationRule|array|string>
      */
     public function rules(): array
     {
@@ -33,7 +34,6 @@ class StoreRequest extends FormRequest
             'end_point' => 'required|string',
             'area' => 'required|array',
             'explanation'  => 'required|string',
-            'code' => 'string',
             'category_id' => 'required|in:1,2,3',
         ];
     }
diff --git a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php
index 9480a56a..dfdc6241 100644
--- a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php
+++ b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests\V3\Mission\RequestPortal;
 
 use App\Enums\MissionStates;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateRequest extends FormRequest
@@ -18,7 +19,7 @@ class UpdateRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array<string, ValidationRule|array|string>
      */
     public function rules(): array
     {
@@ -34,7 +35,6 @@ class UpdateRequest extends FormRequest
             'end_point' => 'required|string',
             'area' => 'required|array',
             'explanation'  => 'required|string',
-            'code' => 'string',
             'category_id' => 'required|in:1,2,3',
         ];
     }