fix code in mission controller and form request

This commit is contained in:
faezeh
2026-06-21 16:11:42 +03:30
parent bab99f7f89
commit 3fb1474b80
8 changed files with 16 additions and 10 deletions

View File

@@ -25,6 +25,8 @@ class ClarifyUnauthorizedExitRequest extends FormRequest
public function rules(): array
{
return [
'item_id' => 'required|exists:info_items,item',
'sub_item_id' => 'required|exists:info_items,sub_item',
'rahdaran' => 'array',
'rahdaran.*' => 'exists:rahdaran,id',
'driver' => 'required|integer|exists:rahdaran,id',

View File

@@ -26,6 +26,8 @@ class ContinueMissionRequest extends FormRequest
public function rules(): array
{
return [
'item_id' => 'required|exists:info_items,item',
'sub_item_id' => 'required|exists:info_items,sub_item',
'rahdaran' => 'array',
'rahdaran.*' => 'exists:rahdaran,id',
'machine_id' => 'required|integer|exists:cmms_machines,id',
@@ -33,7 +35,6 @@ class ContinueMissionRequest extends FormRequest
'type' => 'required|in:1,2',
'zone' => 'required|in:1,2,3',
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'encoded_route' => 'required|string',
'explanation' => 'required|string',

View File

@@ -34,7 +34,6 @@ class StoreRequest extends FormRequest
'zone' => 'required|in:1,2,3',
'start_date' => 'required|date',
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'encoded_route' => 'required|string',
'explanation' => 'required|string',

View File

@@ -26,6 +26,8 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
return [
'item_id' => 'required|exists:info_items,item',
'sub_item_id' => 'required|exists:info_items,sub_item',
'rahdaran' => 'array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machines' => 'required|array',
@@ -33,7 +35,6 @@ class UpdateRequest extends FormRequest
'zone' => 'required|in:1,2,3',
'start_date' => 'required|date',
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'encoded_route' => 'required|string',
'explanation' => 'required|string',

View File

@@ -13,8 +13,8 @@ class DeallocateRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->mission->station_id == auth()->user()->station_id &&
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
return ($this->mission->station_id == auth()->user()->station_id &&
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]))
|| auth()->user()->username === 'witel';
}