Use user repository to update the user profile

Author: binaryk

src/Http/Controllers/ProfileUpdateController.php

@@ -3,6 +3,8 @@
 namespace Binaryk\LaravelRestify\Http\Controllers;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Binaryk\LaravelRestify\Repositories\Repository;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 
 class ProfileUpdateController extends RepositoryController
@@ -11,19 +13,38 @@ public function __invoke(RestifyRequest $request)
     {
         $user = $request->user();
 
-        $request->validate([
-            'email' => 'sometimes|required|unique:users,email,'.$user->id,
-            'password' => 'sometimes|required|min:5|confirmed',
-        ]);
-
-        if ($request->has('password')) {
-            $request->merge([
-                'password' => Hash::make($request->get('password')),
+        if ($repository = $this->guessRepository($request)) {
+            $repository->allowToUpdate($request)->update($request, Auth::id());
+        } else {
+            $request->validate([
+                'email' => 'sometimes|required|unique:users,email,'.$user->id,
+                'password' => 'sometimes|required|min:5|confirmed',
             ]);
-        }
 
-        $user->update($request->only($user->getFillable()));
+            if ($request->has('password')) {
+                $request->merge([
+                    'password' => Hash::make($request->get('password')),
+                ]);
+            }
+
+            $user->update($request->only($user->getFillable()));
+        }
 
         return $this->response()->data($user->fresh());
     }
+
+    public function guessRepository(RestifyRequest $request): ?Repository
+    {
+        $repository = $request->repository('users');
+
+        if (! $repository) {
+            return null;
+        }
+
+        $repository->withResource(
+            $repository::query($request)->whereKey(Auth::id())->first()
+        );
+
+        return $repository;
+    }
 }

tests/Controllers/ProfileControllerTest.php

@@ -36,7 +36,6 @@ public function test_profile_returns_authenticated_user_with_related_posts()
     {
         $response = $this->getJson('/restify-api/profile?related=posts')
             ->assertStatus(200)
-
             ->assertJsonStructure([
                 'data',
             ]);
@@ -65,6 +64,7 @@ public function test_profile_update()
             'email' => '[email protected]',
             'name' => 'Eduard',
         ])
+            ->dump()
             ->assertStatus(200);
 
         $response->assertJsonFragment([
@@ -95,7 +95,8 @@ public function test_profile_update_unique_email()
         $this->putJson('restify-api/profile', [
             'email' => '[email protected]',
             'name' => 'Eduard',
-        ])->assertStatus(400);
+        ])
+            ->assertStatus(400);
     }
 
     public function test_profile_upload_avatar()
@@ -107,4 +108,21 @@ public function test_profile_upload_avatar()
         ])
             ->assertStatus(200);
     }
+
+    public function test_profile_validation_from_repository()
+    {
+        $this->putJson('/restify-api/profile', [
+            'email' => '[email protected]',
+            'name' => 'Ed',
+        ])
+            ->dump()
+            ->assertStatus(400)
+            ->assertJsonStructure([
+                'errors' => [
+                    [
+                        'name'
+                    ]
+                ]
+            ]);
+    }
 }

tests/Fixtures/User/UserRepository.php

@@ -2,13 +2,15 @@
 
 namespace Binaryk\LaravelRestify\Tests\Fixtures\User;
 
+use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Binaryk\LaravelRestify\Repositories\Mergeable;
 use Binaryk\LaravelRestify\Repositories\Repository;
 
 /**
  * @author Eduard Lupacescu <[email protected]>
  */
-class UserRepository extends Repository
+class UserRepository extends Repository implements Mergeable
 {
     public static $model = User::class;
 
@@ -20,6 +22,11 @@ class UserRepository extends Repository
     public function fields(RestifyRequest $request)
     {
         return [
+            Field::new('name')->rules('sometimes', 'nullable', 'min:4'),
+
+            Field::new('email')->rules('required', 'unique:users'),
+
+            Field::new('password'),
         ];
     }