Merge branch 'fix/simplify_stock_reservations' of https://gitea.quo.ar/tbianchini/shopit-back into fix/simplify_stock_reservations

.env.example

@@ -31,6 +31,7 @@ AUTH_LOGIN_ATTEMPT_WINDOW_MINUTES=30
 AUTH_LOGIN_LOCK_MINUTES=15
 AUTH_LOGIN_RATE_LIMIT_PER_MINUTE=10
 AUTH_LOGIN_IP_RATE_LIMIT_PER_MINUTE=30
+AUTH_PASSWORD_RESET_EXPIRATION_MINUTES=60
 
 LOG_CHANNEL=daily
 LOG_STACK=single

app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php

@@ -22,10 +22,18 @@ class ValidateResetPasswordAttemptController extends Controller
     {
         $data = $request->validated();
 
-        if (! $this->resetPasswordAttemptService->validateCode(
+        $result = $this->resetPasswordAttemptService->validateCode(
             $data['email'],
             $data['codigo'],
-        )) {
+        );
+
+        if ($result === ResetPasswordAttemptService::CODE_EXPIRED) {
+            throw ValidationException::withMessages([
+                'codigo' => __('api.auth.reset_code_expired'),
+            ]);
+        }
+
+        if ($result !== ResetPasswordAttemptService::CODE_VALID) {
             throw ValidationException::withMessages([
                 'codigo' => __('api.auth.reset_code_invalid'),
             ]);

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-#[Fillable(['user_id', 'codigo', 'reason', 'status'])]
+#[Fillable(['user_id', 'codigo', 'reason', 'status', 'expires_at'])]
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
@@ -31,6 +31,7 @@ class ResetPasswordAttempt extends Model
     {
         return [
             'user_id' => 'integer',
+            'expires_at' => 'datetime',
         ];
     }
 

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -12,6 +12,12 @@ use Throwable;
 
 class ResetPasswordAttemptService
 {
+    public const CODE_VALID = 'valid';
+
+    public const CODE_INVALID = 'invalid';
+
+    public const CODE_EXPIRED = 'expired';
+
     public function createForEmail(
         string $email,
         string $tenantCode,
@@ -146,12 +152,12 @@ class ResetPasswordAttemptService
         );
     }
 
-    public function validateCode(string $email, string $code): bool
+    public function validateCode(string $email, string $code): string
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): string {
                 $user = User::query()
                     ->where('email', $email)
                     ->lockForUpdate()
@@ -169,14 +175,27 @@ class ResetPasswordAttemptService
                         'email_fingerprint' => $emailFingerprint,
                     ]);
 
-                    return false;
+                    return self::CODE_INVALID;
+                }
+
+                if ($attempt->expires_at?->isPast()) {
+                    $attempt->update([
+                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
+                    ]);
+
+                    Log::info('Password reset code validation failed: attempt expired.', [
+                        'email_fingerprint' => $emailFingerprint,
+                        'attempt_id' => $attempt->getKey(),
+                    ]);
+
+                    return self::CODE_EXPIRED;
                 }
 
                 $attempt->update([
                     'status' => ResetPasswordAttempt::STATUS_VALIDATED,
                 ]);
 
-                return true;
+                return self::CODE_VALID;
             });
         } catch (Throwable $exception) {
             Log::error('Failed to validate password reset code.', [
@@ -214,6 +233,19 @@ class ResetPasswordAttemptService
                     return false;
                 }
 
+                if ($attempt->expires_at?->isPast()) {
+                    $attempt->update([
+                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
+                    ]);
+
+                    Log::info('Password reset failed: attempt expired.', [
+                        'email_fingerprint' => $emailFingerprint,
+                        'attempt_id' => $attempt->getKey(),
+                    ]);
+
+                    return false;
+                }
+
                 $user->password = $password;
                 $user->failed_login_attempts = 0;
                 $user->last_failed_login_at = null;
@@ -270,6 +302,7 @@ class ResetPasswordAttemptService
             'codigo' => $this->generateCode(),
             'reason' => $reason,
             'status' => ResetPasswordAttempt::STATUS_PENDING,
+            'expires_at' => now()->addMinutes((int) config('auth.passwords.users.expire')),
         ]);
 
         return $attempt->getKey();

app/Domains/Bootstrap/Resources/AdminAppBootstrapResource.php

