From d3256a460ac1d242ca1d32f2869a7121669adb32 Mon Sep 17 00:00:00 2001
From: Felix Huber <felix.a.huber@gmx.net>
Date: Mon, 23 Aug 2021 07:16:50 +0200
Subject: [PATCH 1/2] fix users endpoint

---
 routes/api.php                       | 2 +-
 src/Http/Controllers/Api/V1/User.php | 4 ++--
 tests/Integration/Endpoints.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/routes/api.php b/routes/api.php
index 8ece1bb..0b00cdf 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -25,7 +25,7 @@
                     ->middleware('token-ability-check:API: can list and access users')
                     ->group(function () {
                         Route::get('', \Seatplus\Api\Http\Controllers\Api\V1\Users::class);
-                        Route::get('/{user}', \Seatplus\Api\Http\Controllers\Api\V1\User::class);
+                        Route::get('/{user_id}', \Seatplus\Api\Http\Controllers\Api\V1\User::class);
                     });
 
                 Route::prefix('characters/{character_id}')
diff --git a/src/Http/Controllers/Api/V1/User.php b/src/Http/Controllers/Api/V1/User.php
index 78f2d09..be1c48e 100644
--- a/src/Http/Controllers/Api/V1/User.php
+++ b/src/Http/Controllers/Api/V1/User.php
@@ -3,7 +3,7 @@
 
 namespace Seatplus\Api\Http\Controllers\Api\V1;
 
-use Seatplus\Api\Http\Resources\V1\User as UserResource;
+
 use Seatplus\Auth\Models\User as UserModel;
 
 class User
@@ -12,6 +12,6 @@ public function __invoke(int $user_id)
     {
         $user = UserModel::query()->with('characters')->find($user_id);
 
-        return UserResource::make($user);
+        return \Seatplus\Api\Http\Resources\V1\Users\User::make($user);
     }
 }
diff --git a/tests/Integration/Endpoints.php b/tests/Integration/Endpoints.php
index 957f9b2..468e840 100644
--- a/tests/Integration/Endpoints.php
+++ b/tests/Integration/Endpoints.php
@@ -14,7 +14,7 @@
 });
 
 test('/api/v1/users/1', function () {
-    $this->get('api/v1/users')->assertOk();
+    $this->get('api/v1/users/1')->assertOk();
 });
 
 test('/api/v1/characters/{character_id}/skills', function () {

From 020610005228b0183cb7d35cdc9ecf042867c1fb Mon Sep 17 00:00:00 2001
From: herpaderpaldent <herpaderpaldent@users.noreply.github.com>
Date: Mon, 23 Aug 2021 05:17:28 +0000
Subject: [PATCH 2/2] Fix styling

---
 src/Http/Controllers/Api/V1/User.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Http/Controllers/Api/V1/User.php b/src/Http/Controllers/Api/V1/User.php
index be1c48e..7e48657 100644
--- a/src/Http/Controllers/Api/V1/User.php
+++ b/src/Http/Controllers/Api/V1/User.php
@@ -3,7 +3,6 @@
 
 namespace Seatplus\Api\Http\Controllers\Api\V1;
 
-
 use Seatplus\Auth\Models\User as UserModel;
 
 class User