KKlochko/dots-bot-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the User validator.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
KKlochko
2023-08-14 20:45:57 +03:00
parent 41acdd861b
commit 6db3465407
4 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/API/v2/CartController.php
+3 -3
View File
@@ -115,7 +115,7 @@ class CartController extends Controller
$cityName = $request->input('cityName') ?? '';
// check for not valid user
$validation = User::validate_with_matrix_username($matrixUsername);
$validation = User::validateWithMatrixUsername($matrixUsername);
if(array_key_exists('error', $validation))
return response()->json($validation);
@@ -160,7 +160,7 @@ class CartController extends Controller
$companyName = $request->input('companyName') ?? '';
// check for not valid user
$validation = User::validate_with_matrix_username($matrixUsername);
$validation = User::validateWithMatrixUsername($matrixUsername);
if(array_key_exists('error', $validation))
return response()->json($validation);
@@ -203,7 +203,7 @@ class CartController extends Controller
$itemCount = $request->input('itemCount') ?? '';
// check for not valid user
$validation = User::validate_with_matrix_username($matrixUsername);
$validation = User::validateWithMatrixUsername($matrixUsername);
if(array_key_exists('error', $validation))
return response()->json($validation);
app/Models/User.php
+4 -4
View File
@@ -23,16 +23,16 @@ class User extends Authenticatable
'phone',
];
public static function validate_with_matrix_username(string $matrix_username)
public static function validateWithMatrixUsername(string $matrixUsername)
{
$matrix_username = $matrix_username ?? '';
$matrixUsername = $matrixUsername ?? '';
if($matrix_username == '')
if($matrixUsername == '')
return [
'error' => 'The username is empty, please, write username!!!'
];
$user = User::where('matrix_username', $matrix_username)->first();
$user = User::where('matrix_username', $matrixUsername)->first();
if(!$user)
return [