Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions app/Infrastructure/EloquentModels/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
use Laravel\Sanctum\HasApiTokens;

class User extends Authenticatable
Expand Down Expand Up @@ -46,6 +47,36 @@ protected function casts(): array
];
}

public function getName(): string
{
return $this->name;
}

public function getEmail(): string
{
return $this->email;
}

public function getPassword(): string
{
return $this->password;
}

public function getRole(): string
{
return $this->role;
}

public function getCreatedAt(): string
{
return Carbon::parse($this->created_at)->format('d.m.Y');
}

public function getUpdatedAt(): string
{
return Carbon::parse($this->updated_at)->format('d.m.Y');
}

protected static function newFactory()
{
return \Database\Factories\UserFactory::new();
Expand Down
187 changes: 187 additions & 0 deletions app/Interfaces/Http/Controllers/Api/v2/UserController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
<?php

namespace App\Interfaces\Http\Controllers\Api\v2;

use App\Interfaces\Http\Requests\Api\v2\UserController\UpdateEmailRequest;
use App\Interfaces\Http\Requests\Api\v2\UserController\UpdateNameRequest;
use App\Interfaces\Http\Requests\Api\v2\UserController\UpdatePasswordRequest;
use App\Interfaces\Response\WebResponse;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Throwable;

class UserController
{
public function showProfile(Request $request): JsonResponse
{
try {
$user = $request->user();
$response = new WebResponse(
true,
[
"name" => $user->getName(),
"role" => $user->getRole(),
"email" => $user->getEmail(),
"created_at" => $user->getCreatedAt(),
"updated_at" => $user->getUpdatedAt(),
],
'Сведения пользователя',
[],
200
);
} catch (Throwable $th) {
$response = new WebResponse(
false,
null,
$th->getMessage(),
is_null($th->getPrevious()) ? [] : ['error' => $th->getPrevious()->getMessage()],
$th->getCode()
);
Log::error(__METHOD__ . var_export($response, true));
} finally {
return response()->json(
$response->toArray(),
$response->statusCode,
[
'Content-Type' => 'application/json; charset=utf-8',
'JSON_UNESCAPED_UNICODE' => true
],
JSON_UNESCAPED_UNICODE
);
}
}

public function updateName(UpdateNameRequest $request): JsonResponse
{
try {
$user = $request->user();
if ($user->getPassword() === $request->get('newName')) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

password?

throw new Exception('Новое имя совпадает со старым');
}
$user->update([
'name' => $request->get('newName'),
]);
$response = new WebResponse(
true,
[
"name" => $user->getName(),
"role" => $user->getRole(),
"email" => $user->getEmail(),
"created_at" => $user->getCreatedAt(),
"updated_at" => $user->getUpdatedAt(),
],
'Имя пользователя изменено',
[],
200
);
} catch (Throwable $th) {
$response = new WebResponse(
false,
null,
$th->getMessage(),
is_null($th->getPrevious()) ? [] : ['error' => $th->getPrevious()->getMessage()],
$th->getCode()
);
Log::error(__METHOD__ . var_export($response, true));
} finally {
return response()->json(
$response->toArray(),
$response->statusCode,
[
'Content-Type' => 'application/json; charset=utf-8',
'JSON_UNESCAPED_UNICODE' => true
],
JSON_UNESCAPED_UNICODE
);
}
}

public function updateEmail(UpdateEmailRequest $request): JsonResponse
{
try {
$user = $request->user();
if ($user->getEmail() === $request->get('newEmail')) {
throw new Exception('Новый email совпадает со старым');
}
$user->update([
'email' => $request->get('newEmail'),
]);
$response = new WebResponse(
true,
[
"name" => $user->getName(),
"role" => $user->getRole(),
"email" => $user->getEmail(),
"created_at" => $user->getCreatedAt(),
"updated_at" => $user->getUpdatedAt(),
],
'Email пользователя изменен',
[],
200
);
} catch (Throwable $th) {
$response = new WebResponse(
false,
null,
$th->getMessage(),
is_null($th->getPrevious()) ? [] : ['error' => $th->getPrevious()->getMessage()],
$th->getCode()
);
Log::error(__METHOD__ . var_export($response, true));
} finally {
return response()->json(
$response->toArray(),
$response->statusCode,
[
'Content-Type' => 'application/json; charset=utf-8',
'JSON_UNESCAPED_UNICODE' => true
],
JSON_UNESCAPED_UNICODE
);
}
}

public function updatePassword(UpdatePasswordRequest $request): JsonResponse
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

На каждое поле по экшну - получаетя не очень эффективно, не проще ли универсальный upate эклшн для всех полей сделать?

{
try {
$user = $request->user();
if ($user->getPassword() === $request->get('newPassword')) {
throw new Exception('Новый пароль совпадает со старым');
}
$user->update([
'password' => Hash::make($request->get('newPassword')),
]);
$response = new WebResponse(
true,
[
'password' => $user->getPassword(),
],
'Пароль пользователя изменен',
[],
200
);
} catch (Throwable $th) {
$response = new WebResponse(
false,
null,
$th->getMessage(),
is_null($th->getPrevious()) ? [] : ['error' => $th->getPrevious()->getMessage()],
$th->getCode()
);
Log::error(__METHOD__ . var_export($response, true));
} finally {
return response()->json(
$response->toArray(),
$response->statusCode,
[
'Content-Type' => 'application/json; charset=utf-8',
'JSON_UNESCAPED_UNICODE' => true
],
JSON_UNESCAPED_UNICODE
);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace App\Interfaces\Http\Requests\Api\v2\UserController;

use Illuminate\Foundation\Http\FormRequest;

class UpdateEmailRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'newEmail' => 'required|string|email|max:255',
];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace App\Interfaces\Http\Requests\Api\v2\UserController;

use Illuminate\Foundation\Http\FormRequest;

class UpdateNameRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'newName' => 'required|string',
];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace App\Interfaces\Http\Requests\Api\v2\UserController;

use Illuminate\Foundation\Http\FormRequest;

class UpdatePasswordRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'newPassword' => 'required|string',
];
}
}
1 change: 1 addition & 0 deletions database/factories/UserFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public function definition(): array
return [
'name' => fake()->name(),
'email' => fake()->unique()->safeEmail(),
'role' => 'user',
'email_verified_at' => now(),
'password' => static::$password ??= Hash::make('password'),
'remember_token' => Str::random(10),
Expand Down
15 changes: 11 additions & 4 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,31 @@
use App\Interfaces\Http\Controllers\Api\v1\AuthController as AuthController_v1;
use App\Interfaces\Http\Controllers\Api\v2\AreaController as AreaController_v2;
use App\Interfaces\Http\Controllers\Api\v2\AuthController as AuthController_v2;
use App\Interfaces\Http\Controllers\Api\v2\UserController;
use Illuminate\Support\Facades\Route;

Route::prefix('/v1')->name('v1.')->group(function () {
Route::prefix('/v1')->name('api.v1.')->group(function () {
Route::post('/register', [AuthController_v1::class, 'register'])->name('register');
Route::post('/login', [AuthController_v1::class, 'login'])->name('login');

Route::middleware('auth:api-v1')->name('api.')->group(function () {
Route::middleware('auth:api-v1')->group(function () {
Route::apiResource('area', AreaController_v1::class);
});
});


Route::prefix('/v2')->name('v2.')->group(function () {
Route::prefix('/v2')->name('api.v2.')->group(function () {
Route::post('/oauth/token', [\Laravel\Passport\Http\Controllers\AccessTokenController::class, 'issueToken'])->name('oauth.token');
Route::post('/register', [AuthController_v2::class, 'register'])->name('register');
Route::post('/login', [AuthController_v2::class, 'login'])->name('login');

Route::middleware('auth:api-v2')->name('api.')->group(function () {
Route::middleware('auth:api-v2')->group(function () {
Route::prefix('/user')->group(function() {
Route::get('', [UserController::class, 'showProfile'])->name('user.showProfile');
Route::post('/update_name', [UserController::class, 'updateName'])->name('user.updateName');
Route::post('/update_email', [UserController::class, 'updateEmail'])->name('user.updateEmail');
Route::post('/update_password', [UserController::class, 'updatePassword'])->name('user.updatePassword');
});
Route::apiResource('area', AreaController_v2::class);
});
});
Loading