Merge branch 'main' into staging

tests/Feature/Admin/UserManagementControllerTest.php

@@ -5,6 +5,7 @@ namespace Tests\Feature\Admin;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Storage;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\TestCase;
 
@@ -85,6 +86,8 @@ class UserManagementControllerTest extends TestCase
      */
     public function test_admin_can_create_a_user_that_must_change_password_on_next_login(): void
     {
+        Storage::fake('public');
+
         $admin = User::factory()->admin()->create();
 
         $this->actingAs($admin)
@@ -103,6 +106,12 @@ class UserManagementControllerTest extends TestCase
             'email' => 'new-member@example.com',
             'must_change_password_on_next_login' => true,
         ]);
+
+        $user = User::query()->where('email', 'new-member@example.com')->firstOrFail();
+
+        $this->assertTrue($user->avatar_is_generated);
+        $this->assertNotNull($user->avatar_path);
+        Storage::disk('public')->assertExists($user->avatar_path);
     }
 
     /**

tests/Feature/Auth/RegistrationTest.php

@@ -2,7 +2,9 @@
 
 namespace Tests\Feature\Auth;
 
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Storage;
 use Laravel\Fortify\Features;
 use Tests\TestCase;
 
@@ -26,6 +28,8 @@ class RegistrationTest extends TestCase
 
     public function test_new_users_can_register()
     {
+        Storage::fake('public');
+
         $response = $this->post(route('register.store'), [
             'name' => 'Test User',
             'email' => 'test@example.com',
@@ -35,5 +39,14 @@ class RegistrationTest extends TestCase
 
         $this->assertAuthenticated();
         $response->assertRedirect(route('dashboard', absolute: false));
+
+        $user = User::query()->where('email', 'test@example.com')->firstOrFail();
+
+        $this->assertTrue($user->avatar_is_generated);
+        $this->assertNotNull($user->avatar_color);
+        $this->assertNotNull($user->avatar_path);
+
+        Storage::disk('public')->assertExists($user->avatar_path);
+        $this->assertStringContainsString('TU', Storage::disk('public')->get($user->avatar_path));
     }
 }

tests/Feature/Models/UserTest.php

@@ -5,7 +5,11 @@ namespace Tests\Feature\Models;
 use App\Models\Team;
 use App\Models\User;
 use Database\Seeders\UserSeeder;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 
 class UserTest extends TestCase
@@ -28,6 +32,81 @@ class UserTest extends TestCase
         ]);
     }
 
+    public function test_user_avatar_attribute_returns_public_storage_url(): void
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create([
+            'avatar_path' => 'avatars/generated/example.svg',
+            'avatar_color' => '#F97316',
+            'avatar_is_generated' => true,
+        ]);
+
+        $this->assertSame(
+            Storage::disk('public')->url('avatars/generated/example.svg'),
+            $user->avatar,
+        );
+        $this->assertArrayNotHasKey('avatar_path', $user->toArray());
+    }
+
+    public function test_user_can_identify_uploaded_avatars(): void
+    {
+        $generated = User::factory()->make([
+            'avatar_path' => 'avatars/generated/example.svg',
+            'avatar_is_generated' => true,
+        ]);
+        $uploaded = User::factory()->make([
+            'avatar_path' => 'avatars/uploads/example.png',
+            'avatar_is_generated' => false,
+        ]);
+        $missing = User::factory()->make([
+            'avatar_path' => null,
+            'avatar_is_generated' => false,
+        ]);
+
+        $this->assertFalse($generated->hasUploadedAvatar());
+        $this->assertTrue($uploaded->hasUploadedAvatar());
+        $this->assertFalse($missing->hasUploadedAvatar());
+    }
+
+    public function test_avatar_migration_backfills_existing_users(): void
+    {
+        Storage::fake('public');
+
+        Schema::table('users', function (Blueprint $table): void {
+            $table->dropColumn([
+                'avatar_path',
+                'avatar_color',
+                'avatar_is_generated',
+            ]);
+        });
+
+        DB::table('users')->insert([
+            'name' => 'Legacy User',
+            'email' => 'legacy@example.com',
+            'email_verified_at' => now(),
+            'password' => 'password',
+            'must_change_password_on_next_login' => false,
+            'remember_token' => null,
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $avatarFieldsMigration = require database_path('migrations/2026_06_24_114831_add_avatar_fields_to_users_table.php');
+        $avatarFieldsMigration->up();
+
+        $backfillMigration = require database_path('migrations/2026_06_24_123911_backfill_existing_user_avatars.php');
+        $backfillMigration->up();
+
+        $user = DB::table('users')->where('email', 'legacy@example.com')->first();
+
+        $this->assertNotNull($user->avatar_path);
+        $this->assertNotNull($user->avatar_color);
+        $this->assertTrue((bool) $user->avatar_is_generated);
+        Storage::disk('public')->assertExists($user->avatar_path);
+        $this->assertStringContainsString('LU', Storage::disk('public')->get($user->avatar_path));
+    }
+
     /**
      * Ensure the admin factory state creates admin users.
      */
