From c66ba7feafc6e93b93eb23b1c15570eb5e2a91c3 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Sat, 27 Jan 2024 15:10:30 +0300 Subject: [PATCH] refactor code-style rector and php-insight --- app/Exceptions/Handler.php | 11 +++++ app/Http/Controllers/BlogPostController.php | 0 app/Http/Controllers/CalendarController.php | 0 app/Http/Controllers/ChatController.php | 0 app/Http/Controllers/ConsultantController.php | 0 .../ConsultantDiaryCommentController.php | 0 .../ConsultantRequestFormController.php | 0 app/Http/Controllers/Controller.php | 0 app/Http/Controllers/DiaryController.php | 0 app/Http/Controllers/DietController.php | 0 app/Http/Controllers/FeedController.php | 0 app/Http/Controllers/FinanceController.php | 0 .../Mobile/MobileProfileController.php | 46 +++++++++---------- .../Mobile/MobileRegisterController.php | 20 ++++---- app/Http/Controllers/PlanController.php | 0 .../ProductNutritionalValueController.php | 0 app/Http/Controllers/ProfileController.php | 0 app/Http/Controllers/RecipeController.php | 0 .../RegistrationStartController.php | 0 app/Http/Controllers/UserController.php | 0 .../Controllers/UserDetailzController.php | 0 app/Http/Kernel.php | 0 app/Http/Middleware/Authenticate.php | 0 app/Http/Middleware/EncryptCookies.php | 0 .../PreventRequestsDuringMaintenance.php | 0 .../Middleware/RedirectIfAuthenticated.php | 0 app/Http/Middleware/TrimStrings.php | 0 app/Http/Middleware/TrustHosts.php | 0 app/Http/Middleware/TrustProxies.php | 0 app/Http/Middleware/VerifyCsrfToken.php | 0 app/Http/Requests/Auth/RegisterRequest.php | 4 +- app/Services/Auth/RegisterService.php | 13 ++---- routes/api.php | 5 +- tests/Feature/Api/Auth/RegisterTest.php | 3 +- 34 files changed, 55 insertions(+), 47 deletions(-) mode change 100644 => 100755 app/Http/Controllers/BlogPostController.php mode change 100644 => 100755 app/Http/Controllers/CalendarController.php mode change 100644 => 100755 app/Http/Controllers/ChatController.php mode change 100644 => 100755 app/Http/Controllers/ConsultantController.php mode change 100644 => 100755 app/Http/Controllers/ConsultantDiaryCommentController.php mode change 100644 => 100755 app/Http/Controllers/ConsultantRequestFormController.php mode change 100644 => 100755 app/Http/Controllers/Controller.php mode change 100644 => 100755 app/Http/Controllers/DiaryController.php mode change 100644 => 100755 app/Http/Controllers/DietController.php mode change 100644 => 100755 app/Http/Controllers/FeedController.php mode change 100644 => 100755 app/Http/Controllers/FinanceController.php mode change 100644 => 100755 app/Http/Controllers/Mobile/MobileProfileController.php mode change 100644 => 100755 app/Http/Controllers/PlanController.php mode change 100644 => 100755 app/Http/Controllers/ProductNutritionalValueController.php mode change 100644 => 100755 app/Http/Controllers/ProfileController.php mode change 100644 => 100755 app/Http/Controllers/RecipeController.php mode change 100644 => 100755 app/Http/Controllers/RegistrationStartController.php mode change 100644 => 100755 app/Http/Controllers/UserController.php mode change 100644 => 100755 app/Http/Controllers/UserDetailzController.php mode change 100644 => 100755 app/Http/Kernel.php mode change 100644 => 100755 app/Http/Middleware/Authenticate.php mode change 100644 => 100755 app/Http/Middleware/EncryptCookies.php mode change 100644 => 100755 app/Http/Middleware/PreventRequestsDuringMaintenance.php mode change 100644 => 100755 app/Http/Middleware/RedirectIfAuthenticated.php mode change 100644 => 100755 app/Http/Middleware/TrimStrings.php mode change 100644 => 100755 app/Http/Middleware/TrustHosts.php mode change 100644 => 100755 app/Http/Middleware/TrustProxies.php mode change 100644 => 100755 app/Http/Middleware/VerifyCsrfToken.php diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index be954f9..bac5306 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,7 +2,10 @@ namespace App\Exceptions; +use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Sentry\Laravel\Integration; use Throwable; @@ -35,6 +38,14 @@ class Handler extends ExceptionHandler */ public function register() { + $this->renderable(static function (Exception $exception, Request $request) { + if ($exception instanceof \DomainException && $request->expectsJson()) { + return response()->json([ + 'message' => $exception->getMessage(), + ], Response::HTTP_UNPROCESSABLE_ENTITY); + } + }); + $this->reportable(function (Throwable $e) { Integration::captureUnhandledException($e); }); diff --git a/app/Http/Controllers/BlogPostController.php b/app/Http/Controllers/BlogPostController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ChatController.php b/app/Http/Controllers/ChatController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ConsultantController.php b/app/Http/Controllers/ConsultantController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ConsultantDiaryCommentController.php b/app/Http/Controllers/ConsultantDiaryCommentController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ConsultantRequestFormController.php b/app/Http/Controllers/ConsultantRequestFormController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/DiaryController.php b/app/Http/Controllers/DiaryController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/DietController.php b/app/Http/Controllers/DietController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/FeedController.php b/app/Http/Controllers/FeedController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/FinanceController.php b/app/Http/Controllers/FinanceController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/Mobile/MobileProfileController.php b/app/Http/Controllers/Mobile/MobileProfileController.php old mode 100644 new mode 100755 index 0d4d7cb..307905a --- a/app/Http/Controllers/Mobile/MobileProfileController.php +++ b/app/Http/Controllers/Mobile/MobileProfileController.php @@ -2,40 +2,40 @@ namespace App\Http\Controllers\Mobile; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Validator; -use App\Models\User; +use App\Models\CircumferenceMeasure; use App\Models\Plan; use App\Models\WeightMeasure; -use App\Models\CircumferenceMeasure; -use Auth; -class MobileProfileController { +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Validator; +use Illuminate\Http\JsonResponse; - public function index(Request $request) +class MobileProfileController +{ + public function index(Request $request): JsonResponse { $user = $request->user(); $userDetails = $user->detailz; $chartPoints = $user - ->weight_measures() - ->orderBy('created_at', 'desc') - ->limit(4) - ->get() - ->sortBy('id'); + ->weight_measures() + ->orderBy('created_at', 'desc') + ->limit(4) + ->get() + ->sortBy('id'); $plans = Plan::all(); - $circumferences = $user->circumference_measures() - ->orderBy('created_at', 'desc') - ->limit(4) - ->get() - ->sortBy('id'); + $circumferences = $user->circumference_measures() + ->orderBy('created_at', 'desc') + ->limit(4) + ->get() + ->sortBy('id'); return response()->json(['user' => $user, 'chartPoints' => $chartPoints, 'userDetails' => $userDetails, 'circumferences' => $circumferences, 'plans' => $plans], 200); } - public function addWeight(Request $request) - { + public function addWeight(Request $request): JsonResponse + { $validator = Validator::make($request->all(), [ 'weight' => 'required|int', ]); @@ -43,18 +43,18 @@ class MobileProfileController { if ($validator->fails()) { return response()->json(['errors' => $validator->errors()], 422); } - + $user = $request->user(); $newMeasure = WeightMeasure::create([ 'user_id' => $user->id, 'weight' => $request->weight, ]); - + $newMeasure->save(); return response()->json(200); } - public function addCircumference(Request $request) + public function addCircumference(Request $request): JsonResponse { $validator = Validator::make($request->all(), [ 'chest_circumference' => 'required|int', @@ -74,7 +74,7 @@ class MobileProfileController { 'waist_circumference' => $request->waist_circumference, 'hip_circumference' => $request->hip_circumference, ]); - + $newMeasure->save(); return response()->json(200); } diff --git a/app/Http/Controllers/Mobile/MobileRegisterController.php b/app/Http/Controllers/Mobile/MobileRegisterController.php index a950809..aa24fc5 100755 --- a/app/Http/Controllers/Mobile/MobileRegisterController.php +++ b/app/Http/Controllers/Mobile/MobileRegisterController.php @@ -8,7 +8,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Response; use Illuminate\Support\Facades\Auth; use Laravel\Fortify\Http\Requests\LoginRequest; -use Laravel\Sanctum\NewAccessToken; class MobileRegisterController { @@ -23,9 +22,11 @@ class MobileRegisterController { $this->service->registerCommand($request); - if (!$token = $this->attemptLoginAndCreateToken($request)) { - return response()->json(['error' => 'Упс! Произошла ошибка при регистрации. Проверьте введенные данные'], - Response::HTTP_UNPROCESSABLE_ENTITY); + if (! $token = $this->attemptLoginAndCreateToken($request)) { + return response()->json( + ['error' => 'Упс! Произошла ошибка при регистрации. Проверьте введенные данные'], + Response::HTTP_UNPROCESSABLE_ENTITY + ); } return response()->json(['token' => $token], Response::HTTP_OK); @@ -35,9 +36,11 @@ class MobileRegisterController public function login(LoginRequest $request): JsonResponse { - if (!$token = $this->attemptLoginAndCreateToken($request)) { - return response()->json(['error' => 'Упс! Произошла ошибка при аутентификации. Проверьте введенные данные'], - Response::HTTP_UNAUTHORIZED); + if (! $token = $this->attemptLoginAndCreateToken($request)) { + return response()->json( + ['error' => 'Упс! Произошла ошибка при аутентификации. Проверьте введенные данные'], + Response::HTTP_UNAUTHORIZED + ); } return response()->json(['token' => $token], Response::HTTP_OK); @@ -45,7 +48,7 @@ class MobileRegisterController private function attemptLoginAndCreateToken(RegisterRequest|LoginRequest $request): ?string { - if (Auth::attempt($request->only('email', 'password'))) { + if (Auth::attempt($request->only(['email', 'password']))) { return $request->user()->createToken('mobile')->plainTextToken; } @@ -59,5 +62,4 @@ class MobileRegisterController // 'message' => 'Logged out' // ]; // } - } diff --git a/app/Http/Controllers/PlanController.php b/app/Http/Controllers/PlanController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ProductNutritionalValueController.php b/app/Http/Controllers/ProductNutritionalValueController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/RecipeController.php b/app/Http/Controllers/RecipeController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/RegistrationStartController.php b/app/Http/Controllers/RegistrationStartController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/UserDetailzController.php b/app/Http/Controllers/UserDetailzController.php old mode 100644 new mode 100755 diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php old mode 100644 new mode 100755 diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php old mode 100644 new mode 100755 diff --git a/app/Http/Requests/Auth/RegisterRequest.php b/app/Http/Requests/Auth/RegisterRequest.php index c1972e8..3c160ca 100755 --- a/app/Http/Requests/Auth/RegisterRequest.php +++ b/app/Http/Requests/Auth/RegisterRequest.php @@ -2,9 +2,9 @@ namespace App\Http\Requests\Auth; +use App\Rules\MinWords; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; -use App\Rules\MinWords; class RegisterRequest extends FormRequest { @@ -39,7 +39,7 @@ class RegisterRequest extends FormRequest ]; $defaults_values = [ - 0, 0, 0, 0, 0, false, false, '', '', '', '', '', '', true, true + 0, 0, 0, 0, 0, false, false, '', '', '', '', '', '', true, true, ]; foreach ($fields as $index => $field) { diff --git a/app/Services/Auth/RegisterService.php b/app/Services/Auth/RegisterService.php index 392ddbe..e774580 100644 --- a/app/Services/Auth/RegisterService.php +++ b/app/Services/Auth/RegisterService.php @@ -2,11 +2,11 @@ namespace App\Services\Auth; +use App\Http\Requests\Auth\RegisterRequest; use App\Models\CircumferenceMeasure; use App\Models\User; use App\Models\UserDetailz; use Illuminate\Support\Facades\Hash; -use App\Http\Requests\Auth\RegisterRequest; /** * Class RegisterService. @@ -21,20 +21,16 @@ class RegisterService 'password' => Hash::make($request->password), ]); - $token = $newUser->createToken('mobile'); - UserDetailz::create($this->buildUserDetailz($request, $newUser)); CircumferenceMeasure::create([ 'user_id' => $newUser->id, 'chest_circumference' => $request->chest_circumference, 'waist_circumference' => $request->waist_circumference, - 'hip_circumference' => $request->hip_circumference + 'hip_circumference' => $request->hip_circumference, ]); } - public function login(){} - private function buildUserDetailz(RegisterRequest $request, User $newUser): array { $userDetailzData = []; @@ -43,11 +39,10 @@ class RegisterService 'first_name', 'last_name', 'birthdate', 'gender', 'country', 'city', 'lang', 'weight', 'height', 'chest_circumference', 'waist_circumference', 'hip_circumference', 'blood_pressure_up', 'blood_pressure_down', 'has_hypo', 'has_hyper', 'about_alergy', 'about_taking_pils', 'about_sport_hobbies', 'favorite_foods', - 'unfavorite_foods', 'additional_info', 'is_mood_fillable', 'is_bedtime_fillable' + 'unfavorite_foods', 'additional_info', 'is_mood_fillable', 'is_bedtime_fillable', ]; - foreach($fields as $index => $field) - { + foreach ($fields as $field) { $userDetailzData[$field] = $request->{$field}; } diff --git a/routes/api.php b/routes/api.php index f5bc73c..5a5b2b1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -2,7 +2,6 @@ use App\Http\Controllers\Mobile\MobileProfileController; use App\Http\Controllers\Mobile\MobileRegisterController; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; /* @@ -19,13 +18,13 @@ use Illuminate\Support\Facades\Route; Route::group([ [ // 'namespace' => 'App\Http\Controllers\Mobile', - ] + ], ], static function (): void { Route::post('/register', [MobileRegisterController::class, 'register'])->name('register'); Route::post('/login', [MobileRegisterController::class, 'login'])->name('login'); Route::group([ 'middleware' => ['auth:sanctum'], - 'prefix' => 'profile' + 'prefix' => 'profile', ], static function () { Route::get('/index', [MobileProfileController::class, 'index']); Route::post('/addWeight', [MobileProfileController::class, 'addWeight']); diff --git a/tests/Feature/Api/Auth/RegisterTest.php b/tests/Feature/Api/Auth/RegisterTest.php index c82d5af..acfe650 100644 --- a/tests/Feature/Api/Auth/RegisterTest.php +++ b/tests/Feature/Api/Auth/RegisterTest.php @@ -54,6 +54,7 @@ class RegisterTest extends TestCase public function test_register_failed_this_email_already_taken() { $user = User::factory()->create(['is_consultant' => true]); + $response = $this->postJson('/api/register', [ 'email' => $user->email, 'password' => $this->user->password, @@ -80,7 +81,7 @@ class RegisterTest extends TestCase public function test_register_failed_empty_data() { - $user = User::factory()->create(['is_consultant' => true]); + User::factory()->create(['is_consultant' => true]); $response = $this->postJson('/api/register', [ 'email' => '', 'password' => '',