fix: fix user profile controller

Author: binaryk

src/Http/Controllers/ProfileController.php

@@ -14,6 +14,15 @@ class ProfileController extends RepositoryController
     public function __invoke(ProfileRequestRequest $request): JsonResponse
     {
         if ($repository = $this->guessRepository($request)) {
+            return $request->repositoryWith(tap($request->modelQuery(Auth::id(), 'users'),
+                fn($query) => $repository::showQuery(
+                    $request,
+                    $repository::mainQuery($request,
+                        $query->with($repository::collectWiths($request, $repository)->all()))
+                ))->with($repository::collectWiths($request, $repository)->all())->firstOrFail(), 'users')
+                ->allowToShow($request)
+                ->show($request, Auth::id());
+
             return data($repository->serializeForShow($request));
         }
 
@@ -28,19 +37,11 @@ public function guessRepository(RestifyRequest $request): ?Repository
             return null;
         }
 
-        if (method_exists($repository, 'canUseForProfile')) {
-            if (! call_user_func([$repository, 'canUseForProfile'], $request)) {
-                return null;
-            }
+        if (method_exists($repository, 'canUseForProfile') && ! call_user_func([$repository, 'canUseForProfile'],
+                $request)) {
+            return null;
         }
 
-        $user = tap(RepositorySearchService::make()->search(
-            $request,
-            $repository
-        ), function ($query) use ($request, $repository) {
-            $repository::indexQuery($request, $query);
-        })->whereKey(Auth::id())->firstOrFail();
-
-        return $repository->withResource($user);
+        return $repository;
     }
 }

src/Http/Requests/Concerns/InteractWithRepositories.php

@@ -91,7 +91,7 @@ public function viaQuery(): Relation
     public function modelQuery(?string $repositoryId = null, ?string $uriKey = null): Builder|Relation
     {
         return $this->newQuery($uriKey)->where(
-            $this->model()->getRouteKeyName(),
+            $this->model($uriKey)->getRouteKeyName(),
             $repositoryId ?? $this->route('repositoryId')
         );
     }

tests/Controllers/ProfileControllerTest.php

@@ -30,6 +30,8 @@ protected function setUp(): void
 
     public function test_profile_returns_authenticated_user(): void
     {
+        $this->withoutExceptionHandling();
+
         $response = $this->getJson(Restify::path('profile'))
             ->assertOk()
             ->assertJsonStructure([
@@ -46,16 +48,11 @@ public function test_profile_returns_authenticated_user_with_related_posts(): vo
         $this->getJson(Restify::path('profile', [
             'related' => 'posts',
         ]))
-            ->assertOk()
-            ->assertJsonStructure([
-                'data' => [
-                    'posts' => [
-                        [
-                            'title',
-                        ],
-                    ],
-                ],
-            ]);
+            ->assertJson(fn($json) => $json
+                ->where('data.attributes.email', $this->authenticatedAs->email)
+                ->has('data.relationships.posts')
+                ->etc()
+            );
     }
 
     public function test_profile_update()

tests/Fixtures/User/UserRepository.php

@@ -6,11 +6,17 @@
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Binaryk\LaravelRestify\Repositories\UserProfile;
+use Illuminate\Http\Request;
 
 class UserRepository extends Repository
 {
     use UserProfile;
 
+    public static function canUseForProfile(Request $request): bool
+    {
+        return true;
+    }
+
     public static string $model = User::class;
 
     public static bool $wasBooted = false;