diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 8b37191..3ace2e4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -8,6 +8,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; use App\Services\GetRole; +use App\Services\UserService; class UserController extends Controller { @@ -18,20 +19,8 @@ class UserController extends Controller public function me(Request $request): JsonResponse { try { - return response()->json([ - "id" => $request->user()->id, - "name" => $request->user()->name, - "lastname" => $request->user()->lastname, - "email" => $request->user()->email, - "role" => GetRole::getRole($request->user()->role), - "phone" => $request->user()->phone, - "created_at" => $request->user()->created_at, - "updated_at" => $request->user()->updated_at, - "verfied_at" => $request->user()->verfied_at, - "validate" => $request->user()->validate, - "tasks" => $request->user()->tasks - ]); - } catch (\Exception $e) { + return response()->json(UserService::getData($request->user()->id)); + } catch(\Exception $e) { Log::info($e->getMessage()); return response()->json(['message' => "Server error"], 500); } @@ -83,16 +72,7 @@ class UserController extends Controller public function getUser(Request $request, int $id): JsonResponse { try { - $user = User::find($id); - return response()->json([ - 'id' => $user->id, - 'name' => $user->name, - 'lastname' => $user->lastname, - 'email' => $user->email, - 'phone' => $user->phone ? $user->phone : "null", - 'validate' => $user->validate, - 'role' => $user->role, - ]); + return response()->json(UserService::getData($id)); } catch(\Exception $e) { Log::info($e->getMessage()); return response()->json(['message' => "Server error"], 500); diff --git a/app/Services/UserService.php b/app/Services/UserService.php new file mode 100644 index 0000000..4944339 --- /dev/null +++ b/app/Services/UserService.php @@ -0,0 +1,25 @@ + $user->id, + "name" => $user->name, + "lastname" => $user->lastname, + "email" => $user->email, + "role" => GetRole::getRole($user->role), + "phone" => $user->phone, + "created_at" => $user->created_at, + "updated_at" => $user->updated_at, + "verfied_at" => $user->verfied_at, + "validate" => $user->validate, + "tasks" => $user->tasks + ]; + } +}