|
@@ -2,11 +2,12 @@
|
|
|
|
|
|
|
|
namespace App\Http\Controllers;
|
|
namespace App\Http\Controllers;
|
|
|
|
|
|
|
|
-use App\Http\Resources\UserTypeResource;
|
|
|
|
|
use App\Services\UserService;
|
|
use App\Services\UserService;
|
|
|
use App\Http\Requests\UserRequest;
|
|
use App\Http\Requests\UserRequest;
|
|
|
use App\Http\Resources\UserResource;
|
|
use App\Http\Resources\UserResource;
|
|
|
|
|
+use App\Http\Resources\UserTypeResource;
|
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\JsonResponse;
|
|
|
|
|
+use Illuminate\Support\Facades\Auth;
|
|
|
|
|
|
|
|
class UserController extends Controller
|
|
class UserController extends Controller
|
|
|
{
|
|
{
|
|
@@ -21,6 +22,7 @@ public function authUser(): JsonResponse
|
|
|
public function index(): JsonResponse
|
|
public function index(): JsonResponse
|
|
|
{
|
|
{
|
|
|
$items = $this->service->getAll();
|
|
$items = $this->service->getAll();
|
|
|
|
|
+
|
|
|
return $this->successResponse(
|
|
return $this->successResponse(
|
|
|
payload: UserResource::collection($items),
|
|
payload: UserResource::collection($items),
|
|
|
);
|
|
);
|
|
@@ -29,10 +31,11 @@ public function index(): JsonResponse
|
|
|
public function store(UserRequest $request): JsonResponse
|
|
public function store(UserRequest $request): JsonResponse
|
|
|
{
|
|
{
|
|
|
$item = $this->service->create($request->validated());
|
|
$item = $this->service->create($request->validated());
|
|
|
|
|
+
|
|
|
return $this->successResponse(
|
|
return $this->successResponse(
|
|
|
payload: new UserResource($item),
|
|
payload: new UserResource($item),
|
|
|
message: __("messages.created"),
|
|
message: __("messages.created"),
|
|
|
- code: 201,
|
|
|
|
|
|
|
+ code: 201,
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -54,17 +57,32 @@ public function update(UserRequest $request, int $id): JsonResponse
|
|
|
public function destroy(int $id): JsonResponse
|
|
public function destroy(int $id): JsonResponse
|
|
|
{
|
|
{
|
|
|
$this->service->delete($id);
|
|
$this->service->delete($id);
|
|
|
|
|
+
|
|
|
return $this->successResponse(
|
|
return $this->successResponse(
|
|
|
- message: __("messages.deleted"),
|
|
|
|
|
- code: 204,
|
|
|
|
|
|
|
+ message: __("messages.deleted"), code: 204,
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function getUserTypes(): JsonResponse
|
|
public function getUserTypes(): JsonResponse
|
|
|
{
|
|
{
|
|
|
$user_types = $this->service->getUserTypes();
|
|
$user_types = $this->service->getUserTypes();
|
|
|
|
|
+
|
|
|
return $this->successResponse(
|
|
return $this->successResponse(
|
|
|
payload: new UserTypeResource($user_types),
|
|
payload: new UserTypeResource($user_types),
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ //
|
|
|
|
|
+
|
|
|
|
|
+ public function updateMe(UserRequest $request): JsonResponse
|
|
|
|
|
+ {
|
|
|
|
|
+ $user = Auth::user();
|
|
|
|
|
+
|
|
|
|
|
+ $user->update($request->safe()->only(['password']));
|
|
|
|
|
+
|
|
|
|
|
+ return $this->successResponse(
|
|
|
|
|
+ payload: new UserResource($user->fresh(['state', 'units'])),
|
|
|
|
|
+ message: __("messages.updated"),
|
|
|
|
|
+ );
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|