From ea29760b956fbb70625a6deae04f34db2388b25b Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 24 Apr 2025 14:52:52 +0200 Subject: [PATCH] fix: allow null value for gitlab_id and fix update request for users --- app/Http/Requests/Bo/Users/StoreUserRequest.php | 12 ++++++++++++ app/Http/Requests/Bo/Users/UpdateUserRequest.php | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/Bo/Users/StoreUserRequest.php b/app/Http/Requests/Bo/Users/StoreUserRequest.php index 0faab0e..0482610 100644 --- a/app/Http/Requests/Bo/Users/StoreUserRequest.php +++ b/app/Http/Requests/Bo/Users/StoreUserRequest.php @@ -19,6 +19,18 @@ class StoreUserRequest extends FormRequest return Gate::allows('isAdmin'); } + /** + * Prepare the data for validation. + * + * @return void + */ + protected function prepareForValidation(): void + { + $this->merge([ + 'gitlab_id' => \boolval($this->input('gitlab_id')) ? $this->input('gitlab_id') : null + ]); + } + /** * Get the validation rules that apply to the request. * diff --git a/app/Http/Requests/Bo/Users/UpdateUserRequest.php b/app/Http/Requests/Bo/Users/UpdateUserRequest.php index 0940353..9c1986a 100644 --- a/app/Http/Requests/Bo/Users/UpdateUserRequest.php +++ b/app/Http/Requests/Bo/Users/UpdateUserRequest.php @@ -12,7 +12,8 @@ class UpdateUserRequest extends StoreUserRequest public function rules() { return array_merge(parent::rules(), [ - 'email' => 'email|required|unique:users,email,' . $this->route('user')->id . ',id', + 'email' => 'email|required|unique:users,email,' . $this->route('user')->id . ',id', + 'gitlab_id' => 'nullable|integer|unique:users,gitlab_id,' . $this->route('user')->id . ',id' ]); } }