Merge branch 'feature/addUserController' into 'feature/Permission'

create controller and resorce and request for user and create controller and middelware for profile

See merge request witel-back-end/crm!3
This commit is contained in:
2025-04-29 11:03:50 +00:00
8 changed files with 341 additions and 4 deletions

View File

@@ -0,0 +1,133 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Facades\DataTable\DataTableFacade;
use App\Facades\File\FileFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\LoginRequest;
use App\Http\Requests\Admin\StoreRequest;
use App\Http\Requests\Admin\UpdateRequest;
use App\Http\Resource\Admin\UserResource;
use App\Http\Traits\ApiResponse;
use App\Models\Province;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
class UserManagementController extends Controller
{
use ApiResponse;
public function index(Request $request): JsonResponse
{
$columns = array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id');
$allowedFilters = $columns;
$allowedSortings = $columns;
$allowedRelations = array('roles');
$query = User::query()->where('username', "<>", "witel");
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: $allowedFilters,
allowedSortings: $allowedSortings,
allowedRelations: $allowedRelations);
return response()->json($data);
}
public function store(StoreRequest $request): JsonResponse
{
DB::transaction(function () use ($request) {
$province = Province::query()->find($request->province_id);
$avatar = $request->avatar
? FileFacade::save($request->file('avatar'), 'users/avatars/' . $request->username)
: null;
$user = User::query()->create([
'full_name' => $request->full_name,
'username' => $request->username,
'position' => $request->position,
'gender' => $request->gender,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'province_id' => $province->id,
'province_fa' => $province->name,
'password' => Hash::make($request->password),
'avatar' => $avatar,
'email' => $request->email,
'telephone_id' => $request->telephone_id,
]);
$user->syncRoles($request->roles);
});
return $this->successResponse();
}
public function show(User $user): JsonResponse
{
return $this->successResponse(new UserResource($user));
}
public function update(UpdateRequest $request, User $user): JsonResponse
{
DB::transaction(function () use ($request, $user) {
$province = Province::query()->find($request->province_id);
$avatar = $request->avatar ?
FileFacade::save($request->file('avatar'), 'users/avatars/' . $request->username)
: null;
$email = $request->email ?? null;
$user->update([
'full_name' => $request->full_name,
'username' => $request->username,
'position' => $request->position,
'gender' => $request->gender,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'province_id' => $province->id,
'province_fa' => $province->name,
'avatar' => $avatar,
'email' => $email,
'telephone_id' => $request->telephone_id
]);
$user->syncRoles($request->roles);
});
return $this->successResponse();
}
public function destroy(User $user): JsonResponse
{
DB::transaction(function () use ($user) {
if ($user->avatar) {
FileFacade::delete($user->avatar, true);
}
$user->syncRoles([]);
$user->delete();
});
return $this->successResponse();
}
}

View File

@@ -2,10 +2,11 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Requests\ChangePasswordRequest;
use App\Http\Resource\Admin\UserResource;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\User;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash;
class ProfileController extends Controller class ProfileController extends Controller
{ {
@@ -13,6 +14,20 @@ class ProfileController extends Controller
public function info(): JsonResponse public function info(): JsonResponse
{ {
return $this->successResponse(User::query()->find(auth()->id())); return $this->successResponse(new UserResource(auth()->user()));
} }
public function changePassword(ChangePasswordRequest $request): JsonResponse
{
$user = auth()->user();
if (! Hash::check($request->curent_pasword, $user->passwored)){
return $this->errorResponse(__('messages.wrong_current_password'));
}
$user->update([
'password' => Hash::make($request->new_password)
]);
return $this->successResponse();
}
} }

View File

