Add more tests; Add filter in filament resource; Added options for user create command

korridor · korridor · commit dce608e40306 · 2025-02-06T12:22:19.000-05:00
diff --git a/app/Console/Commands/Admin/UserCreateCommand.php b/app/Console/Commands/Admin/UserCreateCommand.php
@@ -22,7 +22,8 @@ class UserCreateCommand extends Command
     protected $signature = 'admin:user:create
                 { name : The name of the user }
                 { email : The email of the user }
-                { --ask-for-password : Ask for the password, otherwise the command will generate a random one }';
+                { --ask-for-password : Ask for the password, otherwise the command will generate a random one }
+                { --verify-email : Verify the email address of the user }';
 
     /**
      * The console command description.
@@ -39,6 +40,7 @@ public function handle(): int
         $name = $this->argument('name');
         $email = $this->argument('email');
         $askForPassword = (bool) $this->option('ask-for-password');
+        $verifyEmail = (bool) $this->option('verify-email');
 
         if (User::query()->where('email', $email)->where('is_placeholder', '=', false)->exists()) {
             $this->error('User with email "'.$email.'" already exists.');
@@ -71,6 +73,10 @@ public function handle(): int
             throw new LogicException('User does not have an organization');
         }
 
+        if ($verifyEmail) {
+            $user->markEmailAsVerified();
+        }
+
         $this->info('Created user "'.$name.'" ("'.$email.'")');
         $this->line('ID: '.$user->getKey());
         $this->line('Name: '.$name);
diff --git a/app/Filament/Resources/ClientResource.php b/app/Filament/Resources/ClientResource.php
@@ -60,8 +60,13 @@ public static function table(Table $table): Table
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
diff --git a/app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php b/app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php
@@ -5,6 +5,7 @@
 namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
 
 use App\Filament\Resources\OrganizationInvitationResource;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditOrganizationInvitation extends EditRecord
@@ -14,6 +15,8 @@ class EditOrganizationInvitation extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
+            Actions\DeleteAction::make()
+                ->icon('heroicon-m-trash'),
         ];
     }
 }
diff --git a/app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php b/app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php
@@ -56,6 +56,7 @@ public function table(Table $table): Table
             ])
             ->headerActions([
                 Tables\Actions\AttachAction::make()
+                    ->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
                     ->form(fn (AttachAction $action): array => [
                         $action->getRecordSelect(),
                         Select::make('role')
diff --git a/app/Filament/Resources/ProjectResource.php b/app/Filament/Resources/ProjectResource.php
@@ -72,8 +72,13 @@ public static function table(Table $table): Table
             ])
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([
diff --git a/app/Filament/Resources/ReportResource.php b/app/Filament/Resources/ReportResource.php
@@ -101,8 +101,13 @@ public static function table(Table $table): Table
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->actions([
                 Action::make('public-view')
diff --git a/app/Filament/Resources/TagResource.php b/app/Filament/Resources/TagResource.php
@@ -60,8 +60,13 @@ public static function table(Table $table): Table
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
diff --git a/app/Filament/Resources/TaskResource.php b/app/Filament/Resources/TaskResource.php
@@ -61,8 +61,13 @@ public static function table(Table $table): Table
             ])
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([
diff --git a/app/Filament/Resources/TimeEntryResource.php b/app/Filament/Resources/TimeEntryResource.php
@@ -92,8 +92,13 @@ public static function table(Table $table): Table
             ])
             ->filters([
                 SelectFilter::make('organization')
+                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
+                SelectFilter::make('organization_id')
+                    ->label('Organization ID')
+                    ->relationship('organization', 'id')
+                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([
diff --git a/app/Service/Import/ImportDatabaseHelper.php b/app/Service/Import/ImportDatabaseHelper.php
@@ -196,6 +196,7 @@ public function getCachedModels(): array
         if ($this->mapKeyToModel === null) {
             return [];
         }
+
         return array_values($this->mapKeyToModel);
     }
 
diff --git a/config/excel.php b/config/excel.php
@@ -163,8 +163,8 @@
        */
         'cells' => [
             'middleware' => [
-                //\Maatwebsite\Excel\Middleware\TrimCellValue::class,
-                //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
+                // \Maatwebsite\Excel\Middleware\TrimCellValue::class,
+                // \Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
             ],
         ],
 
diff --git a/tests/Unit/Console/Commands/Admin/OrganizationDeleteCommandTest.php b/tests/Unit/Console/Commands/Admin/OrganizationDeleteCommandTest.php
@@ -28,8 +28,10 @@ public function test_it_calls_the_deletion_service_with_the_organization(): void
         });
 
         // Act
-        $this->artisan('admin:organization:delete', ['organization' => $organization->getKey()])
-            ->expectsOutput("Deleting organization with ID {$organization->getKey()}")
+        $command = $this->artisan('admin:organization:delete', ['organization' => $organization->getKey()]);
+
+        // Assert
+        $command->expectsOutput("Deleting organization with ID {$organization->getKey()}")
             ->expectsOutput("Organization with ID {$organization->getKey()} has been deleted.")
             ->assertExitCode(0);
     }
