diff --git a/app/Http/Controllers/V3/Dashboard/UserManagementController.php b/app/Http/Controllers/V3/Dashboard/UserManagementController.php index a3514002..cb5abc76 100644 --- a/app/Http/Controllers/V3/Dashboard/UserManagementController.php +++ b/app/Http/Controllers/V3/Dashboard/UserManagementController.php @@ -7,9 +7,10 @@ use App\Http\Controllers\Controller; use App\Http\Requests\V3\Dashboard\UserManagement\ChangeConfirmEnabelRequest; use App\Http\Requests\V3\Dashboard\UserManagement\ChangeConfirmStatusRequest; use App\Http\Requests\V3\Dashboard\UserManagement\ChangePasswordRequest; +use App\Http\Requests\V3\Dashboard\UserManagement\FullStoreRequest; use App\Http\Requests\V3\Dashboard\UserManagement\GivePermissionRequest; use App\Http\Requests\V3\Dashboard\UserManagement\GiveRoleRequest; -use App\Http\Requests\V3\Dashboard\UserManagement\StoreRequest; +use App\Http\Requests\V3\Dashboard\UserManagement\LimitStoreRequest; use App\Http\Requests\V3\Dashboard\UserManagement\UpdateRequest; use App\Http\Traits\ApiResponse; use App\Models\City; @@ -39,7 +40,7 @@ class UserManagementController extends Controller return response()->json($data); } - public function limitStore(StoreRequest $request): jsonResponse + public function limitStore(LimitStoreRequest $request): jsonResponse { auth()->user()->addActivityComplete(1039); @@ -67,7 +68,7 @@ class UserManagementController extends Controller /** * @throws Throwable */ - public function fullStore(StoreRequest $request): jsonResponse + public function fullStore(FullStoreRequest $request): jsonResponse { DB::transaction(function () use ($request) { auth()->user()->addActivityComplete(1039); diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/StoreExrtraRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php similarity index 62% rename from app/Http/Requests/V3/Dashboard/UserManagement/StoreExrtraRequest.php rename to app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php index f7b6b85b..03b6a2e1 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/StoreExrtraRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php @@ -6,7 +6,7 @@ use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; -class StoreExrtraRequest extends FormRequest +class FullStoreRequest extends FormRequest { /** * Determine if the user is authorized to make this request. @@ -24,20 +24,8 @@ class StoreExrtraRequest extends FormRequest public function rules(): array { return [ - 'edarate_ostani_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_ostani', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_shahri_id'))), - ], - 'edarate_shahri_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_shahri', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_ostani_id'))), - ], + 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id,!=,null', + 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id,!=,null', 'province_id' => 'required|exists:provinces,id', 'city_id' => 'exists:cities,id', 'username' => 'required|unique:users,username', diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/StoreRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php similarity index 52% rename from app/Http/Requests/V3/Dashboard/UserManagement/StoreRequest.php rename to app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php index 4c3583d0..2a1fde8f 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/StoreRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php @@ -4,9 +4,8 @@ namespace App\Http\Requests\V3\Dashboard\UserManagement; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; -class StoreRequest extends FormRequest +class LimitStoreRequest extends FormRequest { /** * Determine if the user is authorized to make this request. @@ -24,20 +23,8 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'edarate_ostani_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_ostani', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_shahri_id'))), - ], - 'edarate_shahri_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_shahri', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_ostani_id'))), - ], + 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id', + 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id', 'province_id' => 'required|exists:provinces,id', 'city_id' => 'exists:cities,id', 'username' => 'required|unique:users,username', diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php index 8dbbc53b..a19cf756 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php @@ -25,20 +25,8 @@ class UpdateRequest extends FormRequest { return [ 'province_id' => 'required|exists:provinces,id', - 'edarate_ostani_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_ostani', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_shahri_id'))), - ], - 'edarate_shahri_id' => [ - 'nullable', - 'integer', - Rule::exists('edarate_shahri', 'id'), - Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), - Rule::requiredIf(fn () => blank($this->input('edarate_ostani_id'))), - ], + 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id,!=,null', + 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id,!=,null', 'city_id' => 'exists:cities,id', 'username' => [Rule::unique('users', 'username')->ignore($this->user->id)], 'national_code' => ['required', Rule::unique('users', 'national_code')->ignore($this->user->id)],