create new options for mission
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user