@@ -30,6 +30,7 @@ class AdminAppBootstrapResource extends JsonResource
             'login_header_footer_color' => $websiteType->login_header_footer_color,
             'site_logo' => $websiteType->siteLogo?->getTemporaryUrl(1440),
             'footer_logo' => $websiteType->footerLogo?->getTemporaryUrl(1440),
+            'favicon' => $websiteType->favicon?->getTemporaryUrl(1440),
         ];
     }
 }

app/Domains/Bootstrap/Services/AdminAppBootstrapService.php

@@ -11,7 +11,7 @@ class AdminAppBootstrapService
     {
         return [
             'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo'])
+                ->with(['siteLogo', 'footerLogo', 'favicon'])
                 ->where('dominio', $domain)
                 ->firstOrFail(),
         ];

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

@@ -11,7 +11,7 @@ class ScannerBootstrapService
     {
         return [
             'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo'])
+                ->with(['siteLogo', 'footerLogo', 'favicon'])
                 ->where('scanner_domain', $domain)
                 ->firstOrFail(),
         ];

app/Domains/Tenant/Services/WebsiteTypeService.php

@@ -82,6 +82,7 @@ class WebsiteTypeService
                     && $previousLogo->id !== $websiteType->site_logo
                     && $previousLogo->id !== $websiteType->footer_logo
                     && $previousLogo->id !== $websiteType->favicon_id
+                    && ! $this->isReferencedByWebsiteType($previousLogo)
                 ) {
                     $this->attachmentService->delete($previousLogo);
                 }
@@ -90,4 +91,16 @@ class WebsiteTypeService
             return $websiteType;
         });
     }
+
+    private function isReferencedByWebsiteType(Attachment $attachment): bool
+    {
+        return WebsiteType::query()
+            ->where(function ($query) use ($attachment): void {
+                $query
+                    ->where('site_logo', $attachment->id)
+                    ->orWhere('footer_logo', $attachment->id)
+                    ->orWhere('favicon_id', $attachment->id);
+            })
+            ->exists();
+    }
 }

config/auth.php

@@ -96,7 +96,7 @@ return [
         'users' => [
             'provider' => 'users',
             'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
-            'expire' => 60,
+            'expire' => (int) env('AUTH_PASSWORD_RESET_EXPIRATION_MINUTES', 60),
             'throttle' => 60,
         ],
     ],

database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('reset_password_attempts', function (Blueprint $table): void {
+            $table->timestamp('expires_at')->nullable()->after('status');
+        });
+
+        // Attempts created before this migration did not have an expiration instant.
+        DB::table('reset_password_attempts')
+            ->whereIn('status', [
+                ResetPasswordAttempt::STATUS_PENDING,
+                ResetPasswordAttempt::STATUS_VALIDATED,
+            ])
+            ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+    }
+
+    public function down(): void
+    {
+        Schema::table('reset_password_attempts', function (Blueprint $table): void {
+            $table->dropColumn('expires_at');
+        });
+    }
+};

database/migrations/2026_08_26_000000_set_website_type_favicon.php