@@ -40,9 +42,11 @@ public function test_it_fails_if_organization_does_not_exist(): void
         $organizationId = Str::uuid()->toString();
 
         // Act
-        $this->artisan('admin:organization:delete', ['organization' => $organizationId])
-            ->expectsOutput('Organization with ID '.$organizationId.' not found.')
-            ->assertExitCode(1);
+        $command = $this->artisan('admin:organization:delete', ['organization' => $organizationId]);
+
+        // Assert
+        $command->expectsOutput('Organization with ID '.$organizationId.' not found.');
+        $command->assertExitCode(1);
     }
 
     public function test_it_fails_if_organization_id_is_not_a_valid_uuid(): void
@@ -51,8 +55,10 @@ public function test_it_fails_if_organization_id_is_not_a_valid_uuid(): void
         $organizationId = 'invalid-uuid';
 
         // Act
-        $this->artisan('admin:organization:delete', ['organization' => $organizationId])
-            ->expectsOutput('Organization ID must be a valid UUID.')
+        $command = $this->artisan('admin:organization:delete', ['organization' => $organizationId]);
+
+        // Assert
+        $command->expectsOutput('Organization ID must be a valid UUID.')
             ->assertExitCode(1);
     }
 }
diff --git a/tests/Unit/Console/Commands/Admin/UserCreateCommandCommandTest.php b/tests/Unit/Console/Commands/Admin/UserCreateCommandCommandTest.php
@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Console\Commands\Admin;
+
+use App\Console\Commands\Admin\UserCreateCommand;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Hash;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
+use Tests\TestCaseWithDatabase;
+
+#[CoversClass(UserCreateCommand::class)]
+#[UsesClass(UserCreateCommand::class)]
+class UserCreateCommandCommandTest extends TestCaseWithDatabase
+{
+    public function test_it_creates_user(): void
+    {
+        // Arrange
+        $email = 'mail@testuser.test';
+        $name = 'Test User';
+
+        // Act
+        $exitCode = $this->withoutMockingConsoleOutput()->artisan('admin:user:create', [
+            'name' => $name,
+            'email' => $email,
+        ]);
+
+        // Assert
+        $this->assertSame(Command::SUCCESS, $exitCode);
+        $output = Artisan::output();
+        $this->assertStringContainsString('Created user "'.$name.'" ("'.$email.'")', $output);
+        $this->assertDatabaseHas(User::class, [
+            'name' => $name,
+            'email' => $email,
+            'email_verified_at' => null,
+        ]);
+    }
+
+    public function test_created_user_is_verified_if_option_is_set(): void
+    {
+        // Arrange
+        $email = 'mail@testuser.test';
+        $name = 'Test User';
+
+        // Act
+        $exitCode = $this->withoutMockingConsoleOutput()->artisan('admin:user:create', [
+            'name' => $name,
+            'email' => $email,
+            '--verify-email' => true,
+        ]);
+
+        // Assert
+        $this->assertSame(Command::SUCCESS, $exitCode);
+        $output = Artisan::output();
+        $this->assertStringContainsString('Created user "'.$name.'" ("'.$email.'")', $output);
+        $this->assertDatabaseHas(User::class, [
+            'name' => $name,
+            'email' => $email,
+        ]);
+        $user = User::where('email', $email)->first();
+        $this->assertNotNull($user->email_verified_at);
+    }
+
+    public function test_it_fails_if_user_with_email_already_exists(): void
+    {
+        // Arrange
+        $email = 'mail@testuser.test';
+        $name = 'Test User';
+
+        User::factory()->create([
+            'email' => $email,
+        ]);
+
+        // Act
+        $exitCode = $this->withoutMockingConsoleOutput()->artisan('admin:user:create', [
+            'name' => $name,
+            'email' => $email,
+        ]);
+
+        // Assert
+        $this->assertSame(Command::FAILURE, $exitCode);
+        $output = Artisan::output();
+        $this->assertStringContainsString('User with email "'.$email.'" already exists.', $output);
+    }
+
+    public function test_it_asks_for_password_if_option_is_set(): void
+    {
+        // Arrange
+        $email = 'mail@testuser.test';
+        $name = 'Test User';
+
+        // Act
+        $this->artisan('admin:user:create', [
+            'name' => $name,
+            'email' => $email,
+            '--ask-for-password' => true,
+        ])
+            ->expectsQuestion('Enter the password', 'password')
+            ->assertExitCode(Command::SUCCESS);
+
+        $this->assertDatabaseHas(User::class, [
+            'name' => $name,
+            'email' => $email,
+            'email_verified_at' => null,
+        ]);
+        $user = User::where('email', $email)->first();
+        $this->assertNotNull($user->password);
+        $this->assertTrue(Hash::check('password', $user->password));
+    }
+}
diff --git a/tests/Unit/Console/Commands/Admin/UserVerifyCommandTest.php b/tests/Unit/Console/Commands/Admin/UserVerifyCommandTest.php
@@ -29,7 +29,6 @@ public function test_it_verifies_user_email(): void
         $command = $this->artisan('admin:user:verify', ['email' => $user->email]);
 
         // Assert
