Merge pull request #59 from BinaryStudioAcademy/feature/profile-page

Implement profile update

Author: nemoipaha

backend/app/Action/Auth/RegisterAction.php

@@ -24,7 +24,8 @@ public function execute(RegisterRequest $request): AuthenticationResponse
         $user = $this->userRepository->create([
             'email' => $request->getEmail(),
             'password' => $request->getPassword(),
-            'name' => $request->getName(),
+            'first_name' => $request->getFirstName(),
+            'last_name' => $request->getLastName(),
             'nickname' => $request->getNickname()
         ]);
         $token = auth()->login($user);

backend/app/Action/Auth/RegisterRequest.php

@@ -8,18 +8,21 @@ final class RegisterRequest
 {
     private $email;
     private $password;
-    private $name;
+    private $firstName;
+    private $lastName;
     private $nickname;
 
     public function __construct(
         string $email,
         string $password,
-        string $name,
+        string $firstName,
+        string $lastName,
         string $nickname
     ) {
         $this->email = $email;
         $this->password = $password;
-        $this->name = $name;
+        $this->firstName = $firstName;
+        $this->lastName = $lastName;
         $this->nickname = $nickname;
     }
 
@@ -33,9 +36,14 @@ public function getPassword(): string
         return $this->password;
     }
 
-    public function getName(): string
+    public function getFirstName(): string
     {
-        return $this->name;
+        return $this->firstName;
+    }
+
+    public function getLastName(): string
+    {
+        return $this->lastName;
     }
 
     public function getNickname(): string

backend/app/Action/Auth/UpdateProfileAction.php

@@ -21,7 +21,8 @@ public function execute(UpdateProfileRequest $request): UpdateProfileResponse
         $user = Auth::user();
 
         $user->email = $request->getEmail() ?: $user->email;
-        $user->name = $request->getName() ?: $user->name;
+        $user->first_name = $request->getFirstName() ?: $user->first_name;
+        $user->last_name = $request->getLastName() ?: $user->last_name;
         $user->nickname = $request->getNickname() ?: $user->nickname;
 
         $user = $this->userRepository->save($user);

backend/app/Action/Auth/UpdateProfileRequest.php

@@ -7,16 +7,19 @@
 final class UpdateProfileRequest
 {
     private $email;
-    private $name;
+    private $firstName;
+    private $lastName;
     private $nickname;
 
     public function __construct(
         ?string $email,
-        ?string $name,
+        ?string $firstName,
+        ?string $lastName,
         ?string $nickname
     ) {
         $this->email = $email;
-        $this->name = $name;
+        $this->firstName = $firstName;
+        $this->lastName = $lastName;
         $this->nickname = $nickname;
     }
 
@@ -25,9 +28,14 @@ public function getEmail(): ?string
         return $this->email;
     }
 
-    public function getName(): ?string
+    public function getFirstName(): ?string
     {
-        return $this->name;
+        return $this->firstName;
+    }
+
+    public function getLastName(): ?string
+    {
+        return $this->lastName;
     }
 
     public function getNickname(): ?string

backend/app/Action/Auth/UploadProfileImageAction.php

@@ -33,7 +33,9 @@ public function execute(UploadProfileImageRequest $request): UploadProfileImageR
             $user->id,
             'public'
         );
-        $user->profile_image = $disk->url($filePath);
+
+        // added timestamp to url to let browser know that image was changed
+        $user->profile_image = $disk->url($filePath) . '?t=' . time();
 
         $user = $this->userRepository->save($user);
 

backend/app/Entity/User.php

@@ -33,7 +33,8 @@ final class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $fillable = [
-        'name',
+        'first_name',
+        'last_name',
         'nickname',
         'email',
         'password',
@@ -79,13 +80,22 @@ public function setPasswordAttribute($password)
         }
     }
 
-    public function changeName(string $name): void
+    public function changeFirstName(string $firstName): void
     {
-        if (empty($name)) {
-            throw new InvalidArgumentException('User name cannot be empty.');
+        if (empty($firstName)) {
+            throw new InvalidArgumentException('User first name cannot be empty.');
         }
 
-        $this->attributes['name'] = $name;
+        $this->attributes['first_name'] = $firstName;
+    }
+    
+    public function changeLastName(string $lastName): void
+    {
+        if (empty($lastName)) {
+            throw new InvalidArgumentException('User last name cannot be empty.');
+        }
+
+        $this->attributes['last_name'] = $lastName;
     }
 
     public function changeNickName(string $nickname): void
@@ -106,9 +116,14 @@ public function changeAvatar(string $avatarUrl): void
         $this->attributes['profile_image'] = $avatarUrl;
     }
 
-    public function getName(): string
+    public function getFirstName(): string
+    {
+        return $this->first_name;
+    }
+
+    public function getLastName(): string
     {
-        return $this->name;
+        return $this->last_name;
     }
 
     public function getNickName(): string

backend/app/Http/Controllers/Api/Auth/AuthController.php

@@ -36,10 +36,11 @@ public function register(
         AuthenticationResponseArrayPresenter $authenticationResponseArrayPresenter
     ) {
         $request = new RegisterRequest(
-            $httpRequest->email,
-            $httpRequest->password,
-            $httpRequest->name,
-            $httpRequest->nickname
+            $httpRequest->get('email'),
+            $httpRequest->get('password'),
+            $httpRequest->get('first_name'),
+            $httpRequest->get('last_name'),
+            $httpRequest->get('nickname')
         );
         $response = $action->execute($request);
 
@@ -82,7 +83,8 @@ public function update(
         $response = $action->execute(
             new UpdateProfileRequest(
                 $httpRequest->get('email'),
-                $httpRequest->get('name'),
+                $httpRequest->get('first_name'),
+                $httpRequest->get('last_name'),
                 $httpRequest->get('nickname')
             )
         );

backend/app/Http/Presenter/User/UserArrayPresenter.php

@@ -15,7 +15,8 @@ public function present(User $user): array
         return [
             'id' => $user->getId(),
             'email' => $user->getEmail(),
-            'name' => $user->getName(),
+            'first_name' => $user->getFirstName(),
+            'last_name' => $user->getLastName(),
             'nickname' => $user->getNickName(),
             'avatar' => $user->getAvatar()
         ];

backend/app/Http/Request/Api/Auth/RegisterHttpRequest.php

@@ -18,7 +18,8 @@ public function rules(): array
         return [
             'email' => 'required|email|unique:users',
             'password' => 'required|min:6|string',
-            'name' => 'required|string|min:2',
+            'first_name' => 'required|string|min:2',
+            'last_name' => 'required|string|min:2',
             'nickname' => 'required|string|min:2|unique:users'
         ];
     }

backend/app/Http/Request/Api/Auth/UpdateProfileHttpRequest.php

@@ -5,6 +5,8 @@
 namespace App\Http\Request\Api\Auth;
 
 use App\Http\Request\ApiFormRequest;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
 
 final class UpdateProfileHttpRequest extends ApiFormRequest
 {
@@ -16,9 +18,17 @@ final class UpdateProfileHttpRequest extends ApiFormRequest
     public function rules(): array
     {
         return [
-            'email' => 'email|unique:users',
-            'name' => 'string|min:2',
-            'nickname' => 'string|min:2|unique:users'
+            'email' => [
+                'email',
+                Rule::unique('users')->ignore(Auth::id())
+            ],
+            'first_name' => 'string|min:2',
+            'last_name' => 'string|min:2',
+            'nickname' => [
+                'string',
+                'min:2',
+                Rule::unique('users')->ignore(Auth::id())
+            ]
         ];
     }
 }