improve code in controller and form request for V3 whit pint package

This commit is contained in:
2025-10-27 13:20:14 +03:30
parent 71f5001477
commit b155db758a
118 changed files with 604 additions and 559 deletions

View File

@@ -2,11 +2,9 @@
namespace App\Http\Requests\V3\AccidentReceipt;
use App\Enums\AccidentStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Validation\Rule;
class ChangeStatusRequest extends FormRequest
{
@@ -15,7 +13,7 @@ class ChangeStatusRequest extends FormRequest
*/
public function authorize(): bool
{
return Auth::user()->hasPermissionTo('change-accident-status');
return Auth::user()->hasPermissionTo('change-accident-status');
}
/**

View File

@@ -3,7 +3,7 @@
namespace App\Http\Requests\V3\AccidentReceipt;
use App\Enums\AccidentStates;
use App\Models\Accident;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmPaymentInfoRequest extends FormRequest
@@ -14,14 +14,16 @@ class ConfirmPaymentInfoRequest extends FormRequest
public function authorize(): bool
{
return in_array($this->accident->status,
[AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value, AccidentStates::SABT_FISH->value]
);
[
AccidentStates::SODOR_NAME_BIME_VA_DAGHI->value,
AccidentStates::SABT_FISH->value
]);
}
/**
* 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
{

View File

@@ -2,8 +2,7 @@
namespace App\Http\Requests\V3\AccidentReceipt;
use App\Enums\AccidentStates;
use App\Models\DailyAccidentSettings;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
@@ -19,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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\AccidentReceipt;
use App\Enums\AccidentStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class SubmitInvoiceRequest extends FormRequest
@@ -18,7 +19,7 @@ class SubmitInvoiceRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\AccidentReceipt;
use App\Enums\AccidentStates;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Azmayesh;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Azmayesh;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\AzmayeshSample;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\AzmayeshSample;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\AzmayeshType;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\AzmayeshType;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Damage;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
@@ -17,14 +18,14 @@ 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
{
return [
'title' =>'required|string|max:255|unique:damages,title',
'unit' =>'required|string|max:255',
'base_price' =>'required|integer',
'title' => 'required|string|max:255|unique:damages,title',
'unit' => 'required|string|max:255',
'base_price' => 'required|integer',
];
}
}

View File

@@ -23,9 +23,9 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
return [
'title' =>['required', 'string', 'max:255',Rule::unique('damages','title')->ignore($this->damage->id)],
'unit' =>'required|string',
'base_price' =>'required|integer',
'title' => ['required', 'string', 'max:255', Rule::unique('damages', 'title')->ignore($this->damage->id)],
'unit' => 'required|string',
'base_price' => 'required|integer',
];
}
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\Deputy;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmRequest extends FormRequest
@@ -19,7 +20,7 @@ class ConfirmRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\Deputy;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferRequest extends FormRequest
@@ -19,7 +20,7 @@ class ReferRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\Deputy;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferRoadAccessRequest extends FormRequest
@@ -19,7 +20,7 @@ class ReferRoadAccessRequest 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
{

View File

@@ -2,7 +2,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\Deputy;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ShowRequest extends FormRequest
@@ -18,7 +18,7 @@ class ShowRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmGuaranteeLetterNeedRequest extends FormRequest
@@ -19,7 +20,7 @@ class ConfirmGuaranteeLetterNeedRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmNoRoadAccessNeedRequest extends FormRequest
@@ -19,7 +20,7 @@ class ConfirmNoRoadAccessNeedRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmRoadAccessEditNeedRequest extends FormRequest
@@ -19,7 +20,7 @@ class ConfirmRoadAccessEditNeedRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ConfirmRoadAccessNeedRequest extends FormRequest
@@ -19,7 +20,7 @@ class ConfirmRoadAccessNeedRequest 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
{

View File

@@ -2,7 +2,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ShowRequest extends FormRequest
@@ -18,7 +18,7 @@ class ShowRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class FileAcceptedRequest extends FormRequest
@@ -19,7 +20,7 @@ class FileAcceptedRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class FileRejectedRequest extends FormRequest
@@ -19,7 +20,7 @@ class FileRejectedRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class NeedRoadAccessRequest extends FormRequest
@@ -19,7 +20,7 @@ class NeedRoadAccessRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class RejectRequest extends FormRequest
@@ -16,11 +17,10 @@ class RejectRequest extends FormRequest
$this->harim->state_id == HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
}
/**
* 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
{

View File

@@ -2,7 +2,6 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
@@ -16,7 +15,6 @@ class ShowRequest extends FormRequest
return $this->harim->province_id == auth()->user()->province_id;
}
/**
* Get the validation rules that apply to the request.
*

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class WithoutRoadAccessRequest extends FormRequest
@@ -19,7 +20,7 @@ class WithoutRoadAccessRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\ProvinceOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class FeedBackRequest extends FormRequest
@@ -19,7 +20,7 @@ class FeedBackRequest 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
{

View File

@@ -2,7 +2,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\ProvinceOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ShowRequest extends FormRequest
@@ -15,11 +15,10 @@ class ShowRequest extends FormRequest
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id;
}
/**
* 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
{

View File

@@ -25,9 +25,9 @@ class StoreRequest extends FormRequest
return [
'name' => 'required|string|unique:roles,name',
'name_fa' => 'required|string',
'description' =>'string',
'description' => 'string',
'permissions' => 'array',
'permissions.*' => 'integer|exists:permissions,id'
'permissions.*' => 'integer|exists:permissions,id',
];
}
}

View File

@@ -24,11 +24,11 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
return [
'name' => ['required', 'string', 'max:255',Rule::unique('roles','name')->ignore($this->role->id)],
'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
'name_fa' => 'required|string',
'description' =>'string',
'description' => 'string',
'permissions' => 'array',
'permissions.*' => 'integer|exists:permissions,id'
'permissions.*' => 'integer|exists:permissions,id',
];
}
}

View File

@@ -24,7 +24,7 @@ class GivePermissionRequest extends FormRequest
{
return [
'permissions' => 'array',
'permissions.*' => 'integer|exists:permissions,id'
'permissions.*' => 'integer|exists:permissions,id',
];
}
}

View File

@@ -24,7 +24,7 @@ class GiveRoleRequest extends FormRequest
{
return [
'roles' => 'array',
'roles.*' => 'integer|exists:permissions,id'
'roles.*' => 'integer|exists:permissions,id',
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Dashboard\UserManagement;
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
{

View File

@@ -28,8 +28,8 @@ class UpdateRequest extends FormRequest
'edarate_ostani_id' => 'exists:edarate_ostanis,id',
'city_id' => 'exists:cities,id',
'edarate_shahri_id' => 'exists:edarate_shahris,id',
'username' => ['required',Rule::unique('users','username')->ignore($this->user->id)],
'national_code' =>['required',Rule::unique('users','national_code')->ignore($this->user->id)],
'username' => ['required', Rule::unique('users', 'username')->ignore($this->user->id)],
'national_code' => ['required', Rule::unique('users', 'national_code')->ignore($this->user->id)],
'password' => 'required|min:8',
];
}

View File

@@ -2,8 +2,8 @@
namespace App\Http\Requests\V3\Harim\Divarkeshi;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
{
@@ -18,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
{
@@ -34,10 +34,10 @@ class StoreRequest extends FormRequest
'motaghazi_firstname' => 'required',
'motaghazi_lastname' => 'required',
/// conditional rule
// / conditional rule
'national_id' => 'numeric',
'shenase_melli' => 'numeric',
///
// /
'tel_number' => 'numeric',
'mobile_number' => 'numeric',

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\LogList;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
@@ -17,14 +18,14 @@ 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
{
return [
'description' =>'required|string',
'log_unique_code' =>'required|numeric|unique:log_lists,log_unique_code',
'action_type' =>'required|string',
'description' => 'required|string',
'log_unique_code' => 'required|numeric|unique:log_lists,log_unique_code',
'action_type' => 'required|string',
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\LogList;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
@@ -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
{

View File

@@ -33,13 +33,13 @@ class StartRequest extends FormRequest
{
return [
function (Validator $validator) {
if ($this->mission->code != $this->code){
if ($this->mission->code != $this->code) {
$validator->errors()->add(
'code',
'کد وارد شده صحیح نمی باشد'
);
}
}
},
];
}
}

View File

@@ -39,27 +39,28 @@ class ContinueMissionRequest extends FormRequest
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'explanation' => 'required|string',
'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){
if ($this->type == 1) {
$start = Carbon::parse($this->start_date);
$end = Carbon::parse($this->end_date);
if ($start->diffInMinutes($end) > 480){
if ($start->diffInMinutes($end) > 480) {
$validator->errors()->add(
'end_date',
'مدت زمان مأموریت ساعتی نباید بیشتر از ۸ ساعت باشد.'
);
}
}
}
},
];
}
}

View File

@@ -36,7 +36,7 @@ class NoProcessRequest extends FormRequest
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'category_id' => 'required|in:1,2,3',
'explanation' => 'required|string',
'explanation' => 'required|string',
];
}

View File

@@ -37,7 +37,7 @@ class StoreRequest extends FormRequest
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'explanation' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
@@ -47,18 +47,18 @@ class StoreRequest extends FormRequest
{
return [
function (Validator $validator) {
if ($this->type == 1){
if ($this->type == 1) {
$start = Carbon::parse($this->start_date);
$end = Carbon::parse($this->end_date);
if ($start->diffInMinutes($end) > 480){
if ($start->diffInMinutes($end) > 480) {
$validator->errors()->add(
'end_date',
'مدت زمان مأموریت ساعتی نباید بیشتر از ۸ ساعت باشد.'
'مدت زمان مأموریت ساعتی نباید بیشتر از ۸ ساعت باشد.'
);
}
}
}
},
];
}
}

View File

@@ -38,7 +38,7 @@ class UpdateRequest extends FormRequest
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'explanation' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
@@ -48,18 +48,18 @@ class UpdateRequest extends FormRequest
{
return [
function (Validator $validator) {
if ($this->type === 1){
if ($this->type === 1) {
$start = Carbon::parse($this->start_date);
$end = Carbon::parse($this->end_date);
if ($start->diffInMinutes($end) > 480){
if ($start->diffInMinutes($end) > 480) {
$validator->errors()->add(
'end_date',
'مدت زمان مأموریت ساعتی نباید بیشتر از ۸ ساعت باشد.'
);
}
}
}
},
];
}
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Mission\TransportaionUnit;
use App\Enums\MissionStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class AllocateRequest extends FormRequest
@@ -18,7 +19,7 @@ class AllocateRequest 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
{

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Mission\TransportaionUnit;
use App\Enums\MissionStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class DeallocateRequest extends FormRequest
@@ -18,7 +19,7 @@ class DeallocateRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\ObservedItem;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Otp;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class GetOtpTokenRequest extends FormRequest
@@ -17,7 +18,7 @@ class GetOtpTokenRequest 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
{
@@ -29,7 +30,7 @@ class GetOtpTokenRequest extends FormRequest
public function messages(): array
{
return [
'starts_with' => ':attribute باید با :values شروع شود.'
'starts_with' => ':attribute باید با :values شروع شود.',
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Permission;
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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Permission;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Profile;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ChangePasswordRequest extends FormRequest
@@ -17,7 +18,7 @@ class ChangePasswordRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Profile;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class EditRequest extends FormRequest
@@ -17,7 +18,7 @@ class EditRequest 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
{
@@ -27,7 +28,7 @@ class EditRequest extends FormRequest
'degree' => 'required',
'major' => 'required',
'mobile' => 'required|regex:/^09\d{9}$/|numeric|digits:11',
'avatar' => 'mimes:png,jpg,jpeg|max:2048'
'avatar' => 'mimes:png,jpg,jpeg|max:2048',
];
}
}

View File

@@ -55,13 +55,13 @@ class StoreRequest extends FormRequest
$mission = Mission::query()->find($this->mission_id);
$startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time);
$finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");
if (! $activityTime->between($startTime, $finishTime, true)) {
$validator->errors()->add('activity_time', 'زمان گزارش باید بین بازه مأموریت باشد.');
}
}
},
];
}
}

View File

@@ -59,13 +59,13 @@ class UpdateRequest extends FormRequest
$mission = Mission::query()->find($this->mission_id);
$startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time);
$finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");
if (! $activityTime->between($startTime, $finishTime, true)) {
$validator->errors()->add('activity_time', 'زمان گزارش باید بین بازه مأموریت باشد.');
}
}
},
];
}
}

View File

@@ -2,16 +2,13 @@
namespace App\Http\Requests\V3\RoadMaintenanceStation;
use App\Models\RahdariPoint;
use Hekmatinasser\Verta\Facades\Verta;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class StoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
* @return bool
*/
public function authorize(): bool
{
@@ -24,7 +21,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 +30,7 @@ class StoreRequest extends FormRequest
'city_id' => 'required|exists:cities,id',
'name' => 'required|string|max:255',
'status' => 'required|in:0,1',
'type' =>'required|in:1,2,3',
'type' => 'required|in:1,2,3',
'team_num' => 'numeric',
'staff_num' => 'numeric',
'phone' => 'string|max:50',

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadMaintenanceStation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ModifyRegisterationRequest extends FormRequest
@@ -17,7 +18,7 @@ class ModifyRegisterationRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferRequest extends FormRequest
@@ -17,7 +18,7 @@ class ReferRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class RegisterRequest extends FormRequest
@@ -17,7 +18,7 @@ class RegisterRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class RestoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class RestoreRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
@@ -9,22 +10,22 @@ class VerifyBySupervisorRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
* @return bool
*/
public function authorize(): bool
{
return Gate::allows('gate-supervise-road-observed',$this->roadObserved);
return Gate::allows('gate-supervise-road-observed', $this->roadObserved);
}
/**
* 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
{return [
'verify' => ['required', 'in:1,2'],
'description' => ['string'],
];
{
return [
'verify' => ['required', 'in:1,2'],
'description' => ['string'],
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\RoadPatrol;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class DeleteRequest extends FormRequest
@@ -17,12 +18,12 @@ class DeleteRequest 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
{
return [
'type' => 'required|in:1,2' // {1 = > partial , 2 => complete}
'type' => 'required|in:1,2', // {1 = > partial , 2 => complete}
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class FinishRequest extends FormRequest
@@ -17,7 +18,7 @@ class FinishRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class FirstStepStoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class FirstStepStoreRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class RejectRequest extends FormRequest
@@ -17,7 +18,7 @@ class RejectRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class SecondStepStoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class SecondStepStoreRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ThirdStepStoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class ThirdStepStoreRequest 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
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\SafetyAndPrivacy;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -17,7 +18,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
{