STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

combine UserRequest to BaseRequest

Browse Source
This commit is contained in:
James Collins
2023-03-13 12:19:39 +10:00
parent dc56edf486
commit af4b9b95e7
3 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/UserController.php
View File

@@ -3,9 +3,7 @@
namespace App\Http\Controllers\Api;
use App\Enum\HttpResponseCodes;
use App\Filters\UserFilter;
use App\Http\Requests\UserUpdateRequest;
use App\Http\Requests\UserStoreRequest;
use App\Http\Requests\UserRequest;
use App\Http\Requests\UserForgotPasswordRequest;
use App\Http\Requests\UserForgotUsernameRequest;
use App\Http\Requests\UserRegisterRequest;
@@ -65,10 +63,10 @@ class UserController extends ApiController
/**
* Store a newly created user in the database.
*
* @param \App\Http\Requests\UserStoreRequest $request The endpoint request.
* @param \App\Http\Requests\UserRequest $request The endpoint request.
* @return \Illuminate\Http\Response
*/
public function store(UserStoreRequest $request)
public function store(UserRequest $request)
{
if (UserConductor::creatable() === true) {
$user = User::create($request->all());
@@ -97,11 +95,11 @@ class UserController extends ApiController
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\UserUpdateRequest $request The user update request.
* @param \App\Http\Requests\UserRequest $request The user update request.
* @param \App\Models\User $user The specified user.
* @return \Illuminate\Http\Response
*/
public function update(UserUpdateRequest $request, User $user)
public function update(UserRequest $request, User $user)
{
if (UserConductor::updatable($user) === true) {
$input = [];

24
app/Http/Requests/UserUpdateRequest.php → app/Http/Requests/UserRequest.php
View File

@@ -2,17 +2,33 @@
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UserUpdateRequest extends FormRequest
class UserRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
* Apply the additional POST base rules to this request
*
* @return array<string, mixed>
*/
public function rules()
public function postRules()
{
return [
'username' => 'required|string|max:255|min:4|unique:users',
'first_name' => 'required|string|max:255|min:2',
'last_name' => 'required|string|max:255|min:2',
'email' => 'required|string|email|max:255',
'phone' => ['string', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
'email_verified_at' => 'date'
];
}
/**
* Get the validation rules that apply to PUT request.
*
* @return array<string, mixed>
*/
public function putRules()
{
$user = $this->route('user');

25
app/Http/Requests/UserStoreRequest.php
View File

@@ -1,25 +0,0 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class UserStoreRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules()
{
return [
'username' => 'required|string|max:255|min:4|unique:users',
'first_name' => 'required|string|max:255|min:2',
'last_name' => 'required|string|max:255|min:2',
'email' => 'required|string|email|max:255',
'phone' => ['string', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
'email_verified_at' => 'date'
];
}
}