feat: (LAR-86) improvement to Banning function

Author: StevyMarlino

app/Actions/User/BanUserAction.php

@@ -4,17 +4,26 @@
 
 use App\Models\User;
 use App\Events\UserBannedEvent;
+use App\Exceptions\CannotBanAdminException;
+use App\Exceptions\UserAlreadyBannedException;
 
 final class BanUserAction
 {
     public function execute(User $user, string $reason): void
     {
-        if($user->banned_at == null) {
-            $user->banned_at = now();
-            $user->banned_reason = $reason;
-            $user->save();
-
-            event(new UserBannedEvent($user));
+        if ($user->hasRole('admin')) {
+            throw new CannotBanAdminException;
+        }
+        
+        if($user->banned_at !== null) {
+            throw new UserAlreadyBannedException;
         }
+
+        $user->update([
+           'banned_at' => now(),
+           'banned_reason' => $reason 
+        ]);
+
+        event(new UserBannedEvent($user));
     }
 }

app/Actions/User/UnBanUserAction.php

@@ -9,9 +9,10 @@ final class UnBanUserAction
 {
     public function execute(User $user) : void
     {
-        $user->banned_at = null;
-        $user->banned_reason = null;
-        $user->save();
+        $user->update([
+            'banned_at' => null,
+            'banned_reason' => null
+        ]);
 
         event(new UserUnbannedEvent($user));
     }

app/Exceptions/CannotBanAdminException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class CannotBanAdminException extends Exception
+{
+    protected $message = "Impossible de bannir un administrateur.";
+}

app/Exceptions/UserAlreadyBannedException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class UserAlreadyBannedException extends Exception
+{
+    protected $message = "Impossible de bannir cet utilisateur car il est déjà banni.";
+}

app/Filament/Resources/UserResource.php

@@ -36,7 +36,7 @@ public static function table(Table $table): Table
         return $table
             ->modifyQueryUsing(function (Builder $query): void {
                 $query->whereHas('roles', function (Builder $query): void {
-                    $query->whereNotIn('name', ['admin', 'moderator']);
+                    $query->whereNotIn('name', ['moderator']);
                 })
                     ->latest();
             })
@@ -85,26 +85,6 @@ public static function table(Table $table): Table
                                 ->required(),
                         ])
                         ->action(function (User $record, array $data) {
-                            if (!self::canBanUser($record)) {
-                                Notification::make()
-                                    ->warning()
-                                    ->title(__('notifications.user.cannot_ban_title'))
-                                    ->body(__('notifications.user.cannot_ban_admin'))
-                                    ->duration(5000)
-                                    ->send();
-                
-                                return;
-                            }
-                            
-                            if ($record->banned_at !== null) {
-                                Notification::make()
-                                    ->warning()
-                                    ->title(__('notifications.user.cannot_ban_title'))
-                                    ->body(__('notifications.user.cannot_ban_body'))
-                                    ->send();
-                        
-                                return;
-                            }
 
                             app(BanUserAction::class)->execute($record, $data['banned_reason']);
 
@@ -147,9 +127,4 @@ public static function getPages(): array
             'index' => Pages\ListUsers::route('/'),
         ];
     }
-
-    public static function canBanUser(User $record): bool
-    {
-        return !$record->hasRole('admin');
-    }
 }

tests/Feature/Filament/UserResourceTest.php

@@ -12,6 +12,7 @@
 use App\Actions\User\UnBanUserAction;
 use Illuminate\Support\Facades\Event;
 use App\Filament\Resources\UserResource;
+use App\Exceptions\UserAlreadyBannedException;
 
 beforeEach(function (): void {
     Event::fake();
@@ -63,9 +64,11 @@
         // $this->get('/cp')->assertSuccessful();
 
         $user = User::factory()->create(['banned_at' => now()]);
-    
+
+        $this->expectException(UserAlreadyBannedException::class);
+        
         app(BanUserAction::class)->execute($user, 'Violation des règles');
-    
+
         expect($user->banned_reason)->not->toBe('Violation des règles')
             ->and($user->banned_at)->not->toBeNull();
     });