@@ -49,6 +128,8 @@ class UserTest extends TestCase
      */
     public function test_user_seeder_creates_admin_and_regular_users(): void
     {
+        Storage::fake('public');
+
         $this->seed(UserSeeder::class);
 
         $admin = User::query()->where('email', 'admin@kanbangit.test')->firstOrFail();
@@ -69,6 +150,15 @@ class UserTest extends TestCase
             'scope_id' => null,
             'scope_type' => null,
         ]);
+
+        User::query()
+            ->get()
+            ->each(function (User $user): void {
+                $this->assertTrue($user->avatar_is_generated);
+                $this->assertNotNull($user->avatar_path);
+                $this->assertNotNull($user->avatar_color);
+                Storage::disk('public')->assertExists($user->avatar_path);
+            });
     }
 
     /**

tests/Feature/Settings/ProfileUpdateTest.php

@@ -4,6 +4,8 @@ namespace Tests\Feature\Settings;
 
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 
 class ProfileUpdateTest extends TestCase
@@ -23,6 +25,8 @@ class ProfileUpdateTest extends TestCase
 
     public function test_profile_information_can_be_updated()
     {
+        Storage::fake('public');
+
         $user = User::factory()->create();
 
         $response = $this
@@ -41,10 +45,15 @@ class ProfileUpdateTest extends TestCase
         $this->assertSame('Test User', $user->name);
         $this->assertSame('test@example.com', $user->email);
         $this->assertNull($user->email_verified_at);
+        $this->assertTrue($user->avatar_is_generated);
+        $this->assertNotNull($user->avatar_path);
+        Storage::disk('public')->assertExists($user->avatar_path);
     }
 
     public function test_email_verification_status_is_unchanged_when_the_email_address_is_unchanged()
     {
+        Storage::fake('public');
+
         $user = User::factory()->create();
 
         $response = $this
@@ -61,9 +70,165 @@ class ProfileUpdateTest extends TestCase
         $this->assertNotNull($user->refresh()->email_verified_at);
     }
 
+    public function test_user_can_upload_a_profile_picture()
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create([
+            'avatar_path' => 'avatars/generated/old.svg',
+            'avatar_color' => '#F97316',
+            'avatar_is_generated' => true,
+        ]);
+        Storage::disk('public')->put($user->avatar_path, '<svg>OU</svg>');
+
+        $response = $this
+            ->actingAs($user)
+            ->post(route('profile.update'), [
+                '_method' => 'PATCH',
+                'name' => $user->name,
+                'email' => $user->email,
+                'avatar' => UploadedFile::fake()->image('avatar.png'),
+            ]);
+
+        $response
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('profile.edit'));
+
+        $user->refresh();
+
+        $this->assertFalse($user->avatar_is_generated);
+        $this->assertSame('#F97316', $user->avatar_color);
+        $this->assertNotSame('avatars/generated/old.svg', $user->avatar_path);
+        $this->assertStringStartsWith('avatars/uploads/', $user->avatar_path);
+        Storage::disk('public')->assertMissing('avatars/generated/old.svg');
+        Storage::disk('public')->assertExists($user->avatar_path);
+    }
+
+    public function test_user_can_delete_their_uploaded_profile_picture()
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create([
+            'name' => 'Upload User',
+            'avatar_path' => 'avatars/uploads/current.png',
+            'avatar_color' => '#06B6D4',
+            'avatar_is_generated' => false,
+        ]);
+        Storage::disk('public')->put($user->avatar_path, 'uploaded image');
+
+        $response = $this
+            ->actingAs($user)
+            ->delete(route('profile.avatar.destroy'));
+
+        $response
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('profile.edit'));
+
+        $user->refresh();
+
+        $this->assertTrue($user->avatar_is_generated);
+        $this->assertSame('#06B6D4', $user->avatar_color);
+        $this->assertNotSame('avatars/uploads/current.png', $user->avatar_path);
+        $this->assertStringStartsWith('avatars/generated/', $user->avatar_path);
+        Storage::disk('public')->assertMissing('avatars/uploads/current.png');
+        Storage::disk('public')->assertExists($user->avatar_path);
+        $this->assertStringContainsString('UU', Storage::disk('public')->get($user->avatar_path));
+    }
+
+    public function test_name_change_regenerates_the_default_profile_picture()
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create([
+            'name' => 'Old User',
+            'email' => 'old-user@example.com',
+            'avatar_path' => 'avatars/generated/old.svg',
+            'avatar_color' => '#22C55E',
+            'avatar_is_generated' => true,
+        ]);
+        Storage::disk('public')->put($user->avatar_path, '<svg>OU</svg>');
+
+        $response = $this
+            ->actingAs($user)
+            ->patch(route('profile.update'), [
+                'name' => 'Fresh Person',
+                'email' => 'old-user@example.com',
+            ]);
+
+        $response
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('profile.edit'));
+
+        $user->refresh();
+
+        $this->assertTrue($user->avatar_is_generated);
+        $this->assertSame('#22C55E', $user->avatar_color);
+        $this->assertNotSame('avatars/generated/old.svg', $user->avatar_path);
+        Storage::disk('public')->assertMissing('avatars/generated/old.svg');
+        Storage::disk('public')->assertExists($user->avatar_path);
+        $this->assertStringContainsString('FP', Storage::disk('public')->get($user->avatar_path));
+    }
+
+    public function test_name_change_keeps_an_uploaded_profile_picture()
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create([
+            'name' => 'Old User',
+            'email' => 'old-user@example.com',
+            'avatar_path' => 'avatars/uploads/current.png',
+            'avatar_color' => '#06B6D4',
+            'avatar_is_generated' => false,
+        ]);
+        Storage::disk('public')->put($user->avatar_path, 'uploaded image');
+
+        $response = $this
+            ->actingAs($user)
+            ->patch(route('profile.update'), [
+                'name' => 'Fresh Person',
+                'email' => 'old-user@example.com',
+            ]);
+
+        $response
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('profile.edit'));
+
+        $user->refresh();
+
+        $this->assertFalse($user->avatar_is_generated);
+        $this->assertSame('avatars/uploads/current.png', $user->avatar_path);
+        Storage::disk('public')->assertExists('avatars/uploads/current.png');
+    }
+
+    public function test_profile_picture_must_be_an_image()
+    {
+        Storage::fake('public');
+
+        $user = User::factory()->create();
+
+        $response = $this
+            ->actingAs($user)
+            ->post(route('profile.update'), [
+                '_method' => 'PATCH',
+                'name' => $user->name,
+                'email' => $user->email,
+                'avatar' => UploadedFile::fake()->create('avatar.pdf', 10, 'application/pdf'),
+            ]);
+
+        $response->assertSessionHasErrors('avatar');
+    }
+
     public function test_user_can_delete_their_account()
     {
+        Storage::fake('public');
+
         $user = User::factory()->create();
+        $user->forceFill([
+            'avatar_path' => 'avatars/generated/delete-me.svg',
+            'avatar_color' => '#EC4899',
+            'avatar_is_generated' => true,
+        ])->save();
+        Storage::disk('public')->put($user->avatar_path, '<svg>DU</svg>');
 
         $response = $this
             ->actingAs($user)
@@ -77,6 +242,7 @@ class ProfileUpdateTest extends TestCase
 
         $this->assertGuest();
         $this->assertNull($user->fresh());
+        Storage::disk('public')->assertMissing('avatars/generated/delete-me.svg');
     }
 
     public function test_correct_password_must_be_provided_to_delete_account()