@@ -0,0 +1,25 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class SuperAdminCheck
{
/**
* Handle an incoming request.
*
* @param \Closure(Request): (Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
$user = $request->user;
if ($user->username == "witel") {
throw new AuthorizationException();
}
return $next($request);
}
}

View File

@@ -0,0 +1,40 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest 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, ValidationRule|array|string>
*/
public function rules(): array
{
return [
'full_name' => 'required|max:255|string',
'username' => 'required|unique:users,username|string',
'position' => 'required',
'gender' => 'required|in:male,female',
'national_id' => 'required|digits:10|unique:users,national_id',
'phone_number' => 'required|numeric|digits:11|unique:users,phone_number|regex:/^09\d{9}$/',
'province_id' => 'required|exists:provinces,id',
'password' => 'required|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8',
'roles' => 'required|exists:roles,id',
'avatar' => 'mimes:png,jpg,pdf|max:2048',
'email' => 'email|unique:users,email',
'telephone_id' => 'required|string|unique:users,telephone_id'
];
}
}

View File

@@ -0,0 +1,45 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UpdateRequest 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, ValidationRule|array|string>
*/
public function rules(): array
{
return [
'full_name' => 'required|max:255|string',
'username' => ['required', 'string', Rule::unique('users', 'username')->ignore($this->user->id)],
'position' => 'required',
'gender' => 'required|in:male,female',
'national_id' => ['required', 'digits:10', Rule::unique('users', 'national_id')->ignore($this->user->id)],
'phone_number' => ['required',
'numeric',
'digits:11',
Rule::unique('users', 'phone_number')->ignore($this->user->id),
'regex:/^09\d{9}$/'
],
'province_id' => 'required|exists:provinces,id',
'roles' => 'required|exists:roles,id',
'avatar' => 'mimes:png,jpg,pdf|max:2048',
'email' => ['email', Rule::unique('users', 'email')->ignore($this->user->id)],
'telephone_id' => ['required', 'string', Rule::unique('users', 'telephone_id')->ignore($this->user->id)]
];
}
}

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class ChangePasswordRequest 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 [
'current_password' => 'required|min:8|max:255',
'new_password' => 'required|confirmed|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8|max:255',
];
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Http\Resource\Admin;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
class UserResource extends JsonResource
{
/**
* @param User $user
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{
return [
'id' => $this->id,
'full_name' => $this->full_name,
'username' => $this->username,
'gender' => $this->gender,
'email' => $this->email,
'phone_number' => $this->phone_number,
'avatar' => $this->avatar,
'national_id' => $this->national_id,
'position' => $this->position,
'province_id' => $this->province_id,
'province_name' => $this->province_name,
'role' => $this->getRoleNames()->first(),
'permissions' => $this->getAllPermissions()->pluck('name'),
'telephone_id' => $this->telephone_id
];
}
}

View File

@@ -1,7 +1,9 @@
<?php <?php
use App\Http\Controllers\Admin\UserManagementController;
use App\Http\Controllers\AuthController; use App\Http\Controllers\AuthController;
use App\Http\Controllers\ProfileController; use App\Http\Controllers\ProfileController;
use App\Http\Middleware\SuperAdminCheck;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
Route::prefix('auth') Route::prefix('auth')
@@ -17,5 +19,19 @@ Route::prefix('profile')
->controller(ProfileController::class) ->controller(ProfileController::class)
->group(function () { ->group(function () {
Route::get('/info', 'info')->middleware('auth:sanctum')->name('info'); Route::get('/info', 'info')->middleware('auth:sanctum')->name('info');
Route::post('/change_password', 'changePassword'); Route::post('/change_password', 'changePassword')->middleware('auth:sanctum')->name('changePassword');
}); });
Route::prefix('users')
->name('users.')
->middleware(['auth:sanctum', 'permission:manage_users'])
->controller(UserManagementController::class)
->group(function () {
Route::get('/', 'index')->name('index');
Route::get('/{user}', 'show')->middleware([SuperAdminCheck::class])->name('show');
Route::post('/', 'store')->name('store');
Route::post('/{user}', 'update')->middleware([SuperAdminCheck::class])->name('update');
Route::delete('/{user}', 'destroy')->middleware([SuperAdminCheck::class])->name('destroy');
});