@@ -0,0 +1,96 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+return new class extends Migration
+{
+    private const FILENAME = 'onticket_favicon.svg';
+
+    /** @var list<string> */
+    private const WEBSITE_TYPE_CODES = ['shopit', 'onticket'];
+
+    public function up(): void
+    {
+        $websiteTypes = DB::table('website_type')
+            ->whereIn('codigo', self::WEBSITE_TYPE_CODES)
+            ->get(['codigo', 'favicon_id']);
+
+        if ($websiteTypes->isEmpty()) {
+            return;
+        }
+
+        $faviconIds = $websiteTypes
+            ->pluck('favicon_id')
+            ->filter()
+            ->unique()
+            ->values();
+
+        if (
+            $faviconIds->count() === 1
+            && DB::table('attachments')
+                ->where('id', $faviconIds->first())
+                ->where('filename', self::FILENAME)
+                ->exists()
+            && $websiteTypes->every(
+                fn (object $websiteType): bool => $websiteType->favicon_id === $faviconIds->first()
+            )
+        ) {
+            return;
+        }
+
+        $sourcePath = public_path('images/website_types/'.self::FILENAME);
+
+        if (! is_file($sourcePath)) {
+            throw new RuntimeException("Favicon not found at path: {$sourcePath}");
+        }
+
+        $contents = file_get_contents($sourcePath);
+
+        if ($contents === false) {
+            throw new RuntimeException("Could not read favicon at path: {$sourcePath}");
+        }
+
+        $key = (string) Str::uuid();
+        $storedPath = "website-types/{$key}.svg";
+
+        if (! Storage::disk('s3')->put($storedPath, $contents)) {
+            throw new RuntimeException("Could not store favicon at path: {$storedPath}");
+        }
+
+        try {
+            DB::transaction(function () use ($contents, $key, $storedPath): void {
+                $attachmentId = DB::table('attachments')->insertGetId([
+                    'key' => $key,
+                    'path' => $storedPath,
+                    'filename' => self::FILENAME,
+                    'type' => 'image',
+                    'mime_type' => 'image/svg+xml',
+                    'extension' => 'svg',
+                    'size' => strlen($contents),
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]);
+
+                DB::table('website_type')
+                    ->whereIn('codigo', self::WEBSITE_TYPE_CODES)
+                    ->update([
+                        'favicon_id' => $attachmentId,
+                        'updated_at' => now(),
+                    ]);
+            });
+        } catch (Throwable $throwable) {
+            Storage::disk('s3')->delete($storedPath);
+
+            throw $throwable;
+        }
+    }
+
+    public function down(): void
+    {
+        // The shared attachment may be in use outside these website types.
+        // Keep this data migration irreversible to avoid deleting an active asset.
+    }
+};

database/seeders/WebsiteTypeSeeder.php

@@ -36,6 +36,7 @@ class WebsiteTypeSeeder extends Seeder
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
+                'favicon' => $this->onTicketFavicon(),
             ],
         );
 
@@ -70,6 +71,7 @@ class WebsiteTypeSeeder extends Seeder
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
+                'favicon' => $shopIt->favicon()->firstOrFail()->key,
             ],
         );
 
@@ -175,4 +177,21 @@ class WebsiteTypeSeeder extends Seeder
             true,
         );
     }
+
+    private function onTicketFavicon(): UploadedFile
+    {
+        $path = public_path('images/website_types/onticket_favicon.svg');
+
+        if (! file_exists($path)) {
+            throw new RuntimeException("OnTicket favicon not found at path: {$path}");
+        }
+
+        return new UploadedFile(
+            $path,
+            'onticket_favicon.svg',
+            'image/svg+xml',
+            null,
+            true,
+        );
+    }
 }

lang/en/api.php

@@ -12,6 +12,7 @@ return [
         'password_reset_invalid' => 'The password recovery request is invalid or has already been used.',
         'password_updated' => 'Password updated successfully.',
         'reset_code_invalid' => 'The code you entered is invalid.',
+        'reset_code_expired' => 'The password recovery code expired. Request a new one.',
         'reset_code_valid' => 'Code validated successfully.',
         'invalid_tenant_or_return_url' => 'The tenant or return URL is invalid.',
         'request_expired' => 'The authentication request expired. Please try again.',

lang/es/api.php

@@ -12,6 +12,7 @@ return [
         'password_reset_invalid' => 'La solicitud de recuperación es inválida o ya fue utilizada.',
         'password_updated' => 'Contraseña modificada correctamente.',
         'reset_code_invalid' => 'El código ingresado es inválido.',
+        'reset_code_expired' => 'El código de recuperación expiró. Solicitá uno nuevo.',
         'reset_code_valid' => 'Código validado correctamente.',
         'invalid_tenant_or_return_url' => 'El tenant o la URL de retorno no son válidos.',
         'request_expired' => 'La solicitud de autenticación expiró. Intenta nuevamente.',

public/images/website_types/onticket_favicon.svg

@@ -0,0 +1,3 @@
+<svg width="63" height="36" viewBox="0 0 63 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M44.64 0H17.94C8.05 0 0 8.05 0 17.94C0 27.83 8.05 35.88 17.94 35.88H44.64C54.53 35.88 62.58 27.83 62.58 17.94C62.58 8.05 54.53 0 44.64 0ZM44.62 31.78C36.98 31.78 30.79 25.59 30.79 17.95C30.79 10.31 36.98 4.12 44.62 4.12C52.26 4.12 58.45 10.31 58.45 17.95C58.45 25.59 52.26 31.78 44.62 31.78Z" fill="#FF7006"/>
+</svg>

tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php

@@ -69,6 +69,10 @@ class CreateResetPasswordAttemptControllerTest extends TestCase
         $this->assertTrue($attempt->user->is($user));
         $this->assertMatchesRegularExpression('/^\d{4}$/', $attempt->codigo);
         $this->assertSame(ResetPasswordAttempt::STATUS_PENDING, $attempt->status);
+        $this->assertTrue($attempt->expires_at->between(
+            now()->addMinutes(59),
+            now()->addMinutes(60),
+        ));
         Event::assertDispatched(
             PasswordResetRequested::class,
             fn (PasswordResetRequested $event): bool => $event->attemptId === $attempt->id

tests/Feature/Auth/ResetPasswordAttemptTest.php

@@ -18,7 +18,9 @@ class ResetPasswordAttemptTest extends TestCase
             'id',
             'user_id',
             'codigo',
+            'reason',
             'status',
+            'expires_at',
         ], Schema::getColumnListing('reset_password_attempts'));
     }
 
