From bb15119bf0d69571df354a29fa0b5768846350cd Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Wed, 17 Jul 2019 11:00:30 -0400 Subject: [PATCH] Append rules for Create/Update --- app/Http/Requests/CreateUserRequest.php | 3 +++ app/Http/Requests/UpdateUserRequest.php | 5 +---- app/Models/User.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/CreateUserRequest.php b/app/Http/Requests/CreateUserRequest.php index a1ad752c..65d01813 100644 --- a/app/Http/Requests/CreateUserRequest.php +++ b/app/Http/Requests/CreateUserRequest.php @@ -25,7 +25,10 @@ class CreateUserRequest extends FormRequest public function rules(): array { $rules = User::$rules; + $rules['email'] .= '|unique:users,email'; + $rules['pilot_id'] .= '|unique:users,pilot_id'; + return $rules; } } diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php index 2285657e..8be4df02 100644 --- a/app/Http/Requests/UpdateUserRequest.php +++ b/app/Http/Requests/UpdateUserRequest.php @@ -29,11 +29,8 @@ class UpdateUserRequest extends FormRequest $user_id = request('id', null); - // Validate if the pilot ID is already being used or not - $rules['pilot_id'] = 'required|integer|unique:users,pilot_id,'.$user_id.',id'; - - // Add additional rules for when we're modifying $rules['email'] .= '|unique:users,email,'.$user_id.',id'; + $rules['pilot_id'] .= '|unique:users,pilot_id,'.$user_id.',id'; return $rules; } diff --git a/app/Models/User.php b/app/Models/User.php index eddb3839..2dd899d9 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -96,9 +96,9 @@ class User extends Authenticatable ]; public static $rules = [ - 'pilot_id' => 'required|integer|unique:users,pilot_id', 'name' => 'required', 'email' => 'required|email', + 'pilot_id' => 'required|integer', ]; /**