diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 2c9dd39..6eb4768 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -20,7 +20,7 @@ class UserController extends Controller $validated['status'] = true; try { $user = User::create($validated); - }catch (\Illuminate\Database\QueryException $exception){ + }catch (Throwable $exception){ return response() ->json($exception); } @@ -30,23 +30,9 @@ class UserController extends Controller ->json(['message' => 'Successfully created user ' . $user->firstname]); } - public function getUser(Request $request, $id) + public function getUser(Request $request, User $user) { - if (!empty($id)){ - try { - # The user exists - $user = User::where('uuid', $id)->firstOrfail(); - return response() - ->json(["status" => true]); - } catch (Illuminate\Database\Eloquent\ModelNotFoundException $e) { - // The user does not exist - return response() - ->json(["status" => false]); - } - } else { - return response() - ->json(["status" => "false", "message" => "Please specify UUID"]); - } - + return response() + ->json(["status" => true]); } } diff --git a/routes/api.php b/routes/api.php index 13aa37f..a73824e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -3,6 +3,7 @@ use App\Http\Controllers\Api\WebHookController; use App\Http\Controllers\Api\UserController; use Illuminate\Support\Facades\Route; +use Illuminate\Http\Request; /* |-------------------------------------------------------------------------- @@ -19,6 +20,9 @@ Route::middleware(['header.auth', 'throttle:api'])->group(function () { Route::get('/test', [WebHookController::class, 'test']); Route::post('/sendQuote', [WebHookController::class, 'sendQuote']); Route::post('/randomQuote', [WebHookController::class, 'sendRandomQuote']); - Route::post('/registerUser', [UserController::class, 'registerUser']); - Route::get('/getUser/{id}', [UserController::class, 'getUser']); + Route::post('/user/register', [UserController::class, 'registerUser']); + Route::get('/user/{user:uuid}', [UserController::class, 'getUser']) + ->missing(function (Request $request) { + return response()->json(["status" => false, "message" => "User not found"]); + }); });