refactor: better action classes

muhammadmp97 · Sep 4, 2023 · b7df0d2 · b7df0d2
1 parent e9f11de
commit b7df0d2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 26 deletions.
diff --git a/app/Actions/User/ChangePasswordAction.php b/app/Actions/User/ChangePasswordAction.php
@@ -2,23 +2,22 @@
 
 namespace App\Actions\User;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 
 class ChangePasswordAction
 {
-    public function execute($request): void
+    public function execute(User $user, $data): void
     {
-        if (! Hash::check($request->old_password, $request->user()->password)) {
+        if (! Hash::check($data['old_password'], $user->password)) {
             throw ValidationException::withMessages([
                 'old_password' => 'Old password is wrong!',
             ]);
         }
 
-        $request
-            ->user()
-            ->update([
-                'password' => Hash::make($request->password)
-            ]);
+        $user->update([
+            'password' => Hash::make($data['password'])
+        ]);
     }
 }
diff --git a/app/Actions/User/CreateUserAction.php b/app/Actions/User/CreateUserAction.php
@@ -8,13 +8,13 @@
 
 class CreateUserAction
 {
-    public function execute($user)
+    public function execute(array $data): User
     {
-        User::create([
-            'email' => $user->email,
-            'password' => Hash::make($user->password),
-            'nick_name' => $user->nick_name,
-            'country_id' => $user->country_id,
+        return User::create([
+            'email' => $data['email'],
+            'password' => Hash::make($data['password']),
+            'nick_name' => $data['nick_name'],
+            'country_id' => $data['country_id'],
             'addiction_type' => AddictionType::Unknown,
         ]);
     }

diff --git a/app/Actions/User/EditProfileAction.php b/app/Actions/User/EditProfileAction.php
@@ -6,9 +6,9 @@
 
 class EditProfileAction
 {
-    public function execute(User $user, $fields): User
+    public function execute(User $user, array $data): User
     {
-        $user->update($fields->validated());
+        $user->update($data);
 
         return $user;
     }

diff --git a/app/Actions/User/LoginUserAction.php b/app/Actions/User/LoginUserAction.php
@@ -7,16 +7,16 @@
 
 class LoginUserAction
 {
-    public function execute($request): string
+    public function execute(array $data): string
     {
-        $user = User::firstWhere('email', $request->email);
+        $user = User::firstWhere('email', $data['email']);
 
-        if (! $user || ! Hash::check($request->password, $user->password)) {
+        if (! $user || ! Hash::check($data['password'], $user->password)) {
             abort(401, 'User not found!');
         }
 
         return $user
-            ->createToken($request->header('User-Agent'))
+            ->createToken(request()->header('User-Agent', 'Unkown User Agent'))
             ->plainTextToken;
     }
 }
diff --git a/app/Actions/User/LogoutUserAction.php b/app/Actions/User/LogoutUserAction.php
@@ -2,10 +2,12 @@
 
 namespace App\Actions\User;
 
+use App\Models\User;
+
 class LogoutUserAction
 {
-    public function execute($request): void
+    public function execute(User $user): void
     {
-        $request->user()->currentAccessToken()->delete();
+        $user->currentAccessToken()->delete();
     }
 }
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -21,14 +21,14 @@ public function __construct()
 
     public function register(UserRegistrationRequest $request, CreateUserAction $createUserAction)
     {
-        $createUserAction->execute($request);
+        $createUserAction->execute($request->validated());
 
         return $this->created();
     }
 
     public function login(UserLoginRequest $request, LoginUserAction $loginUserAction)
     {
-        $token = $loginUserAction->execute($request);
+        $token = $loginUserAction->execute($request->validated());
 
         return $this->ok(
             UserTokenResource::make($token)
@@ -37,14 +37,14 @@ public function login(UserLoginRequest $request, LoginUserAction $loginUserActio
 
     public function logout(Request $request, LogoutUserAction $logoutUserAction)
     {
-        $logoutUserAction->execute($request);
+        $logoutUserAction->execute($request->user());
 
         return $this->ok();
     }
 
     public function changePassword(ChangePasswordRequest $request, ChangePasswordAction $changePasswordAction)
     {
-        $changePasswordAction->execute($request);
+        $changePasswordAction->execute($request->user(), $request->validated());
 
         return $this->ok();
     }

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -23,7 +23,7 @@ public function index(Request $request)
 
     public function update(UpdateProfileRequest $request, EditProfileAction $editProfileAction)
     {
-        $user = $editProfileAction->execute($request->user(), $request);
+        $user = $editProfileAction->execute($request->user(), $request->validated());
 
         return $this->ok(
             UserResource::make($user)