Use user repository to update the user profile

Author: binaryk

src/Http/Controllers/ProfileController.php

@@ -4,11 +4,17 @@
 
 use Binaryk\LaravelRestify\Http\Requests\ProfileAvatarRequest;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Binaryk\LaravelRestify\Repositories\Repository;
+use Binaryk\LaravelRestify\Services\Search\RepositorySearchService;
 
 class ProfileController extends RepositoryController
 {
     public function __invoke(RestifyRequest $request)
     {
+        if ($repository = $this->guessRepository($request)) {
+            return $repository;
+        }
+
         $user = $request->user();
 
         if (isset($user->{ProfileAvatarRequest::$userAvatarAttribute})) {
@@ -22,11 +28,28 @@ public function __invoke(RestifyRequest $request)
         $meta = [];
 
         if (method_exists($user, 'profile')) {
-            $meta = (array) call_user_func([$user, 'profile'], $request);
+            $meta = (array)call_user_func([$user, 'profile'], $request);
         }
 
         return $this->response()
             ->data($user)
             ->meta($meta);
     }
+
+    public function guessRepository(RestifyRequest $request): ?Repository
+    {
+        $repository = $request->repository('users');
+
+        if (!$repository) {
+            return null;
+        }
+
+        $user = tap(RepositorySearchService::instance()->search(
+            $request, $repository
+        ), function ($query) use ($request, $repository) {
+            $repository::indexQuery($request, $query);
+        })->firstOrFail();
+
+        return $repository->withResource($user);
+    }
 }

src/Services/Search/RepositorySearchService.php

@@ -19,7 +19,7 @@ public function search(RestifyRequest $request, Repository $repository)
 
         $query = $this->applyFilters($request, $repository, $query);
 
-        return tap($this->prepareRelations($request, $this->prepareOrders($request, $query), $this->fixedInput), $this->applyIndexQuery($request, $repository));
+        return tap($this->prepareOrders($request, $query), $this->applyIndexQuery($request, $repository));
     }
 
     public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
@@ -30,7 +30,7 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
                 continue;
             }
 
-            $value = $request->get($key, data_get($extra, "match.$key"));
+            $value = $request->input($key, data_get($extra, "match.$key"));
 
             if (empty($value)) {
                 continue;
@@ -70,7 +70,7 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
 
     public function prepareOrders(RestifyRequest $request, $query, $extra = [])
     {
-        $orderings = explode(',', $request->get('sort', ''));
+        $orderings = explode(',', $request->input('sort', ''));
 
         if (isset($extra['sort'])) {
             $orderings = $extra['sort'];
@@ -93,7 +93,7 @@ public function prepareOrders(RestifyRequest $request, $query, $extra = [])
 
     public function prepareRelations(RestifyRequest $request, $query, $extra = [])
     {
-        $relations = array_merge($extra, explode(',', $request->get('related')));
+        $relations = array_merge($extra, explode(',', $request->input('related')));
 
         foreach ($relations as $relation) {
             if (in_array($relation, $this->repository->getWiths())) {
@@ -106,7 +106,7 @@ public function prepareRelations(RestifyRequest $request, $query, $extra = [])
 
     public function prepareSearchFields(RestifyRequest $request, $query, $extra = [])
     {
-        $search = $request->get('search', data_get($extra, 'search', ''));
+        $search = $request->input('search', data_get($extra, 'search', ''));
 
         if (empty($search)) {
             return $query;

tests/Controllers/ProfileControllerTest.php

@@ -24,7 +24,7 @@ public function test_profile_returns_authenticated_user()
         $response = $this->getJson('/restify-api/profile')
             ->assertStatus(200)
             ->assertJsonStructure([
-                'data',
+                'attributes',
             ]);
 
         $response->assertJsonFragment([
@@ -37,7 +37,7 @@ public function test_profile_returns_authenticated_user_with_related_posts()
         $response = $this->getJson('/restify-api/profile?related=posts')
             ->assertStatus(200)
             ->assertJsonStructure([
-                'data',
+                'attributes',
             ]);
 
         $response->assertJsonFragment([
@@ -51,10 +51,7 @@ public function test_profile_returns_authenticated_user_with_meta_profile_data()
         $this->getJson('/restify-api/profile')
             ->assertStatus(200)
             ->assertJsonStructure([
-                'data',
-                'meta' => [
-                    'roles',
-                ],
+                'meta',
             ]);
     }
 
@@ -64,7 +61,6 @@ public function test_profile_update()
             'email' => '[email protected]',
             'name' => 'Eduard',
         ])
-            ->dump()
             ->assertStatus(200);
 
         $response->assertJsonFragment([
@@ -115,7 +111,6 @@ public function test_profile_validation_from_repository()
             'email' => '[email protected]',
             'name' => 'Ed',
         ])
-            ->dump()
             ->assertStatus(400)
             ->assertJsonStructure([
                 'errors' => [

tests/Fixtures/User/UserRepository.php

@@ -10,7 +10,7 @@
 /**
  * @author Eduard Lupacescu <[email protected]>
  */
-class UserRepository extends Repository implements Mergeable
+class UserRepository extends Repository
 {
     public static $model = User::class;
 
@@ -19,6 +19,10 @@ class UserRepository extends Repository implements Mergeable
         'name',
     ];
 
+    public static $related = [
+        'posts',
+    ];
+
     public function fields(RestifyRequest $request)
     {
         return [