From af4b9b95e7788a9035d1d0d342251699aeb72a94 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Mon, 13 Mar 2023 12:19:39 +1000
Subject: [PATCH] combine UserRequest to BaseRequest

---
 app/Http/Controllers/Api/UserController.php   | 12 ++++-----
 ...{UserUpdateRequest.php => UserRequest.php} | 24 +++++++++++++++---
 app/Http/Requests/UserStoreRequest.php        | 25 -------------------
 3 files changed, 25 insertions(+), 36 deletions(-)
 rename app/Http/Requests/{UserUpdateRequest.php => UserRequest.php} (56%)
 delete mode 100644 app/Http/Requests/UserStoreRequest.php

diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
index fb4306f..85a05d7 100644
--- a/app/Http/Controllers/Api/UserController.php
+++ b/app/Http/Controllers/Api/UserController.php
@@ -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 = [];
diff --git a/app/Http/Requests/UserUpdateRequest.php b/app/Http/Requests/UserRequest.php
similarity index 56%
rename from app/Http/Requests/UserUpdateRequest.php
rename to app/Http/Requests/UserRequest.php
index bc5837c..2cfd74a 100644
--- a/app/Http/Requests/UserUpdateRequest.php
+++ b/app/Http/Requests/UserRequest.php
@@ -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');
 
diff --git a/app/Http/Requests/UserStoreRequest.php b/app/Http/Requests/UserStoreRequest.php
deleted file mode 100644
index 43bf17f..0000000
--- a/app/Http/Requests/UserStoreRequest.php
+++ /dev/null
@@ -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'
-        ];
-    }
-}