@@ -28,12 +30,14 @@ class ResetPasswordAttemptTest extends TestCase
 
         $attempt = $user->resetPasswordAttempts()->create([
             'codigo' => '123456',
+            'expires_at' => now()->addHour(),
         ]);
 
         $this->assertSame(ResetPasswordAttempt::STATUS_PENDING, $attempt->status);
         $this->assertTrue($attempt->user->is($user));
         $this->assertTrue($user->resetPasswordAttempts->contains($attempt));
         $this->assertFalse($attempt->usesTimestamps());
+        $this->assertTrue($attempt->expires_at->isFuture());
         $this->assertArrayNotHasKey('codigo', $attempt->toArray());
     }
 

tests/Feature/Auth/ResetPasswordControllerTest.php

@@ -99,6 +99,30 @@ class ResetPasswordControllerTest extends TestCase
         $this->assertSame(ResetPasswordAttempt::STATUS_USED, $attempt->fresh()->status);
     }
 
+    public function test_an_expired_validated_attempt_cannot_reset_the_password(): void
+    {
+        $user = User::factory()->create([
+            'email' => 'ada@example.com',
+            'password' => 'OldSecret!123',
+        ]);
+        $attempt = $user->resetPasswordAttempts()->create([
+            'codigo' => '1234',
+            'status' => ResetPasswordAttempt::STATUS_VALIDATED,
+            'expires_at' => now()->subSecond(),
+        ]);
+
+        $this->postJson('/api/password/reset', [
+            'email' => 'ada@example.com',
+            'codigo' => '1234',
+            'password' => 'NewSecret!456',
+            'password_confirmation' => 'NewSecret!456',
+        ])->assertUnprocessable()
+            ->assertJsonValidationErrors('codigo');
+
+        $this->assertTrue(Hash::check('OldSecret!123', $user->fresh()->password));
+        $this->assertSame(ResetPasswordAttempt::STATUS_EXPIRED, $attempt->fresh()->status);
+    }
+
     public function test_it_validates_password_confirmation_and_strength(): void
     {
         $this->postJson('/api/password/reset', [

tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php

@@ -49,6 +49,27 @@ class ValidateResetPasswordAttemptControllerTest extends TestCase
         );
     }
 
+    public function test_it_expires_an_attempt_and_returns_the_expired_code_message(): void
+    {
+        $user = User::factory()->create(['email' => 'ada@example.com']);
+        $attempt = $user->resetPasswordAttempts()->create([
+            'codigo' => '1234',
+            'expires_at' => now()->subSecond(),
+        ]);
+
+        $this->postJson('/api/password/reset-attempts/validate', [
+            'email' => 'ada@example.com',
+            'codigo' => '1234',
+        ])->assertUnprocessable()
+            ->assertJsonValidationErrors('codigo')
+            ->assertJsonPath('errors.codigo.0', __('api.auth.reset_code_expired'));
+
+        $this->assertSame(
+            ResetPasswordAttempt::STATUS_EXPIRED,
+            $attempt->fresh()->status,
+        );
+    }
+
     public function test_it_rejects_an_expired_or_already_validated_attempt(): void
     {
         $user = User::factory()->create(['email' => 'ada@example.com']);

tests/Feature/Migrations/SetWebsiteTypeFaviconTest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Migrations;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class SetWebsiteTypeFaviconTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_uploads_one_favicon_and_shares_the_attachment_between_website_types(): void
+    {
+        Storage::fake('s3');
+
+        DB::table('website_type')->insert([
+            [
+                'codigo' => 'shopit',
+                'nombre' => 'ShopIt',
+                'created_at' => now(),
+                'updated_at' => now(),
+            ],
+            [
+                'codigo' => 'onticket',
+                'nombre' => 'OnTicket',
+                'created_at' => now(),
+                'updated_at' => now(),
+            ],
+        ]);
+
+        $migration = require database_path(
+            'migrations/2026_08_26_000000_set_website_type_favicon.php'
+        );
+
+        $migration->up();
+        $migration->up();
+
+        $faviconIds = DB::table('website_type')
+            ->whereIn('codigo', ['shopit', 'onticket'])
+            ->pluck('favicon_id');
+
+        $this->assertCount(2, $faviconIds);
+        $this->assertNotNull($faviconIds->first());
+        $this->assertSame(1, $faviconIds->unique()->count());
+
+        $attachment = DB::table('attachments')->where('id', $faviconIds->first())->first();
+
+        $this->assertNotNull($attachment);
+        $this->assertSame('onticket_favicon.svg', $attachment->filename);
+        $this->assertSame('image/svg+xml', $attachment->mime_type);
+        $this->assertSame('svg', $attachment->extension);
+        $this->assertSame(1, DB::table('attachments')->where('filename', 'onticket_favicon.svg')->count());
+        Storage::disk('s3')->assertExists($attachment->path);
+        $this->assertSame(
+            file_get_contents(public_path('images/website_types/onticket_favicon.svg')),
+            Storage::disk('s3')->get($attachment->path),
+        );
+    }
+}

tests/Feature/Seeders/WebsiteTypeSeederTest.php

@@ -21,7 +21,7 @@ class WebsiteTypeSeederTest extends TestCase
         $this->seed(WebsiteTypeSeeder::class);
 
         $this->assertSame(2, WebsiteType::query()->count());
-        $this->assertSame(4, Attachment::query()->count());
+        $this->assertSame(5, Attachment::query()->count());
 
         $expectedPresentation = [
             'primary_color' => '#FF7006',
@@ -49,6 +49,8 @@ class WebsiteTypeSeederTest extends TestCase
         Storage::disk('s3')->assertExists($shopIt->siteLogo->path);
         $this->assertSame('onticket_footer_logo.png', $shopIt->footerLogo->filename);
         Storage::disk('s3')->assertExists($shopIt->footerLogo->path);
+        $this->assertSame('onticket_favicon.svg', $shopIt->favicon->filename);
+        Storage::disk('s3')->assertExists($shopIt->favicon->path);
         $this->assertSame(['carousel'], $shopIt->extras->pluck('codigo')->all());
         $this->assertSame('Carrusel principal', $shopIt->extras->sole()->nombre);
         $this->assertSame([
@@ -79,6 +81,8 @@ class WebsiteTypeSeederTest extends TestCase
         Storage::disk('s3')->assertExists($onTicket->footerLogo->path);
         $this->assertNotSame($shopIt->site_logo, $onTicket->site_logo);
         $this->assertNotSame($shopIt->footer_logo, $onTicket->footer_logo);
+        $this->assertSame($shopIt->favicon_id, $onTicket->favicon_id);
+        $this->assertSame('onticket_favicon.svg', $onTicket->favicon->filename);
         $this->assertEqualsCanonicalizing(
             ['heroConfig', 'eventConfig', 'additionalInfoConfig'],
             $onTicket->extras->pluck('codigo')->all(),

tests/Feature/Tenant/BootstrapAdminAppControllerTest.php

@@ -14,6 +14,7 @@ class BootstrapAdminAppControllerTest extends TestCase
     public function test_it_publicly_bootstraps_the_admin_app_by_domain(): void
     {
         $footerLogo = Attachment::factory()->create();
+        $favicon = Attachment::factory()->create();
 
         WebsiteType::query()->create([
             'codigo' => 'shopit',
@@ -31,6 +32,7 @@ class BootstrapAdminAppControllerTest extends TestCase
             'border_color' => '#eaeaea',
             'login_header_footer_color' => '#313131',
             'footer_logo' => $footerLogo->id,
+            'favicon_id' => $favicon->id,
         ]);
 
         $this->getJson('/api/v1/adminapp/bootstrap/ADMIN.SHOPIT.TEST')
@@ -41,6 +43,7 @@ class BootstrapAdminAppControllerTest extends TestCase
             ->assertJsonPath('data.login_header_footer_color', '#313131')
             ->assertJsonPath('data.site_logo', null)
             ->assertJsonPath('data.footer_logo', $footerLogo->getTemporaryUrl(1440))
+            ->assertJsonPath('data.favicon', $favicon->getTemporaryUrl(1440))
             ->assertJsonMissingPath('data.forms')
             ->assertJsonMissingPath('data.codigo')
             ->assertJsonMissingPath('data.nombre')

tests/Feature/Tenant/BootstrapScannerControllerTest.php

@@ -14,6 +14,7 @@ class BootstrapScannerControllerTest extends TestCase
     public function test_it_publicly_bootstraps_the_scanner_by_scanner_domain(): void
     {
         $siteLogo = Attachment::factory()->create();
+        $favicon = Attachment::factory()->create();
 
         WebsiteType::query()->create([
             'codigo' => 'shopit',
@@ -32,6 +33,7 @@ class BootstrapScannerControllerTest extends TestCase
             'border_color' => '#eaeaea',
             'login_header_footer_color' => '#313131',
             'site_logo' => $siteLogo->id,
+            'favicon_id' => $favicon->id,
         ]);
 
         $this->getJson('/api/v1/scanner/bootstrap/SCANNER.SHOPIT.TEST')
@@ -40,6 +42,7 @@ class BootstrapScannerControllerTest extends TestCase
             ->assertJsonPath('data.primary_color', '#112233')
             ->assertJsonPath('data.site_logo', $siteLogo->getTemporaryUrl(1440))
             ->assertJsonPath('data.footer_logo', null)
+            ->assertJsonPath('data.favicon', $favicon->getTemporaryUrl(1440))
             ->assertJsonMissingPath('data.codigo')
             ->assertJsonMissingPath('data.nombre')
             ->assertJsonMissingPath('data.dominio')

tests/Feature/Tenant/WebsiteTypeServiceTest.php

@@ -69,4 +69,31 @@ class WebsiteTypeServiceTest extends TestCase
             'favicon_id' => $favicon->id,
         ]);
     }
+
+    public function test_it_keeps_a_shared_favicon_when_one_website_type_replaces_it(): void
+    {
+        Storage::fake('s3');
+
+        $service = app(WebsiteTypeService::class);
+        $shopIt = $service->create([
+            'codigo' => 'shopit',
+            'nombre' => 'ShopIt',
+            'favicon' => UploadedFile::fake()->image('shared-favicon.png', 32, 32),
+        ]);
+        $sharedFavicon = $shopIt->favicon()->firstOrFail();
+        $onTicket = $service->create([
+            'codigo' => 'onticket',
+            'nombre' => 'OnTicket',
+            'favicon' => $sharedFavicon->key,
+        ]);
+
+        $service->updateOrCreate(
+            ['codigo' => 'shopit'],
+            ['favicon' => UploadedFile::fake()->image('shopit-favicon.png', 32, 32)],
+        );
+
+        $this->assertSame($sharedFavicon->id, $onTicket->fresh()->favicon_id);
+        $this->assertDatabaseHas('attachments', ['id' => $sharedFavicon->id]);
+        Storage::disk('s3')->assertExists($sharedFavicon->path);
+    }
 }

tests/Unit/Bootstrap/AdminAppBootstrapResourceTest.php

@@ -17,11 +17,13 @@ class AdminAppBootstrapResourceTest extends TestCase
         ]);
         $websiteType->setRelation('siteLogo', null);
         $websiteType->setRelation('footerLogo', null);
+        $websiteType->setRelation('favicon', null);
         $data = AdminAppBootstrapResource::make([
             'website_type' => $websiteType,
         ])->resolve(request());
 
         $this->assertSame('shopit', $data['website_type_code']);
+        $this->assertNull($data['favicon']);
         $this->assertArrayNotHasKey('forms', $data);
     }
 }