-
         $command->expectsOutput('Start verifying user with email "'.$user->email.'"')
             ->expectsOutput('User with email "'.$user->email.'" has been verified.')
             ->assertExitCode(0);
diff --git a/tests/Unit/Filament/Resources/OrganizationInvitationResourceTest.php b/tests/Unit/Filament/Resources/OrganizationInvitationResourceTest.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Filament\Resources;
+
+use App\Filament\Resources\OrganizationInvitationResource;
+use App\Models\Organization;
+use App\Models\OrganizationInvitation;
+use App\Models\User;
+use Filament\Actions\DeleteAction;
+use Illuminate\Support\Facades\Config;
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\UsesClass;
+use Tests\Unit\Filament\FilamentTestCase;
+
+#[UsesClass(OrganizationInvitationResource::class)]
+class OrganizationInvitationResourceTest extends FilamentTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Config::set('auth.super_admins', ['admin@example.com']);
+        $user = User::factory()->withPersonalOrganization()->create([
+            'email' => 'admin@example.com',
+        ]);
+
+        $this->actingAs($user);
+    }
+
+    public function test_can_list_organization_invitations(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $organization = Organization::factory()->withOwner($user)->create();
+        $organizationInvitations = OrganizationInvitation::factory()->forOrganization($organization)->createMany(5);
+
+        // Act
+        $response = Livewire::test(OrganizationInvitationResource\Pages\ListOrganizationInvitations::class);
+
+        // Assert
+        $response->assertSuccessful();
+        $response->assertCanSeeTableRecords($organizationInvitations);
+    }
+
+    public function test_can_see_edit_page_of_organization_invitation(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $organizationInvitation = OrganizationInvitation::factory()->forOrganization($organization)->create();
+
+        // Act
+        $response = Livewire::test(OrganizationInvitationResource\Pages\EditOrganizationInvitation::class, [
+            'record' => $organizationInvitation->getKey(),
+        ]);
+
+        // Assert
+        $response->assertSuccessful();
+    }
+
+    public function test_can_delete_a_organization_invitation(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $organizationInvitation = OrganizationInvitation::factory()->forOrganization($organization)->create();
+
+        // Act
+        $response = Livewire::test(OrganizationInvitationResource\Pages\EditOrganizationInvitation::class, [
+            'record' => $organizationInvitation->getKey(),
+        ])->callAction(DeleteAction::class);
+
+        // Assert
+        $response->assertSuccessful();
+        $this->assertDatabaseMissing(OrganizationInvitation::class, [
+            'id' => $organizationInvitation->getKey(),
+        ]);
+    }
+}
diff --git a/tests/Unit/Filament/Resources/OrganizationResourceTest.php b/tests/Unit/Filament/Resources/OrganizationResourceTest.php
diff --git a/tests/Unit/Filament/Resources/ReportResourceTest.php b/tests/Unit/Filament/Resources/ReportResourceTest.php
diff --git a/tests/Unit/Filament/Resources/UserResourceTest.php b/tests/Unit/Filament/Resources/UserResourceTest.php
diff --git a/tests/Unit/Service/Import/ImportDatabaseHelperTest.php b/tests/Unit/Service/Import/ImportDatabaseHelperTest.php
diff --git a/tests/Unit/Service/TimezoneServiceTest.php b/tests/Unit/Service/TimezoneServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`namespace App\Filament\Resources\OrganizationInvitationResource\Pages;`
`6`	`6`
`7`	`7`	`use App\Filament\Resources\OrganizationInvitationResource;`
	`8`	`+use Filament\Actions;`
`8`	`9`	`use Filament\Resources\Pages\EditRecord;`
`9`	`10`
`10`	`11`	`class EditOrganizationInvitation extends EditRecord`
`@@ -14,6 +15,8 @@ class EditOrganizationInvitation extends EditRecord`
`14`	`15`	`protected function getHeaderActions(): array`
`15`	`16`	`{`
`16`	`17`	`return [`
	`18`	`+ Actions\DeleteAction::make()`
	`19`	`+ ->icon('heroicon-m-trash'),`
`17`	`20`	`];`
`18`	`21`	`}`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ public function getCachedModels(): array`
`196`	`196`	`if ($this->mapKeyToModel === null) {`
`197`	`197`	`return [];`
`198`	`198`	`}`
	`199`	`+`
`199`	`200`	`return array_values($this->mapKeyToModel);`
`200`	`201`	`}`
`201`	`202`