feat(seeder): update image paths in ProductCatalogFromImagesSeeder and TenantSeeder, add new catalog images

- Added localization support for API responses in English and Spanish.
- Introduced a middleware to set the API locale based on the Accept-Language header.
- Updated various exception messages and validation responses to use localized strings.
- Created new language files for English and Spanish translations.
- Refactored existing code to replace hardcoded messages with localized strings.
- Added tests to verify localization functionality and response correctness.

.env.example

@@ -3,11 +3,15 @@ APP_ENV=production
 APP_KEY=
 APP_DEBUG=false
 APP_URL=http://localhost
-FRONTEND_URL=http://localhost:4200
-INTEGRATION_SECRET=
 
-APP_LOCALE=en
-APP_FALLBACK_LOCALE=en
+PURCHASE_CHECKOUT_EXPIRATION_MINUTES=30
+PURCHASE_QR_EXPIRATION_MINUTES=15
+PURCHASE_TELEPAGOS_EXPIRATION_MINUTES=30
+PURCHASE_TRANSFER_EXPIRATION_MINUTES=1440
+FRONTEND_URLS=http://localhost:4200
+
+APP_LOCALE=es
+APP_FALLBACK_LOCALE=es
 APP_FAKER_LOCALE=en_US
 
 APP_MAINTENANCE_DRIVER=file
@@ -15,25 +19,38 @@ APP_MAINTENANCE_DRIVER=file
 
 # PHP_CLI_SERVER_WORKERS=4
 
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_REDIRECT_URI=http://localhost/auth/google/callback
+
+
 BCRYPT_ROUNDS=12
+AUTH_MAX_LOGIN_ATTEMPTS=5
+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
 
 LOG_CHANNEL=stack
 LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_DATABASE=laravel
-# DB_USERNAME=root
-# DB_PASSWORD=
-
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
+INTEGRATION_SECRET=change-me
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
+SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,*.shopit.com.ar
+SANCTUM_EXPIRATION=720
+SESSION_SECURE_COOKIE=false
 
 BROADCAST_CONNECTION=log
 FILESYSTEM_DISK=local
@@ -49,7 +66,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=log
+MAIL_MAILER=smtp
 MAIL_SCHEME=null
 MAIL_HOST=127.0.0.1
 MAIL_PORT=2525
@@ -58,13 +75,11 @@ MAIL_PASSWORD=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-
 AWS_ENDPOINT=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=
+AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=
-AWS_HTTP_VERIFY=
-
+AWS_USE_PATH_STYLE_ENDPOINT=false
+AWS_HTTP_VERIFY=true
 VITE_APP_NAME="${APP_NAME}"

app/Domains/Attachable/Services/AttachmentService.php

@@ -66,6 +66,42 @@ class AttachmentService
         $attachment->delete();
     }
 
+    public function copy(Attachment $source, string $path): Attachment
+    {
+        $normalizedPath = $this->normalizeDirectory($path);
+
+        if ($normalizedPath === '') {
+            throw new AttachmentStorageException('The attachment path cannot be empty.');
+        }
+
+        $key = (string) Str::uuid();
+        $storedPath = $normalizedPath.'/'.$this->buildStoredFilename($key, (string) $source->extension);
+        $copied = Storage::disk('s3')->copy($source->path, $storedPath);
+
+        if (! $copied) {
+            throw new AttachmentStorageException('No se pudo copiar el archivo en el disco s3.');
+        }
+
+        try {
+            /** @var Attachment $attachment */
+            $attachment = Attachment::query()->create([
+                'key' => $key,
+                'path' => $storedPath,
+                'filename' => $source->filename,
+                'type' => $source->type,
+                'mime_type' => $source->mime_type,
+                'extension' => $source->extension,
+                'size' => $source->size,
+            ]);
+
+            return $attachment;
+        } catch (Throwable $throwable) {
+            Storage::disk('s3')->delete($storedPath);
+
+            throw $throwable;
+        }
+    }
+
     protected function normalizeDirectory(string $path): string
     {
         return trim($path, '/');

app/Domains/Auth/Controllers/AdminAppLoginController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\AdminAppLoginRequest;
+use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\PasswordLoginService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class AdminAppLoginController extends Controller
+{
+    public function __construct(
+        private readonly PasswordLoginService $passwordLoginService,
+    ) {}
+
+    public function __invoke(AdminAppLoginRequest $request): JsonResponse
+    {
+        $credentials = $request->validated();
+        $user = $this->passwordLoginService->authenticateAdminApp(
+            $credentials['email'],
+            $credentials['password'],
+            $request->ip(),
+            $request->userAgent(),
+        );
+
+        $expirationMinutes = (int) config('sanctum.expiration');
+        $token = $user->createToken(
+            'adminapp-token',
+            ['adminapp'],
+            now()->addMinutes($expirationMinutes),
+        )->plainTextToken;
+
+        return response()->json([
+            'code' => 'auth.login_success',
+            'message' => __('api.auth.login_success'),
+            'token' => $token,
+            'token_type' => 'Bearer',
+            'user' => UserResource::make($user),
+        ]);
+    }
+}

app/Domains/Auth/Controllers/CreateResetPasswordAttemptController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\CreateResetPasswordAttemptRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class CreateResetPasswordAttemptController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    public function __invoke(CreateResetPasswordAttemptRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        $this->resetPasswordAttemptService->createForEmail(
+            $data['email'],
+            $data['tenant_codigo'],
+        );
+
+        return response()->json([
+            'code' => 'auth.password_reset_requested',
+            'message' => __('api.auth.password_reset_requested'),
+            'status' => ResetPasswordAttempt::STATUS_PENDING,
+        ], 202);
+    }
+}

app/Domains/Auth/Controllers/GoogleAuthController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Services\GoogleAuthService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class GoogleAuthController extends Controller
+{
+    public function __construct(private readonly GoogleAuthService $googleAuthService) {}
+
+    public function redirect(Request $request): RedirectResponse
+    {
+        return $this->googleAuthService->redirect($request);
+    }
+
+    public function callback(Request $request): RedirectResponse
+    {
+        return $this->googleAuthService->callback($request);
+    }
+}

app/Domains/Auth/Controllers/GoogleTokenExchangeController.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\GoogleTokenExchangeRequest;
+use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\GoogleAuthService;
+use App\Domains\Cart\Services\GuestCartMergeService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Cookie;
+
+class GoogleTokenExchangeController extends Controller
+{
+    public function __construct(
+        private readonly GoogleAuthService $googleAuthService,
+        private readonly GuestCartMergeService $guestCartMergeService,
+    ) {}
+
+    public function __invoke(GoogleTokenExchangeRequest $request): JsonResponse
+    {
+        $authentication = $this->googleAuthService->exchange(
+            $request->validated('oauth_code'),
+            $request->validated('tenant_codigo'),
+        );
+
+        $guestTokenCookie = $request->cookie('guest_token');
+        $guestToken = is_string($guestTokenCookie) && $guestTokenCookie !== ''
+            ? $guestTokenCookie
+            : null;
+        $this->guestCartMergeService->merge(
+            $authentication['tenant_codigo'],
+            $authentication['user'],
+            $guestToken,
+        );
+
+        $response = response()->json([
+            'code' => 'auth.login_success',
+            'message' => __('api.auth.login_success'),
+            'token' => $authentication['token'],
+            'token_type' => 'Bearer',
+            'user' => UserResource::make($authentication['user']),
+        ]);
+
+        if ($guestToken !== null) {
+            $response->withCookie(Cookie::forget('guest_token'));
+        }
+
+        return $response;
+    }
+}

app/Domains/Auth/Controllers/LoginController.php

@@ -3,36 +3,60 @@
 namespace App\Domains\Auth\Controllers;
 
 use App\Domains\Auth\Requests\LoginUserRequest;
-use App\Domains\Auth\Models\User;
 use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\PasswordLoginService;
+use App\Domains\Cart\Services\GuestCartMergeService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Validation\ValidationException;
+use Illuminate\Support\Facades\Cookie;
 
 class LoginController extends Controller
 {
-    /**
-     * @throws ValidationException
-     */
+    public function __construct(
+        private readonly GuestCartMergeService $guestCartMergeService,
+        private readonly PasswordLoginService $passwordLoginService,
+    ) {}
+
     public function __invoke(LoginUserRequest $request): JsonResponse
     {
         $credentials = $request->validated();
-        $user = User::query()->where('email', $credentials['email'])->first();
+        $user = $this->passwordLoginService->authenticate(
+            $credentials['email'],
+            $credentials['password'],
+            $credentials['tenant_codigo'],
+            $request->ip(),
+            $request->userAgent(),
+        );
 
-        if (! $user || ! Hash::check($credentials['password'], $user->password)) {
-            throw ValidationException::withMessages([
-                'email' => 'Email o Contraseña incorrectos.',
-            ]);
-        }
+        $expirationMinutes = (int) config('sanctum.expiration');
+        $token = $user->createToken(
+            'api-token',
+            ['*'],
+            now()->addMinutes($expirationMinutes),
+        )->plainTextToken;
 
-        $token = $user->createToken('api-token')->plainTextToken;
+        $guestTokenCookie = $request->cookie('guest_token');
+        $guestToken = is_string($guestTokenCookie) && $guestTokenCookie !== ''
+            ? $guestTokenCookie
+            : null;
+        $this->guestCartMergeService->merge(
+            $credentials['tenant_codigo'],
+            $user,
+            $guestToken,
+        );
 
-        return response()->json([
-            'message' => 'Sesion iniciada correctamente.',
+        $response = response()->json([
+            'code' => 'auth.login_success',
+            'message' => __('api.auth.login_success'),
             'token' => $token,
             'token_type' => 'Bearer',
             'user' => UserResource::make($user),
         ]);
+
+        if ($guestToken !== null) {
+            $response->withCookie(Cookie::forget('guest_token'));
+        }
+
+        return $response;
     }
 }

app/Domains/Auth/Controllers/LogoutController.php

@@ -23,7 +23,8 @@ class LogoutController extends Controller
         }
 
         return response()->json([
-            'message' => 'Sesion cerrada correctamente.',
+            'code' => 'auth.logout_success',
+            'message' => __('api.auth.logout_success'),
         ]);
     }
 }

app/Domains/Auth/Controllers/RegisterController.php

@@ -12,15 +12,17 @@ class RegisterController extends Controller
 {
     public function __construct(
         protected RegisterUserService $registerUserService,
-    ) {
-    }
+    ) {}
 
     public function __invoke(RegisterUserRequest $request): JsonResponse
     {
         $user = $this->registerUserService->register($request->validated());
 
         return UserResource::make($user)
-            ->additional(['message' => 'Usuario registrado correctamente.'])
+            ->additional([
+                'code' => 'auth.register_success',
+                'message' => __('api.auth.register_success'),
+            ])
             ->response()
             ->setStatusCode(201);
     }

app/Domains/Auth/Controllers/ResetPasswordController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\ResetPasswordRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\ValidationException;
+
+class ResetPasswordController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function __invoke(ResetPasswordRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        if (! $this->resetPasswordAttemptService->resetPassword(
+            $data['email'],
+            $data['codigo'],
+            $data['password'],
+        )) {
+            throw ValidationException::withMessages([
+                'codigo' => __('api.auth.password_reset_invalid'),
+            ]);
+        }
+
+        return response()->json([
+            'code' => 'auth.password_updated',
+            'message' => __('api.auth.password_updated'),
+            'status' => ResetPasswordAttempt::STATUS_USED,
+        ]);
+    }
+}

app/Domains/Auth/Controllers/UpdateProfileController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\UpdateProfileRequest;
+use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\ProfileService;
+use Illuminate\Http\JsonResponse;
+
+class UpdateProfileController
+{
+    public function __invoke(UpdateProfileRequest $request, ProfileService $service): JsonResponse
+    {
+        $user = $service->update($request->user(), $request->validated());
+
+        return response()->json(UserResource::make($user)->resolve());
+    }
+}

app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\ValidateResetPasswordAttemptRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\ValidationException;
+
+class ValidateResetPasswordAttemptController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function __invoke(ValidateResetPasswordAttemptRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        if (! $this->resetPasswordAttemptService->validateCode(
+            $data['email'],
+            $data['codigo'],
+        )) {
+            throw ValidationException::withMessages([
+                'codigo' => __('api.auth.reset_code_invalid'),
+            ]);
+        }
+
+        return response()->json([
+            'code' => 'auth.reset_code_valid',
+            'message' => __('api.auth.reset_code_valid'),
+            'status' => ResetPasswordAttempt::STATUS_VALIDATED,
+        ]);
+    }
+}

app/Domains/Auth/Exceptions/AccountLockedException.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domains\Auth\Exceptions;
+
+use Carbon\CarbonImmutable;
+use RuntimeException;
+
+class AccountLockedException extends RuntimeException
+{
+    public function __construct(
+        public readonly CarbonImmutable $lockedUntil,
+    ) {
+        parent::__construct('The account is temporarily locked.');
+    }
+
+    public function retryAfterSeconds(): int
+    {
+        return max(1, (int) now()->diffInSeconds($this->lockedUntil, false));
+    }
+}

app/Domains/Auth/Models/LoginAttempt.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Auth\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'user_id',
+    'email_fingerprint',
+    'tenant_codigo',
+    'outcome',
+    'ip_address',
+    'user_agent',
+])]
+class LoginAttempt extends Model
+{
+    public const OUTCOME_SUCCESS = 'success';
+
+    public const OUTCOME_INVALID_CREDENTIALS = 'invalid_credentials';
+
+    public const OUTCOME_ACCOUNT_LOCKED = 'account_locked';
+
+    public const UPDATED_AT = null;
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'user_id' => 'integer',
+            'created_at' => 'datetime',
+        ];
+    }
+}

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Auth\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Attributes\Hidden;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable(['user_id', 'codigo', 'status'])]
+#[Hidden(['codigo'])]
+class ResetPasswordAttempt extends Model
+{
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_VALIDATED = 'validated';
+
+    public const STATUS_USED = 'used';
+
+    public const STATUS_EXPIRED = 'expired';
+
+    public $timestamps = false;
+
+    protected function casts(): array
+    {
+        return [
+            'user_id' => 'integer',
+        ];
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Domains/Auth/Models/User.php

@@ -2,26 +2,63 @@
 
 namespace App\Domains\Auth\Models;
 
+use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Authorization\Models\Role;
+use App\Domains\Tenant\Models\Tenant;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 
-#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono'])]
+#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
 #[Hidden(['password', 'remember_token'])]
 class User extends Authenticatable
 {
     /** @use HasFactory<UserFactory> */
     use HasApiTokens, HasFactory, Notifiable;
 
+    protected $attributes = [
+        'rol_codigo' => RoleCode::User->value,
+    ];
+
     protected static function newFactory(): UserFactory
     {
         return UserFactory::new();
     }
 
+    /** @return HasMany<ResetPasswordAttempt, $this> */
+    public function resetPasswordAttempts(): HasMany
+    {
+        return $this->hasMany(ResetPasswordAttempt::class);
+    }
+
+    /** @return HasMany<LoginAttempt, $this> */
+    public function loginAttempts(): HasMany
+    {
+        return $this->hasMany(LoginAttempt::class);
+    }
+
+    /**
+     * @return BelongsTo<Role, $this>
+     */
+    public function role(): BelongsTo
+    {
+        return $this->belongsTo(Role::class, 'rol_codigo', 'codigo');
+    }
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
+    }
+
     /**
      * @return array<string, string>
      */
@@ -30,6 +67,9 @@ class User extends Authenticatable
         return [
             'email_verified_at' => 'datetime',
             'password' => 'hashed',
+            'failed_login_attempts' => 'integer',
+            'last_failed_login_at' => 'datetime',
+            'locked_until' => 'datetime',
         ];
     }
 }

app/Domains/Auth/Requests/AdminAppLoginRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+
+class AdminAppLoginRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'password' => ['required', 'string'],
+        ];
+    }
+}

app/Domains/Auth/Requests/CreateResetPasswordAttemptRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+
+class CreateResetPasswordAttemptRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'tenant_codigo' => ['required', 'string', Rule::exists('tenants', 'codigo')],
+            'email' => ['required', 'string', 'email', 'max:255'],
+        ];
+    }
+}

app/Domains/Auth/Requests/GoogleTokenExchangeRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GoogleTokenExchangeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, array<int, string>> */
+    public function rules(): array
+    {
+        return [
+            'oauth_code' => ['required', 'uuid'],
+            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
+        ];
+    }
+}

app/Domains/Auth/Requests/LoginUserRequest.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
 
 class LoginUserRequest extends FormRequest
 {
@@ -11,6 +12,17 @@ class LoginUserRequest extends FormRequest
         return true;
     }
 
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -19,6 +31,7 @@ class LoginUserRequest extends FormRequest
         return [
             'email' => ['required', 'string', 'email', 'max:255'],
             'password' => ['required', 'string'],
+            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
         ];
     }
 }

app/Domains/Auth/Requests/RegisterUserRequest.php

@@ -4,6 +4,7 @@ namespace App\Domains\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\Password;
 
 class RegisterUserRequest extends FormRequest
 {
@@ -18,9 +19,10 @@ class RegisterUserRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'tenant_codigo' => ['nullable', 'string', Rule::exists('tenants', 'codigo')],
             'nombre_apellido' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')],
-            'password' => ['required', 'string', 'confirmed'],
+            'password' => ['required', 'string', 'confirmed', Password::min(8)->mixedCase()->symbols()],
             'dni' => ['nullable', 'string', 'max:255'],
             'telefono' => ['nullable', 'string', 'max:255'],
         ];

app/Domains/Auth/Requests/ResetPasswordRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rules\Password;
+
+class ResetPasswordRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'codigo' => ['required', 'string', 'regex:/^\d{4}$/'],
+            'password' => [
+                'required',
+                'string',
+                'confirmed',
+                Password::min(8)->mixedCase()->symbols(),
+            ],
+        ];
+    }
+}

app/Domains/Auth/Requests/UpdateProfileRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class UpdateProfileRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'nombre_apellido' => ['required', 'string', 'max:255'],
+            'email' => [
+                'required',
+                'email',
+                Rule::unique('users', 'email')->ignore($this->user()->id),
+            ],
+            'dni' => ['nullable', 'string', 'regex:/^[0-9]{7,8}$/'],
+            'telefono' => ['nullable', 'string', 'regex:/^\+?[0-9\s\-]+$/'],
+            'password' => ['nullable', 'string', \Illuminate\Validation\Rules\Password::min(8)->mixedCase()->symbols()],
+        ];
+    }
+}

app/Domains/Auth/Requests/ValidateResetPasswordAttemptRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+
+class ValidateResetPasswordAttemptRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'codigo' => ['required', 'string', 'regex:/^\d{4}$/'],
+        ];
+    }
+}

app/Domains/Auth/Resources/UserResource.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Auth\Resources;
 
+use App\Domains\Auth\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Auth\Models\User
+ * @mixin User
  */
 class UserResource extends JsonResource
 {
@@ -21,6 +22,8 @@ class UserResource extends JsonResource
             'email' => $this->email,
             'dni' => $this->dni,
             'telefono' => $this->telefono,
+            'rol_codigo' => $this->rol_codigo,
+            'tenant_codigo' => $this->tenant_codigo,
         ];
     }
 }

app/Domains/Auth/Services/GoogleAuthService.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\UserRegistered;
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
+use Laravel\Socialite\Contracts\User as SocialiteUser;
+use Laravel\Socialite\Facades\Socialite;
+
+class GoogleAuthService
+{
+    public function redirect(Request $request): RedirectResponse
+    {
+        $tenantCode = $request->string('tenant')->toString();
+        $returnUrl = $request->string('return_url')->toString();
+
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->first();
+
+        if (! $tenant || ! $this->isTenantReturnUrl($returnUrl, $tenant)) {
+            throw ValidationException::withMessages([
+                'tenant' => __('api.auth.invalid_tenant_or_return_url'),
+            ]);
+        }
+
+        $state = (string) Str::uuid();
+        Cache::put("google-oauth-context:{$state}", [
+            'tenant_codigo' => $tenant->codigo,
+            'return_url' => rtrim($returnUrl, '/'),
+        ], now()->addMinutes(10));
+
+        return Socialite::driver('google')
+            ->scopes(['openid', 'profile', 'email'])
+            ->stateless()
+            ->with(['state' => $state])
+            ->redirect();
+    }
+
+    public function callback(Request $request): RedirectResponse
+    {
+        $state = $request->string('state')->toString();
+
+        /** @var array{tenant_codigo?: string, return_url?: string}|null $context */
+        $context = Str::isUuid($state) ? Cache::pull("google-oauth-context:{$state}") : null;
+
+        if (! is_array($context) || ! isset($context['tenant_codigo'], $context['return_url'])) {
+            abort(400, __('api.auth.request_expired'));
+        }
+
+        $tenant = Tenant::query()->where('codigo', $context['tenant_codigo'])->first();
+
+        if (! $tenant || ! $this->isTenantReturnUrl($context['return_url'], $tenant)) {
+            abort(400, __('api.auth.invalid_return_url'));
+        }
+
+        /** @var SocialiteUser $googleUser */
+        $googleUser = Socialite::driver('google')->stateless()->user();
+        $user = $this->resolveUser($googleUser, $tenant);
+        $token = $user->createToken(
+            'google-oauth',
+            ['*'],
+            now()->addMinutes((int) config('sanctum.expiration')),
+        )->plainTextToken;
+
+        $exchangeCode = (string) Str::uuid();
+        Cache::put("google-oauth-exchange:{$exchangeCode}", [
+            'user_id' => $user->id,
+            'token' => $token,
+            'tenant_codigo' => $tenant->codigo,
+        ], now()->addMinutes(5));
+
+        return redirect()->to($context['return_url'].'/login?'.http_build_query([
+            'oauth_code' => $exchangeCode,
+        ]));
+    }
+
+    /** @return array{user: User, token: string, tenant_codigo: string} */
+    public function exchange(string $exchangeCode, string $tenantCodigo): array
+    {
+        /** @var array{user_id: int, token: string, tenant_codigo?: string}|null $authentication */
+        $authentication = Cache::pull("google-oauth-exchange:{$exchangeCode}");
+
+        if (! $authentication) {
+            throw ValidationException::withMessages([
+                'oauth_code' => __('api.auth.oauth_code_expired'),
+            ]);
+        }
+
+        if (($authentication['tenant_codigo'] ?? null) !== $tenantCodigo) {
+            throw ValidationException::withMessages([
+                'tenant_codigo' => __('api.auth.tenant_mismatch'),
+            ]);
+        }
+
+        return [
+            'user' => User::query()->findOrFail($authentication['user_id']),
+            'token' => $authentication['token'],
+            'tenant_codigo' => $tenantCodigo,
+        ];
+    }
+
+    private function resolveUser(SocialiteUser $googleUser, Tenant $tenant): User
+    {
+        $googleId = $googleUser->getId();
+        $email = $googleUser->getEmail();
+
+        if (! is_string($googleId) || $googleId === '' || ! is_string($email) || ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            throw ValidationException::withMessages([
+                'google' => __('api.auth.google_email_required'),
+            ]);
+        }
+
+        $rawUser = $googleUser instanceof \Laravel\Socialite\Two\User ? $googleUser->getRaw() : [];
+        $emailVerified = $rawUser['email_verified'] ?? $rawUser['verified_email'] ?? false;
+        if (! in_array($emailVerified, [true, 'true', 1, '1'], true)) {
+            throw ValidationException::withMessages([
+                'google' => __('api.auth.google_email_unverified'),
+            ]);
+        }
+
+        $user = User::query()->where('google_id', $googleId)->first();
+        if ($user) {
+            return $user;
+        }
+
+        $user = User::query()->where('email', $email)->first();
+        if ($user) {
+            $user->forceFill(['google_id' => $googleId])->save();
+
+            return $user;
+        }
+
+        $name = $googleUser->getName();
+        $user = User::query()->create([
+            'nombre_apellido' => is_string($name) && $name !== '' ? $name : $email,
+            'email' => $email,
+            'email_verified_at' => now(),
+            'google_id' => $googleId,
+            'password' => Str::password(64),
+        ]);
+
+        UserRegistered::dispatch($user, $tenant->codigo);
+
+        return $user;
+    }
+
+    private function isTenantReturnUrl(string $returnUrl, Tenant $tenant): bool
+    {
+        $parts = parse_url($returnUrl);
+        if (! is_array($parts)
+            || ! isset($parts['scheme'], $parts['host'])
+            || isset($parts['user'], $parts['pass'], $parts['query'], $parts['fragment'])
+            || ($parts['path'] ?? '') !== '') {
+            return false;
+        }
+
+        $scheme = strtolower($parts['scheme']);
+        $host = TenantDomainNormalizer::normalize($parts['host']);
+        $tenantDomain = TenantDomainNormalizer::normalize($tenant->dominio);
+
+        if ($host === null || $tenantDomain === null || $host !== $tenantDomain) {
+            return false;
+        }
+
+        return $scheme === 'https' || ($scheme === 'http' && in_array($host, ['localhost', '127.0.0.1'], true));
+    }
+}

app/Domains/Auth/Services/PasswordLoginService.php

@@ -0,0 +1,224 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Exceptions\AccountLockedException;
+use App\Domains\Auth\Models\LoginAttempt;
+use App\Domains\Auth\Models\User;
+use App\Domains\Authorization\Enums\RoleCode;
+use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
+
+class PasswordLoginService
+{
+    /**
+     * @throws AccountLockedException
+     * @throws ValidationException
+     */
+    public function authenticate(
+        string $email,
+        string $password,
+        string $tenantCode,
+        ?string $ipAddress,
+        ?string $userAgent,
+    ): User {
+        return $this->authenticateUser(
+            $email,
+            $password,
+            $tenantCode,
+            $ipAddress,
+            $userAgent,
+        );
+    }
+
+    /**
+     * Authenticate a tenant-bound AdminApp user without requiring the caller
+     * to know their tenant code beforehand.
+     *
+     * @throws AccountLockedException
+     * @throws ValidationException
+     */
+    public function authenticateAdminApp(
+        string $email,
+        string $password,
+        ?string $ipAddress,
+        ?string $userAgent,
+    ): User {
+        return $this->authenticateUser(
+            $email,
+            $password,
+            null,
+            $ipAddress,
+            $userAgent,
+            RoleCode::AdminApp,
+            true,
+        );
+    }
+
+    private function authenticateUser(
+        string $email,
+        string $password,
+        ?string $tenantCode,
+        ?string $ipAddress,
+        ?string $userAgent,
+        RoleCode $requiredRole = RoleCode::User,
+        bool $requiresTenant = false,
+    ): User {
+        $normalizedEmail = mb_strtolower(trim($email));
+        $now = CarbonImmutable::now();
+
+        /** @var array{outcome: string, user: User|null, locked_until: CarbonImmutable|null} $result */
+        $result = DB::transaction(function () use (
+            $normalizedEmail,
+            $password,
+            $tenantCode,
+            $ipAddress,
+            $userAgent,
+            $now,
+            $requiredRole,
+            $requiresTenant,
+        ): array {
+            $user = User::query()
+                ->where('email', $normalizedEmail)
+                ->where('rol_codigo', $requiredRole->value)
+                ->when(
+                    $requiresTenant,
+                    fn ($query) => $query->whereNotNull('tenant_codigo'),
+                )
+                ->lockForUpdate()
+                ->first();
+            $attemptTenantCode = $tenantCode ?? $user?->tenant_codigo;
+
+            if ($user?->locked_until?->isFuture()) {
+                $this->recordAttempt(
+                    $user,
+                    $normalizedEmail,
+                    $attemptTenantCode,
+                    LoginAttempt::OUTCOME_ACCOUNT_LOCKED,
+                    $ipAddress,
+                    $userAgent,
+                );
+
+                return [
+                    'outcome' => LoginAttempt::OUTCOME_ACCOUNT_LOCKED,
+                    'user' => $user,
+                    'locked_until' => CarbonImmutable::instance($user->locked_until),
+                ];
+            }
+
+            if ($user !== null && $user->locked_until !== null) {
+                $user->forceFill([
+                    'failed_login_attempts' => 0,
+                    'last_failed_login_at' => null,
+                    'locked_until' => null,
+                ])->save();
+            }
+
+            if ($user === null || ! Hash::check($password, $user->password)) {
+                if ($user !== null) {
+                    $this->registerFailure($user, $now);
+                }
+
+                $outcome = $user?->locked_until?->isFuture()
+                    ? LoginAttempt::OUTCOME_ACCOUNT_LOCKED
+                    : LoginAttempt::OUTCOME_INVALID_CREDENTIALS;
+                $this->recordAttempt(
+                    $user,
+                    $normalizedEmail,
+                    $attemptTenantCode,
+                    $outcome,
+                    $ipAddress,
+                    $userAgent,
+                );
+
+                return [
+                    'outcome' => $outcome,
+                    'user' => $user,
+                    'locked_until' => $user?->locked_until === null
+                        ? null
+                        : CarbonImmutable::instance($user->locked_until),
+                ];
+            }
+
+            $user->forceFill([
+                'failed_login_attempts' => 0,
+                'last_failed_login_at' => null,
+                'locked_until' => null,
+            ])->save();
+
+            $this->recordAttempt(
+                $user,
+                $normalizedEmail,
+                $attemptTenantCode,
+                LoginAttempt::OUTCOME_SUCCESS,
+                $ipAddress,
+                $userAgent,
+            );
+
+            return [
+                'outcome' => LoginAttempt::OUTCOME_SUCCESS,
+                'user' => $user,
+                'locked_until' => null,
+            ];
+        });
+
+        if ($result['outcome'] === LoginAttempt::OUTCOME_ACCOUNT_LOCKED) {
+            throw new AccountLockedException($result['locked_until']);
+        }
+
+        if ($result['outcome'] === LoginAttempt::OUTCOME_INVALID_CREDENTIALS) {
+            throw ValidationException::withMessages([
+                'email' => __('api.auth.invalid_credentials'),
+            ]);
+        }
+
+        return $result['user'];
+    }
+
+    private function registerFailure(User $user, CarbonImmutable $now): void
+    {
+        $windowMinutes = max(1, (int) config('login-security.attempt_window_minutes'));
+        $maxAttempts = max(1, (int) config('login-security.max_attempts'));
+        $lockMinutes = max(1, (int) config('login-security.lock_minutes'));
+
+        $withinAttemptWindow = $user->last_failed_login_at !== null
+            && $user->last_failed_login_at->gte($now->subMinutes($windowMinutes));
+        $attempts = $withinAttemptWindow
+            ? $user->failed_login_attempts + 1
+            : 1;
+
+        $user->forceFill([
+            'failed_login_attempts' => $attempts,
+            'last_failed_login_at' => $now,
+            'locked_until' => $attempts >= $maxAttempts
+                ? $now->addMinutes($lockMinutes)
+                : null,
+        ])->save();
+    }
+
+    private function recordAttempt(
+        ?User $user,
+        string $normalizedEmail,
+        ?string $tenantCode,
+        string $outcome,
+        ?string $ipAddress,
+        ?string $userAgent,
+    ): void {
+        LoginAttempt::query()->create([
+            'user_id' => $user?->getKey(),
+            'email_fingerprint' => hash_hmac(
+                'sha256',
+                $normalizedEmail,
+                (string) config('app.key'),
+            ),
+            'tenant_codigo' => $tenantCode,
+            'outcome' => $outcome,
+            'ip_address' => $ipAddress,
+            'user_agent' => $userAgent === null
+                ? null
+                : mb_substr($userAgent, 0, 1024),
+        ]);
+    }
+}

app/Domains/Auth/Services/ProfileService.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\User;
+use Illuminate\Support\Facades\Hash;
+
+class ProfileService
+{
+    /**
+     * Update the given user's profile information.
+     *
+     * @param User $user
+     * @param array $data
+     * @return User
+     */
+    public function update(User $user, array $data): User
+    {
+        // Handle password hashing if a new password is provided
+        if (!empty($data['password'])) {
+            $data['password'] = Hash::make($data['password']);
+        } else {
+            // Remove password from array if empty so we don't overwrite it with null
+            unset($data['password']);
+        }
+
+        // Standardize phone number (strip all but numbers and leading '+')
+        if (!empty($data['telefono'])) {
+            $data['telefono'] = preg_replace('/[^\+0-9]/', '', $data['telefono']);
+        }
+
+        // DNI is already validated as numbers only, but we can do a quick strip just in case
+        if (!empty($data['dni'])) {
+            $data['dni'] = preg_replace('/[^0-9]/', '', $data['dni']);
+        }
+
+        $user->update($data);
+
+        return $user;
+    }
+}

app/Domains/Auth/Services/RegisterUserService.php

@@ -3,20 +3,27 @@
 namespace App\Domains\Auth\Services;
 
 use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\UserRegistered;
 
 class RegisterUserService
 {
     /**
-     * @param  array{nombre_apellido: string, email: string, password: string, dni?: string|null, telefono?: string|null}  $data
+     * @param  array{tenant_codigo?: string|null, nombre_apellido: string, email: string, password: string, dni?: string|null, telefono?: string|null}  $data
      */
     public function register(array $data): User
     {
-        return User::query()->create([
+        $user = User::query()->create([
             'nombre_apellido' => $data['nombre_apellido'],
             'email' => $data['email'],
             'password' => $data['password'],
             'dni' => $data['dni'] ?? null,
             'telefono' => $data['telefono'] ?? null,
         ]);
+
+        if (! empty($data['tenant_codigo'])) {
+            UserRegistered::dispatch($user, $data['tenant_codigo']);
+        }
+
+        return $user;
     }
 }

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\PasswordResetRequested;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Throwable;
+
+class ResetPasswordAttemptService
+{
+    public function createForEmail(string $email, string $tenantCode): void
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            $attemptId = DB::transaction(function () use ($email, $emailFingerprint): ?int {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($user === null) {
+                    Log::warning('Password reset attempt was not created because the user was not found.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return null;
+                }
+
+                $user->resetPasswordAttempts()
+                    ->whereIn('status', [
+                        ResetPasswordAttempt::STATUS_PENDING,
+                        ResetPasswordAttempt::STATUS_VALIDATED,
+                    ])
+                    ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+
+                $attempt = $user->resetPasswordAttempts()->create([
+                    'codigo' => $this->generateCode(),
+                    'status' => ResetPasswordAttempt::STATUS_PENDING,
+                ]);
+
+                return $attempt->getKey();
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to create password reset attempt.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+
+        if ($attemptId !== null) {
+            try {
+                PasswordResetRequested::dispatch($attemptId, $tenantCode);
+            } catch (Throwable $exception) {
+                Log::error('Failed to dispatch password reset email.', [
+                    'attempt_id' => $attemptId,
+                    'tenant_code' => $tenantCode,
+                    'email_fingerprint' => $emailFingerprint,
+                    'exception' => $exception,
+                ]);
+
+                throw $exception;
+            }
+        }
+    }
+
+    public function validateCode(string $email, string $code): bool
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                $attempt = $user?->resetPasswordAttempts()
+                    ->where('codigo', $code)
+                    ->where('status', ResetPasswordAttempt::STATUS_PENDING)
+                    ->latest('id')
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($attempt === null) {
+                    Log::warning('Password reset code validation failed: no matching pending attempt.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return false;
+                }
+
+                $attempt->update([
+                    'status' => ResetPasswordAttempt::STATUS_VALIDATED,
+                ]);
+
+                return true;
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to validate password reset code.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+    }
+
+    public function resetPassword(string $email, string $code, string $password): bool
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint): bool {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                $attempt = $user?->resetPasswordAttempts()
+                    ->where('codigo', $code)
+                    ->where('status', ResetPasswordAttempt::STATUS_VALIDATED)
+                    ->latest('id')
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($user === null || $attempt === null) {
+                    Log::warning('Password reset failed: no matching validated attempt.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return false;
+                }
+
+                $user->password = $password;
+                $user->failed_login_attempts = 0;
+                $user->last_failed_login_at = null;
+                $user->locked_until = null;
+                $user->save();
+                $user->tokens()->delete();
+
+                $user->resetPasswordAttempts()
+                    ->whereKeyNot($attempt->getKey())
+                    ->whereIn('status', [
+                        ResetPasswordAttempt::STATUS_PENDING,
+                        ResetPasswordAttempt::STATUS_VALIDATED,
+                    ])
+                    ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+
+                $attempt->update([
+                    'status' => ResetPasswordAttempt::STATUS_USED,
+                ]);
+
+                return true;
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to reset user password.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+    }
+
+    private function generateCode(): string
+    {
+        return str_pad((string) random_int(0, 9999), 4, '0', STR_PAD_LEFT);
+    }
+
+    private function emailFingerprint(string $email): string
+    {
+        return substr(hash('sha256', strtolower(trim($email))), 0, 12);
+    }
+}

app/Domains/Auth/routes/adminapp.php

@@ -0,0 +1,8 @@
+<?php
+
+use App\Domains\Auth\Controllers\AdminAppLoginController;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('v1/adminapp')->group(function (): void {
+    Route::post('login', AdminAppLoginController::class)->middleware('throttle:login');
+});

app/Domains/Auth/routes/api.php

@@ -1,12 +1,27 @@
 <?php
 
+use App\Domains\Auth\Controllers\CreateResetPasswordAttemptController;
+use App\Domains\Auth\Controllers\GoogleTokenExchangeController;
 use App\Domains\Auth\Controllers\LoginController;
 use App\Domains\Auth\Controllers\LogoutController;
 use App\Domains\Auth\Controllers\MeController;
 use App\Domains\Auth\Controllers\RegisterController;
+use App\Domains\Auth\Controllers\ResetPasswordController;
+use App\Domains\Auth\Controllers\UpdateProfileController;
+use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::post('/register', RegisterController::class);
-Route::post('/login', LoginController::class);
+Route::post('/login', LoginController::class)->middleware('throttle:login');
+Route::post('/password/reset-attempts', CreateResetPasswordAttemptController::class)
+    ->middleware('throttle:5,1');
+Route::post('/password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
+    ->middleware('throttle:10,1');
+Route::post('/password/reset', ResetPasswordController::class)
+    ->middleware('throttle:5,1');
+Route::post('/auth/google/exchange', GoogleTokenExchangeController::class);
 Route::middleware('auth:sanctum')->post('/logout', LogoutController::class);
 Route::middleware('auth:sanctum')->get('/me', MeController::class);
+Route::middleware('auth:sanctum')->put('/me', UpdateProfileController::class);
+
+require __DIR__.'/adminapp.php';

app/Domains/Authorization/Enums/RoleCode.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Authorization\Enums;
+
+enum RoleCode: string
+{
+    case Admin = 'admin';
+    case AdminApp = 'adminapp';
+    case User = 'user';
+}

app/Domains/Authorization/Models/Permission.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Authorization\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Permission extends Model
+{
+    protected $table = 'permisos';
+
+    protected $fillable = [
+        'codigo',
+        'nombre',
+        'descripcion',
+    ];
+
+    /**
+     * @return BelongsToMany<Role, $this>
+     */
+    public function roles(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Role::class,
+            'roles_permisos',
+            'codigo_permiso',
+            'rol_codigo',
+            'codigo',
+            'codigo'
+        )->withTimestamps();
+    }
+}

app/Domains/Authorization/Models/Role.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Domains\Authorization\Models;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Menu\Models\Menu;
+use App\Domains\Menu\Models\MenuRole;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Role extends Model
+{
+    protected $table = 'roles';
+
+    protected $fillable = [
+        'codigo',
+        'nombre',
+        'descripcion',
+    ];
+
+    /**
+     * @return BelongsToMany<Permission, $this>
+     */
+    public function permissions(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Permission::class,
+            'roles_permisos',
+            'rol_codigo',
+            'codigo_permiso',
+            'codigo',
+            'codigo'
+        )->withTimestamps();
+    }
+
+    /**
+     * @return HasMany<User, $this>
+     */
+    public function users(): HasMany
+    {
+        return $this->hasMany(User::class, 'rol_codigo', 'codigo');
+    }
+
+    /**
+     * @return BelongsToMany<Menu, $this>
+     */
+    public function menus(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Menu::class,
+            'roles_menues',
+            'rol_codigo',
+            'menu_codigo',
+            'codigo',
+            'code'
+        )->using(MenuRole::class);
+    }
+}

app/Domains/Authorization/Models/RolePermission.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Authorization\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class RolePermission extends Model
+{
+    protected $table = 'roles_permisos';
+
+    protected $fillable = [
+        'codigo_permiso',
+        'rol_codigo',
+    ];
+
+    /**
+     * @return BelongsTo<Permission, $this>
+     */
+    public function permission(): BelongsTo
+    {
+        return $this->belongsTo(Permission::class, 'codigo_permiso', 'codigo');
+    }
+
+    /**
+     * @return BelongsTo<Role, $this>
+     */
+    public function role(): BelongsTo
+    {
+        return $this->belongsTo(Role::class, 'rol_codigo', 'codigo');
+    }
+}

app/Domains/Cart/Controllers/CartController.php

@@ -2,11 +2,11 @@
 
 namespace App\Domains\Cart\Controllers;
 
+use App\Domains\Cart\Models\CartItem;
 use App\Domains\Cart\Requests\AddCartItemRequest;
 use App\Domains\Cart\Requests\UpdateCartItemQuantityRequest;
 use App\Domains\Cart\Resources\CartResource;
 use App\Domains\Cart\Services\CartService;
-use App\Domains\Catalog\Models\ProductVariant;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
@@ -16,8 +16,7 @@ class CartController extends Controller
 {
     public function __construct(
         protected CartService $cartService,
-    ) {
-    }
+    ) {}
 
     public function show(Request $request, Tenant $tenant): CartResource
     {
@@ -29,12 +28,18 @@ class CartController extends Controller
         $result = $this->cartService->addItem(
             $tenant,
             $request,
-            (int) $request->validated('product_variant_id'),
+            (int) $request->validated('catalog_item_id'),
+            $request->validated('variant_id') !== null
+                ? (int) $request->validated('variant_id')
+                : null,
             (int) $request->validated('cantidad'),
         );
 
         $response = CartResource::make($result['cart'])
-            ->additional(['message' => 'Producto agregado al carrito.'])
+            ->additional([
+                'code' => 'cart.item_added',
+                'message' => __('api.cart.item_added'),
+            ])
             ->response();
 
         if ($result['guest_token'] !== null) {
@@ -47,22 +52,28 @@ class CartController extends Controller
     public function updateItemQuantity(
         UpdateCartItemQuantityRequest $request,
         Tenant $tenant,
-        ProductVariant $productVariant,
+        CartItem $cartItem,
     ): CartResource {
         return CartResource::make(
             $this->cartService->updateItemQuantity(
                 $tenant,
                 $request,
-                $productVariant->getKey(),
+                $cartItem->getKey(),
                 (int) $request->validated('cantidad'),
             )
-        )->additional(['message' => 'Cantidad de producto actualizada.']);
+        )->additional([
+            'code' => 'cart.quantity_updated',
+            'message' => __('api.cart.quantity_updated'),
+        ]);
     }
 
-    public function removeItem(Request $request, Tenant $tenant, ProductVariant $productVariant): CartResource
+    public function removeItem(Request $request, Tenant $tenant, CartItem $cartItem): CartResource
     {
         return CartResource::make(
-            $this->cartService->removeItem($tenant, $request, $productVariant->getKey())
-        )->additional(['message' => 'Producto eliminado del carrito.']);
+            $this->cartService->removeItem($tenant, $request, $cartItem->getKey())
+        )->additional([
+            'code' => 'cart.item_removed',
+            'message' => __('api.cart.item_removed'),
+        ]);
     }
 }

app/Domains/Cart/Middleware/MergeGuestCartMiddleware.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Domains\Cart\Middleware;
-
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Tenant\Models\Tenant;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cookie;
-use Symfony\Component\HttpFoundation\Response;
-
-class MergeGuestCartMiddleware
-{
-    public function handle(Request $request, Closure $next): Response
-    {
-        $guestToken = $request->cookie('guest_token');
-
-        // Resolve authenticated user optionally (from default guard or sanctum guard)
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-        $userId = $user?->getKey();
-
-        \Illuminate\Support\Facades\Log::info('MergeGuestCartMiddleware processed', [
-            'user_id' => $userId,
-            'guest_token' => $guestToken,
-        ]);
-
-        if ($user !== null && is_string($guestToken) && $guestToken !== '') {
-            $tenantParam = $request->route('tenant');
-            $tenantCodigo = null;
-
-            if ($tenantParam instanceof Tenant) {
-                $tenantCodigo = $tenantParam->codigo;
-            } elseif (is_string($tenantParam)) {
-                $tenantCodigo = $tenantParam;
-            }
-
-            if ($tenantCodigo !== null) {
-                $guestCart = Cart::query()
-                    ->where('tenant_codigo', $tenantCodigo)
-                    ->where('guest_token', $guestToken)
-                    ->first();
-
-                if ($guestCart !== null && $guestCart->items()->exists()) {
-                    $userCart = Cart::query()
-                        ->where('tenant_codigo', $tenantCodigo)
-                        ->where('user_id', $userId)
-                        ->first();
-
-                    if ($userCart !== null) {
-                        $userCart->delete();
-                    }
-
-                    $guestCart->update([
-                        'user_id' => $userId,
-                        'guest_token' => null,
-                    ]);
-                }
-            }
-        }
-
-        $response = $next($request);
-
-        if ($user !== null && is_string($guestToken) && $guestToken !== '') {
-            // Remove the cookie from the response since the user is authenticated.
-            if (method_exists($response, 'withCookie')) {
-                $response->withCookie(Cookie::forget('guest_token'));
-            }
-        }
-
-        return $response;
-    }
-}

app/Domains/Cart/Models/Cart.php

@@ -3,7 +3,10 @@
 namespace App\Domains\Cart\Models;
 
 use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -63,40 +66,46 @@ class Cart extends Model
     {
         $items = $this->relationLoaded('items')
             ? $this->getRelation('items')
-            : $this->items()->with('variant.product')->get();
+            : $this->items()->with(['catalogItem', 'variant'])->get();
 
         return (float) $items->reduce(
-            fn (float $carry, $item): float => $carry + ((float) ($item->variant?->product?->precio ?? 0) * $item->cantidad),
+            fn (float $carry, CartItem $item): float => $carry
+                + (($item->selectedItem()?->getPrice() ?? 0) * $item->cantidad),
             0.0,
         );
     }
 
-    public function addItem(int $productVariantId, int $quantity): CartItem
+    public function addItem(int $catalogItemId, ?int $variantId, int $quantity): CartItem
     {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
-                'cantidad' => 'La cantidad debe ser mayor a cero.',
+                'cantidad' => __('api.cart.positive_quantity'),
             ]);
         }
 
-        return DB::transaction(function () use ($productVariantId, $quantity): CartItem {
-            $variant = $this->resolveScopedVariant($productVariantId, true);
+        return DB::transaction(function () use ($catalogItemId, $variantId, $quantity): CartItem {
+            self::query()->whereKey($this->getKey())->lockForUpdate()->firstOrFail();
+            $selectedItem = $this->resolveScopedItem($catalogItemId, $variantId, true);
+            $inventoryService = app(CatalogInventoryService::class);
+            $availableQuantity = $inventoryService->availableQuantity($selectedItem);
 
-            if ($variant->stock_tecnico < $quantity) {
+            if ($availableQuantity !== null && $availableQuantity < $quantity) {
                 throw ValidationException::withMessages([
-                    'cantidad' => "Stock insuficiente para la variante solicitada. Maximo disponible: {$variant->stock_tecnico}.",
+                    'cantidad' => __('api.cart.insufficient_stock', ['max' => $availableQuantity]),
                 ]);
             }
 
             /** @var CartItem|null $item */
             $item = $this->items()
-                ->where('producto_variante_id', $variant->getKey())
+                ->where('catalog_item_id', $catalogItemId)
+                ->where('variant_id', $variantId)
                 ->lockForUpdate()
                 ->first();
 
             if ($item === null) {
                 $item = $this->items()->create([
-                    'producto_variante_id' => $variant->getKey(),
+                    'catalog_item_id' => $catalogItemId,
+                    'variant_id' => $variantId,
                     'cantidad' => $quantity,
                 ]);
             } else {
@@ -104,34 +113,40 @@ class Cart extends Model
                 $item->save();
             }
 
-            $variant->incrementReservedStock($quantity);
+            $inventoryService->reserve($selectedItem, $quantity);
 
             return $item->fresh();
         });
     }
 
-    public function updateItem(int $productVariantId, int $quantity): CartItem
+    public function updateItem(int $cartItemId, int $quantity): CartItem
     {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
-                'cantidad' => 'La cantidad debe ser mayor a cero.',
+                'cantidad' => __('api.cart.positive_quantity'),
             ]);
         }
 
-        return DB::transaction(function () use ($productVariantId, $quantity): CartItem {
+        return DB::transaction(function () use ($cartItemId, $quantity): CartItem {
             /** @var CartItem $item */
             $item = $this->items()
-                ->where('producto_variante_id', $productVariantId)
+                ->where('id', $cartItemId)
                 ->lockForUpdate()
                 ->firstOrFail();
 
-            $variant = $this->resolveScopedVariant($productVariantId, true);
+            $selectedItem = $this->resolveScopedItem(
+                $item->catalog_item_id,
+                $item->variant_id,
+                true,
+            );
+            $inventoryService = app(CatalogInventoryService::class);
             $delta = $quantity - $item->cantidad;
+            $availableQuantity = $inventoryService->availableQuantity($selectedItem);
 
-            if ($delta > 0 && $variant->stock_tecnico < $delta) {
-                $maxAvailable = $variant->stock_tecnico + $item->cantidad;
+            if ($delta > 0 && $availableQuantity !== null && $availableQuantity < $delta) {
+                $maxAvailable = $availableQuantity + $item->cantidad;
                 throw ValidationException::withMessages([
-                    'cantidad' => "El máximo que se puede agregar es {$maxAvailable}.",
+                    'cantidad' => __('api.cart.max_quantity', ['max' => $maxAvailable]),
                 ]);
             }
 
@@ -139,49 +154,116 @@ class Cart extends Model
             $item->save();
 
             if ($delta > 0) {
-                $variant->incrementReservedStock($delta);
+                $inventoryService->reserve($selectedItem, $delta);
             }
 
             if ($delta < 0) {
-                $variant->decrementReservedStock(abs($delta));
+                $inventoryService->release($selectedItem, abs($delta));
             }
 
             return $item->fresh();
         });
     }
 
-    public function removeItem(int $productVariantId): void
+    public function removeItem(int $cartItemId): void
     {
-        DB::transaction(function () use ($productVariantId): void {
+        DB::transaction(function () use ($cartItemId): void {
             /** @var CartItem $item */
             $item = $this->items()
-                ->where('producto_variante_id', $productVariantId)
+                ->where('id', $cartItemId)
                 ->lockForUpdate()
                 ->firstOrFail();
 
-            $variant = $this->resolveScopedVariant($productVariantId, true);
-            $variant->decrementReservedStock($item->cantidad);
+            $selectedItem = $this->resolveScopedItem(
+                $item->catalog_item_id,
+                $item->variant_id,
+                true,
+            );
+            app(CatalogInventoryService::class)->release(
+                $selectedItem,
+                $item->cantidad,
+            );
             $item->delete();
         });
     }
 
-    protected function resolveScopedVariant(int $productVariantId, bool $lockForUpdate = false): ProductVariant
+    protected function resolveScopedItem(
+        int $catalogItemId,
+        ?int $variantId,
+        bool $lockForUpdate = false,
+    ): CatalogItem|Variant {
+        $catalogItemQuery = CatalogItem::query()
+            ->whereKey($catalogItemId)
+            ->where('tenant_code', $this->tenant_codigo);
+
+        if ($lockForUpdate) {
+            $catalogItemQuery->lockForUpdate();
+        }
+
+        $catalogItem = $catalogItemQuery->first();
+
+        if ($catalogItem === null) {
+            throw new NotFoundHttpException('Catalog item not found for tenant.');
+        }
+
+        if ($catalogItem->isBundle()) {
+            if ($variantId !== null) {
+                throw ValidationException::withMessages([
+                    'variant_id' => __('api.cart.bundle_variant_forbidden'),
+                ]);
+            }
+
+            if (! $catalogItem->bundleComponents()->exists()) {
+                throw ValidationException::withMessages([
+                    'catalog_item_id' => __('api.cart.empty_bundle'),
+                ]);
+            }
+
+            return $catalogItem;
+        }
+
+        if ($variantId === null) {
+            if ($catalogItem->inventory_id === null) {
+                throw ValidationException::withMessages([
+                    'variant_id' => __('api.cart.variant_required'),
+                ]);
+            }
+
+            $inventory = $this->resolveInventory($catalogItem->inventory_id, $lockForUpdate);
+            $catalogItem->setRelation('inventory', $inventory);
+
+            return $catalogItem;
+        }
+
+        $variantQuery = Variant::query()
+            ->whereKey($variantId)
+            ->where('catalog_item_id', $catalogItem->id);
+
+        if ($lockForUpdate) {
+            $variantQuery->lockForUpdate();
+        }
+
+        $variant = $variantQuery->first();
+
+        if ($variant === null) {
+            throw new NotFoundHttpException('Variant not found for catalog item.');
+        }
+
+        $inventory = $this->resolveInventory($variant->inventory_id, $lockForUpdate);
+        $variant->setRelation('catalogItem', $catalogItem);
+        $variant->setRelation('inventory', $inventory);
+
+        return $variant;
+    }
+
+    protected function resolveInventory(int $inventoryId, bool $lockForUpdate): Inventory
     {
-        $query = ProductVariant::query()
-            ->whereKey($productVariantId)
-            ->whereHas('product', fn ($query) => $query->where('tenant_codigo', $this->tenant_codigo));
+        $query = Inventory::query()->whereKey($inventoryId);
 
         if ($lockForUpdate) {
             $query->lockForUpdate();
         }
 
-        /** @var ProductVariant|null $variant */
-        $variant = $query->first();
-
-        if ($variant === null) {
-            throw new NotFoundHttpException('Product variant not found for tenant.');
-        }
-
-        return $variant;
+        return $query->firstOrFail();
     }
 }

app/Domains/Cart/Models/CartItem.php

@@ -2,7 +2,8 @@
 
 namespace App\Domains\Cart\Models;
 
-use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -10,7 +11,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 #[Fillable([
     'cart_id',
-    'producto_variante_id',
+    'catalog_item_id',
+    'variant_id',
     'cantidad',
 ])]
 class CartItem extends Model
@@ -23,7 +25,8 @@ class CartItem extends Model
     {
         return [
             'cart_id' => 'integer',
-            'producto_variante_id' => 'integer',
+            'catalog_item_id' => 'integer',
+            'variant_id' => 'integer',
             'cantidad' => 'integer',
         ];
     }
@@ -36,11 +39,20 @@ class CartItem extends Model
         return $this->belongsTo(Cart::class, 'cart_id');
     }
 
-    /**
-     * @return BelongsTo<ProductVariant, $this>
-     */
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class);
+    }
+
+    /** @return BelongsTo<Variant, $this> */
     public function variant(): BelongsTo
     {
-        return $this->belongsTo(ProductVariant::class, 'producto_variante_id');
+        return $this->belongsTo(Variant::class);
+    }
+
+    public function selectedItem(): CatalogItem|Variant|null
+    {
+        return $this->variant ?? $this->catalogItem;
     }
 }

app/Domains/Cart/Requests/AddCartItemRequest.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Cart\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class AddCartItemRequest extends FormRequest
 {
@@ -16,8 +17,24 @@ class AddCartItemRequest extends FormRequest
      */
     public function rules(): array
     {
+        $tenantCode = $this->route('tenant')?->codigo;
+
         return [
-            'product_variant_id' => ['required', 'integer'],
+            'catalog_item_id' => [
+                'required',
+                'integer',
+                Rule::exists('catalog_items', 'id')->where(
+                    fn ($query) => $query->where('tenant_code', $tenantCode)
+                ),
+            ],
+            'variant_id' => [
+                'sometimes',
+                'nullable',
+                'integer',
+                Rule::exists('variantes', 'id')->where(
+                    fn ($query) => $query->where('catalog_item_id', $this->input('catalog_item_id'))
+                ),
+            ],
             'cantidad' => ['required', 'integer', 'min:1'],
         ];
     }

app/Domains/Cart/Requests/UpdateCartItemQuantityRequest.php

@@ -18,6 +18,8 @@ class UpdateCartItemQuantityRequest extends FormRequest
     {
         return [
             'cantidad' => ['required', 'integer', 'min:1'],
+            'catalog_item_id' => ['prohibited'],
+            'variant_id' => ['prohibited'],
         ];
     }
 }

app/Domains/Cart/Resources/CartItemResource.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Cart\Resources;
 
+use App\Domains\Cart\Models\CartItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Cart\Models\CartItem
+ * @mixin CartItem
  */
 class CartItemResource extends JsonResource
 {
@@ -15,42 +16,25 @@ class CartItemResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
-        $variant = $this->variant;
-        $product = $variant?->product;
-
-        $attributesText = '';
-        if ($variant && $variant->relationLoaded('definitions')) {
-            $attributesText = $variant->definitions
-                ->map(function ($definition) {
-                    $attrName = $definition->productAttribute?->attribute?->nombre;
-                    $value = $definition->value;
-                    return $attrName ? "{$attrName}: {$value}" : $value;
-                })
-                ->filter()
-                ->implode(', ');
-        }
-
-        $productName = $product?->nombre;
-        if ($productName && $attributesText !== '') {
-            $productName .= " ({$attributesText})";
-        }
-
+        $selectedItem = $this->selectedItem();
         $imageUrl = null;
-        if ($variant && $variant->relationLoaded('attachments')) {
-            $firstAttachment = $variant->attachments->first();
-            if ($firstAttachment) {
-                $imageUrl = $firstAttachment->getTemporaryUrl(1440);
+
+        if ($selectedItem?->relationLoaded('attachments')) {
+            $imageUrl = $selectedItem->attachments->first()?->getTemporaryUrl(1440);
         }
+
+        if ($imageUrl === null && $this->catalogItem?->relationLoaded('attachments')) {
+            $imageUrl = $this->catalogItem->attachments->first()?->getTemporaryUrl(1440);
         }
 
         return [
             'id' => $this->id,
             'cantidad' => $this->cantidad,
-            'precio_unitario' => $this->formatMoney($product?->precio),
-            'product_id' => $product?->id,
-            'product_variant_id' => $this->producto_variante_id,
-            'product' => $product === null ? null : [
-                'nombre' => $productName,
+            'precio_unitario' => $this->formatMoney($selectedItem?->getPrice()),
+            'catalog_item_id' => $this->catalog_item_id,
+            'variant_id' => $this->variant_id,
+            'product' => $selectedItem === null ? null : [
+                'nombre' => $selectedItem->getName(),
                 'imagen' => $imageUrl,
             ],
         ];

app/Domains/Cart/Resources/CartResource.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Cart\Resources;
 
+use App\Domains\Cart\Models\Cart;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Cart\Models\Cart
+ * @mixin Cart
  */
 class CartResource extends JsonResource
 {
@@ -20,7 +21,8 @@ class CartResource extends JsonResource
             : collect();
 
         $subtotal = $items->reduce(
-            fn (float $carry, $item): float => $carry + ((float) ($item->variant?->product?->precio ?? 0) * $item->cantidad),
+            fn (float $carry, $item): float => $carry
+                + ((float) ($item->selectedItem()?->getPrice() ?? 0) * $item->cantidad),
             0.0,
         );
 

app/Domains/Cart/Services/CartService.php

@@ -2,10 +2,11 @@
 
 namespace App\Domains\Cart\Services;
 
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Auth\Models\User;
+use App\Domains\Cart\Models\Cart;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -32,12 +33,17 @@ class CartService
     /**
      * @return array{cart: Cart, guest_token: ?string}
      */
-    public function addItem(Tenant $tenant, Request $request, int $productVariantId, int $quantity): array
-    {
+    public function addItem(
+        Tenant $tenant,
+        Request $request,
+        int $catalogItemId,
+        ?int $variantId,
+        int $quantity,
+    ): array {
         $resolvedIdentity = $this->resolveIdentity($request, true);
         $identity = $resolvedIdentity['identity'];
         $cart = $this->findOrCreateCart($tenant, $identity);
-        $cart->addItem($productVariantId, $quantity);
+        $cart->addItem($catalogItemId, $variantId, $quantity);
 
         return [
             'cart' => $this->loadCart($cart),
@@ -45,20 +51,20 @@ class CartService
         ];
     }
 
-    public function updateItemQuantity(Tenant $tenant, Request $request, int $productVariantId, int $quantity): Cart
+    public function updateItemQuantity(Tenant $tenant, Request $request, int $cartItemId, int $quantity): Cart
     {
         $identity = $this->requireIdentity($request);
         $cart = $this->findCartOrFail($tenant, $identity);
-        $cart->updateItem($productVariantId, $quantity);
+        $cart->updateItem($cartItemId, $quantity);
 
         return $this->loadCart($cart);
     }
 
-    public function removeItem(Tenant $tenant, Request $request, int $productVariantId): Cart
+    public function removeItem(Tenant $tenant, Request $request, int $cartItemId): Cart
     {
         $identity = $this->requireIdentity($request);
         $cart = $this->findCartOrFail($tenant, $identity);
-        $cart->removeItem($productVariantId);
+        $cart->removeItem($cartItemId);
 
         return $this->loadCart($cart);
     }
@@ -93,9 +99,11 @@ class CartService
     protected function loadCart(Cart $cart): Cart
     {
         return $cart->fresh()->load([
-            'items.variant.product',
-            'items.variant.definitions.productAttribute.attribute',
+            'items.catalogItem.attachments',
+            'items.catalogItem.inventory',
             'items.variant.attachments',
+            'items.variant.inventory',
+            'items.variant.definitions.itemAttribute.attribute',
         ]);
     }
 
@@ -104,7 +112,7 @@ class CartService
      */
     protected function resolveIdentity(Request $request, bool $generateGuestToken = false): ?array
     {
-        $user = $request->user() ?? \Illuminate\Support\Facades\Auth::guard('sanctum')->user();
+        $user = $request->user() ?? Auth::guard('sanctum')->user();
 
         if ($user instanceof User) {
             return [
@@ -164,6 +172,7 @@ class CartService
     {
         return Cart::query()
             ->where('tenant_codigo', $tenant->codigo)
+            ->where('status', 'active')
             ->when(
                 $identity['user_id'] !== null,
                 fn ($query) => $query->where('user_id', $identity['user_id']),
@@ -191,7 +200,10 @@ class CartService
      */
     protected function findOrCreateCart(Tenant $tenant, array $identity): Cart
     {
-        $attributes = ['tenant_codigo' => $tenant->codigo];
+        $attributes = [
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'active',
+        ];
 
         if ($identity['user_id'] !== null) {
             $attributes['user_id'] = $identity['user_id'];
@@ -199,7 +211,6 @@ class CartService
             $attributes['guest_token'] = $identity['guest_token'];
         }
 
-        return Cart::query()->firstOrCreate($attributes, ['status' => 'active']);
+        return Cart::query()->firstOrCreate($attributes);
     }
-
 }

app/Domains/Cart/Services/GuestCartMergeService.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Cart\Services;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Cart\Models\Cart;
+use Illuminate\Support\Facades\DB;
+
+class GuestCartMergeService
+{
+    public function merge(string $tenantCodigo, User $user, ?string $guestToken): void
+    {
+        if ($guestToken === null || $guestToken === '') {
+            return;
+        }
+
+        DB::transaction(function () use ($tenantCodigo, $user, $guestToken): void {
+            $guestCart = Cart::query()
+                ->where('tenant_codigo', $tenantCodigo)
+                ->where('guest_token', $guestToken)
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($guestCart === null || ! $guestCart->items()->exists()) {
+                return;
+            }
+
+            $userCart = Cart::query()
+                ->where('tenant_codigo', $tenantCodigo)
+                ->where('user_id', $user->getKey())
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($userCart !== null) {
+                $userCart->update([
+                    'status' => 'converted',
+                ]);
+                $userCart->delete();
+            }
+
+            $guestCart->update([
+                'user_id' => $user->getKey(),
+                'guest_token' => null,
+            ]);
+        });
+    }
+}

app/Domains/Cart/routes/api.php

@@ -4,10 +4,9 @@ use App\Domains\Cart\Controllers\CartController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')
-    ->middleware(\App\Domains\Cart\Middleware\MergeGuestCartMiddleware::class)
     ->group(function (): void {
         Route::get('cart', [CartController::class, 'show']);
         Route::post('cart/items', [CartController::class, 'addItem']);
-        Route::patch('cart/items/{productVariant}', [CartController::class, 'updateItemQuantity']);
-        Route::delete('cart/items/{productVariant}', [CartController::class, 'removeItem']);
+        Route::patch('cart/items/{cartItem}', [CartController::class, 'updateItemQuantity']);
+        Route::delete('cart/items/{cartItem}', [CartController::class, 'removeItem']);
     });

app/Domains/Catalog/Controllers/AttributeController.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Requests\StoreAttributeRequest;
-use App\Domains\Catalog\Requests\UpdateAttributeRequest;
-use App\Domains\Catalog\Resources\AttributeResource;
-use App\Domains\Catalog\Services\ProductService;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\DB;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class AttributeController extends Controller
-{
-    public function index(Tenant $tenant): JsonResponse
-    {
-        $query = Attribute::query()
-            ->where('tenant_codigo', $tenant->codigo)
-            ->with('options')
-            ->latest();
-
-        return AttributeResource::collection($query->paginateFromRequest())->response();
-    }
-
-    public function store(StoreAttributeRequest $request, Tenant $tenant): JsonResponse
-    {
-        $attribute = ProductService::createAttribute($tenant, $request->validated());
-
-        return AttributeResource::make($attribute)->response()->setStatusCode(201);
-    }
-
-    public function show(Tenant $tenant, Attribute $attribute): AttributeResource
-    {
-        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
-
-        return AttributeResource::make($attribute->load('options'));
-    }
-
-    public function update(UpdateAttributeRequest $request, Tenant $tenant, Attribute $attribute): AttributeResource
-    {
-        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
-        $attribute = ProductService::updateAttribute($attribute, $request->validated());
-
-        return AttributeResource::make($attribute);
-    }
-
-    public function destroy(Tenant $tenant, Attribute $attribute): Response
-    {
-        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
-        ProductService::deleteAttribute($attribute);
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedAttribute(Tenant $tenant, Attribute $attribute): Attribute
-    {
-        if ($attribute->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Attribute not found for tenant.');
-        }
-
-        return $attribute;
-    }
-}

app/Domains/Catalog/Controllers/BrandController.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Catalog\Requests\StoreBrandRequest;
-use App\Domains\Catalog\Requests\UpdateBrandRequest;
-use App\Domains\Catalog\Resources\BrandResource;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class BrandController extends Controller
-{
-    public function index(Tenant $tenant): JsonResponse
-    {
-        return BrandResource::collection(
-            Brand::query()->where('tenant_codigo', $tenant->codigo)->orderByDesc('id')->paginateFromRequest()
-        )->response();
-    }
-
-    public function store(StoreBrandRequest $request, Tenant $tenant): JsonResponse
-    {
-        $brand = Brand::query()->create([
-            ...$request->validated(),
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-
-        return BrandResource::make($brand)->response()->setStatusCode(201);
-    }
-
-    public function show(Tenant $tenant, Brand $marca): BrandResource
-    {
-        $marca = $this->resolveScopedBrand($tenant, $marca);
-
-        return BrandResource::make($marca);
-    }
-
-    public function update(UpdateBrandRequest $request, Tenant $tenant, Brand $marca): BrandResource
-    {
-        $marca = $this->resolveScopedBrand($tenant, $marca);
-        $marca->update($request->validated());
-
-        return BrandResource::make($marca);
-    }
-
-    public function destroy(Tenant $tenant, Brand $marca): Response
-    {
-        $marca = $this->resolveScopedBrand($tenant, $marca);
-        $marca->delete();
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedBrand(Tenant $tenant, Brand $brand): Brand
-    {
-        if ($brand->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Brand not found for tenant.');
-        }
-
-        return $brand;
-    }
-}

app/Domains/Catalog/Controllers/CatalogController.php

@@ -0,0 +1,186 @@
+<?php
+
+namespace App\Domains\Catalog\Controllers;
+
+use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Category;
+use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Catalog\Models\FeaturedItem;
+use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
+use App\Domains\Catalog\Requests\CategoryPageRequest;
+use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
+use App\Domains\Catalog\Requests\SearchCatalogItemsRequest;
+use App\Domains\Catalog\Requests\StoreCatalogItemRequest;
+use App\Domains\Catalog\Resources\CatalogFeaturedGroupResource;
+use App\Domains\Catalog\Resources\CatalogFeaturedItemResource;
+use App\Domains\Catalog\Resources\CatalogItemDetailResource;
+use App\Domains\Catalog\Resources\CatalogItemResource;
+use App\Domains\Catalog\Resources\CatalogSearchItemResource;
+use App\Domains\Catalog\Services\CatalogService;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class CatalogController extends Controller
+{
+    private const ITEMS_PER_PAGE = 12;
+
+    public function index(Tenant $tenant): JsonResponse
+    {
+        $featuredGroups = FeaturedGroup::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->orderBy('group_order')
+            ->get();
+
+        return response()->json($featuredGroups->map(
+            fn (FeaturedGroup $featuredGroup): array => (new CatalogFeaturedGroupResource(
+                $featuredGroup,
+                $this->featuredItemsResponse($featuredGroup, 1),
+            ))->resolve()
+        ));
+    }
+
+    public function search(
+        SearchCatalogItemsRequest $request,
+        Tenant $tenant,
+        CatalogService $catalogService,
+    ): AnonymousResourceCollection {
+        return CatalogSearchItemResource::collection(
+            $catalogService->search(
+                $tenant,
+                $request->validated('q'),
+                $tenant->search_items_per_page,
+                (int) $request->validated('page', 1),
+            )
+        );
+    }
+
+    public function category(
+        CategoryPageRequest $request,
+        Tenant $tenant,
+        Category $category,
+        CatalogService $catalogService,
+    ): AnonymousResourceCollection {
+        abort_unless($category->tenant_code === $tenant->codigo, 404);
+
+        return CatalogSearchItemResource::collection(
+            $catalogService->categoryItems(
+                $tenant,
+                $category,
+                $tenant->search_items_per_page,
+                (int) $request->validated('page', 1),
+            )
+        )->additional([
+            'category' => [
+                'id' => $category->id,
+                'nombre' => $category->nombre,
+                'categoria_id' => $category->categoria_id,
+            ],
+            'layout' => $tenant->search_product_layout->value,
+            'group_layout' => $tenant->search_group_layout->value,
+        ]);
+    }
+
+    public function featuredGroupItems(
+        FeaturedGroupPageRequest $request,
+        Tenant $tenant,
+        FeaturedGroup $featuredGroup,
+    ): JsonResponse {
+        abort_unless($featuredGroup->tenant_code === $tenant->codigo, 404);
+
+        $page = (int) $request->validated('page', 1);
+
+        return response()->json($this->featuredItemsResponse($featuredGroup, $page));
+    }
+
+    public function show(
+        CatalogItemDetailRequest $request,
+        Tenant $tenant,
+        CatalogItem $catalogItem,
+        CatalogService $catalogService,
+    ): CatalogItemDetailResource {
+        abort_unless($catalogItem->tenant_code === $tenant->codigo, 404);
+
+        $variantId = $request->validated('variant_id');
+
+        return CatalogItemDetailResource::make(
+            $catalogService->getDetail(
+                $catalogItem,
+                $variantId === null ? null : (int) $variantId,
+            )
+        );
+    }
+
+    public function store(
+        StoreCatalogItemRequest $request,
+        Tenant $tenant,
+        CatalogService $catalogService,
+    ): JsonResponse {
+        $catalogItem = $catalogService->create([
+            ...$request->validated(),
+            'tenant_code' => $tenant->codigo,
+        ]);
+
+        return CatalogItemResource::make($catalogItem)
+            ->response()
+            ->setStatusCode(201);
+    }
+
+    /** @return array<array-key, mixed> */
+    private function featuredItemsResponse(FeaturedGroup $featuredGroup, int $page): array
+    {
+        if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
+            $featuredItems = $this->featuredItemsQuery($featuredGroup)->get();
+
+            $featuredItems->each(
+                fn ($featuredItem) => $featuredItem->setRelation('featuredGroup', $featuredGroup)
+            );
+
+            return CatalogFeaturedItemResource::collection($featuredItems)->resolve();
+        }
+
+        $paginator = $this->paginateFeaturedItems($featuredGroup, $page);
+
+        $paginator->getCollection()->each(
+            fn ($featuredItem) => $featuredItem->setRelation('featuredGroup', $featuredGroup)
+        );
+
+        return CatalogFeaturedItemResource::collection($paginator)
+            ->response()
+            ->getData(true);
+    }
+
+    private function paginateFeaturedItems(
+        FeaturedGroup $featuredGroup,
+        int $page,
+    ): LengthAwarePaginator {
+        $paginator = $this->featuredItemsQuery($featuredGroup)->paginate(
+            perPage: self::ITEMS_PER_PAGE,
+            pageName: 'page',
+            page: $page,
+        );
+
+        return $paginator->withPath(route('catalog.featured-groups.items.index', [
+            'tenant' => $featuredGroup->tenant_code,
+            'featuredGroup' => $featuredGroup->id,
+        ]));
+    }
+
+    /** @return HasMany<FeaturedItem, FeaturedGroup> */
+    private function featuredItemsQuery(FeaturedGroup $featuredGroup): HasMany
+    {
+        return $featuredGroup->featuredItems()->with([
+            'catalogItem.inventory',
+            'catalogItem.attachments',
+            'catalogItem.variants.inventory',
+            'catalogItem.variants.attachments',
+            'catalogItem.variants.definitions.itemAttribute.attribute',
+            'catalogItem.bundleComponents.catalogItem',
+            'catalogItem.bundleComponents.variant.catalogItem',
+        ]);
+    }
+}

app/Domains/Catalog/Controllers/CategoryController.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Requests\StoreCategoryRequest;
-use App\Domains\Catalog\Requests\UpdateCategoryRequest;
-use App\Domains\Catalog\Resources\CategoryResource;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class CategoryController extends Controller
-{
-    public function index(Tenant $tenant): JsonResponse
-    {
-        return CategoryResource::collection(
-            Category::query()
-                ->where(function ($query) use ($tenant): void {
-                    $query
-                        ->where('tenant_code', $tenant->codigo)
-                        ->orWhereNull('tenant_code');
-                })
-                ->with(['parent', 'subCategories', 'tenant'])
-                ->orderByDesc('id')
-                ->get()
-        )->response();
-    }
-
-    public function store(StoreCategoryRequest $request, Tenant $tenant): JsonResponse
-    {
-        $category = Category::query()->create([
-            ...$request->validated(),
-            'tenant_code' => $tenant->codigo,
-        ]);
-
-        return CategoryResource::make($category->load(['parent', 'subCategories', 'tenant']))
-            ->response()
-            ->setStatusCode(201);
-    }
-
-    public function show(Tenant $tenant, Category $categoria): CategoryResource
-    {
-        $categoria = $this->resolveScopedCategory($tenant, $categoria);
-
-        return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
-    }
-
-    public function update(UpdateCategoryRequest $request, Tenant $tenant, Category $categoria): CategoryResource
-    {
-        $categoria = $this->resolveScopedCategory($tenant, $categoria);
-        $this->ensureCategoryIsMutable($categoria);
-        $categoria->update($request->validated());
-
-        return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
-    }
-
-    public function destroy(Tenant $tenant, Category $categoria): Response
-    {
-        $categoria = $this->resolveScopedCategory($tenant, $categoria);
-        $this->ensureCategoryIsMutable($categoria);
-        $categoria->delete();
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedCategory(Tenant $tenant, Category $category): Category
-    {
-        if ($category->tenant_code !== null && $category->tenant_code !== $tenant->codigo) {
-            throw new NotFoundHttpException('Category not found for tenant.');
-        }
-
-        return $category;
-    }
-
-    protected function ensureCategoryIsMutable(Category $category): void
-    {
-        if ($category->isGlobal()) {
-            throw new AccessDeniedHttpException('Global categories are read-only.');
-        }
-    }
-}

app/Domains/Catalog/Controllers/ProductController.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\Product;
-use App\Domains\Catalog\Requests\ProductDetailRequest;
-use App\Domains\Catalog\Requests\StoreProductRequest;
-use App\Domains\Catalog\Requests\UpdateProductRequest;
-use App\Domains\Catalog\Resources\ProductResource;
-use App\Domains\Catalog\Services\ProductService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class ProductController extends Controller
-{
-    public function index(Tenant $tenant, ProductService $productService): JsonResponse
-    {
-        return ProductResource::collection(
-            $productService->getProductos($tenant)
-        )->response();
-    }
-
-    public function store(StoreProductRequest $request, Tenant $tenant, ProductService $productService): JsonResponse
-    {
-        $product = $productService->create($tenant, $request->validated());
-
-        return ProductResource::make($product)->response()->setStatusCode(201);
-    }
-
-    public function show(ProductDetailRequest $request, Tenant $tenant, Product $producto, ProductService $productService): ProductResource
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $variantId = $request->query('variant_id');
-        $variantId = $variantId !== null ? (int) $variantId : null;
-        $producto = $productService->getProductDetail($tenant, $producto, $variantId);
-
-        return ProductResource::make($producto);
-    }
-
-    public function update(UpdateProductRequest $request, Tenant $tenant, Product $producto, ProductService $productService): ProductResource
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $producto = $productService->update($producto, $request->validated());
-
-        return ProductResource::make($producto);
-    }
-
-    public function destroy(Tenant $tenant, Product $producto, ProductService $productService): Response
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $productService->delete($producto);
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedProduct(Tenant $tenant, Product $product): Product
-    {
-        if ($product->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Product not found.');
-        }
-
-        return $product;
-    }
-}

app/Domains/Catalog/Controllers/ProductVariantController.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\Product;
-use App\Domains\Catalog\Models\ProductVariant;
-use App\Domains\Catalog\Requests\StoreProductVariantRequest;
-use App\Domains\Catalog\Requests\UpdateProductVariantRequest;
-use App\Domains\Catalog\Resources\ProductVariantResource;
-use App\Domains\Catalog\Services\ProductService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class ProductVariantController extends Controller
-{
-    public function index(Tenant $tenant, Product $producto): JsonResponse
-    {
-
-        $query = ProductVariant::query()
-            ->where('producto_id', $producto->id)
-            ->with(['product', 'definitions.productAttribute.attribute.options', 'attachments'])
-            ->latest();
-
-        return ProductVariantResource::collection($query->paginateFromRequest())->response();
-    }
-
-    public function store(StoreProductVariantRequest $request, Tenant $tenant, Product $producto, ProductService $productService): JsonResponse
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-
-        $variant = $productService->createVariant($producto, $request->validated());
-
-        return ProductVariantResource::make($variant)->response()->setStatusCode(201);
-    }
-
-    public function show(Tenant $tenant, Product $producto, ProductVariant $productVariant): ProductVariantResource
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
-
-        return ProductVariantResource::make($productVariant->load([
-            'attachments' => fn ($query) => $query->orderBy('attachments.id'),
-            'definitions.productAttribute.attribute.options',
-            'product.attachments' => fn ($query) => $query->orderBy('attachments.id'),
-        ]));
-    }
-
-    public function update(UpdateProductVariantRequest $request, Tenant $tenant, Product $producto, ProductVariant $productVariant, ProductService $productService): ProductVariantResource
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
-
-        $productVariant = $productService->updateVariant($productVariant, $request->validated());
-
-        return ProductVariantResource::make($productVariant);
-    }
-
-    public function destroy(Tenant $tenant, Product $producto, ProductVariant $productVariant, ProductService $productService): Response
-    {
-        $producto = $this->resolveScopedProduct($tenant, $producto);
-        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
-        $productService->deleteVariant($productVariant);
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedProduct(Tenant $tenant, Product $product): Product
-    {
-        if ($product->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Product not found for tenant.');
-        }
-
-        return $product;
-    }
-
-    protected function resolveScopedVariant(Product $product, ProductVariant $variant): ProductVariant
-    {
-        if ($variant->producto_id !== $product->id) {
-            throw new NotFoundHttpException('Product variant not found for product.');
-        }
-
-        return $variant;
-    }
-}

app/Domains/Catalog/Enums/CatalogItemType.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum CatalogItemType: string
+{
+    case Standard = 'standard';
+    case Bundle = 'bundle';
+
+    /** @return array<int, string> */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Catalog/Enums/GroupLayout.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum GroupLayout: string
+{
+    case Paginated = 'paginated';
+    case Simple = 'simple';
+    case SimpleVertical = 'simple_vertical';
+    case Carousel = 'carousel';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Catalog/Enums/InventoryPolicy.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum InventoryPolicy: string
+{
+    case Tracked = 'tracked';
+    case Unlimited = 'unlimited';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Catalog/Enums/ProductLayout.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum ProductLayout: string
+{
+    case Row = 'row';
+    case ColumnWithImage = 'column_with_image';
+    case ColumnWithCart = 'column_with_cart';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Catalog/Models/Attribute.php

@@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 #[Fillable([
     'tenant_codigo',
@@ -52,27 +51,4 @@ class Attribute extends Model
     {
         return $this->hasMany(AttributeOption::class, 'attribute_id')->orderBy('sort_order');
     }
-
-    /**
-     * @return HasMany<ProductAttribute, $this>
-     */
-    public function productAttributes(): HasMany
-    {
-        return $this->hasMany(ProductAttribute::class, 'attribute_id');
-    }
-
-    /**
-     * @return HasManyThrough<ProductVariantDefinition, ProductAttribute, $this>
-     */
-    public function variantDefinitions(): HasManyThrough
-    {
-        return $this->hasManyThrough(
-            ProductVariantDefinition::class,
-            ProductAttribute::class,
-            'attribute_id',
-            'products_attribute_id',
-            'id',
-            'id'
-        );
-    }
 }

app/Domains/Catalog/Models/Brand.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'tenant_codigo',
@@ -26,4 +27,10 @@ class Brand extends Model
     {
         return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
     }
+
+    /** @return HasMany<CatalogItem, $this> */
+    public function catalogItems(): HasMany
+    {
+        return $this->hasMany(CatalogItem::class);
+    }
 }

app/Domains/Catalog/Models/BundleComponent.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'bundle_catalog_item_id',
+    'component_catalog_item_id',
+    'component_variant_id',
+    'quantity',
+])]
+class BundleComponent extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected function casts(): array
+    {
+        return [
+            'bundle_catalog_item_id' => 'integer',
+            'component_catalog_item_id' => 'integer',
+            'component_variant_id' => 'integer',
+            'quantity' => 'integer',
+        ];
+    }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function bundle(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class, 'bundle_catalog_item_id');
+    }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class, 'component_catalog_item_id');
+    }
+
+    /** @return BelongsTo<Variant, $this> */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(Variant::class, 'component_variant_id');
+    }
+}

app/Domains/Catalog/Models/CatalogItem.php

@@ -0,0 +1,181 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use App\Domains\Attachable\Models\Attachment;
+use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Services\CatalogInventoryService;
+use App\Domains\Tenant\Models\Tenant;
+use Carbon\CarbonInterface;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'tenant_code',
+    'category_id',
+    'brand_id',
+    'inventory_id',
+    'type',
+    'slug',
+    'nombre',
+    'descripcion',
+    'precio',
+    'inventory_policy',
+    'has_tickets',
+    'maximum_use_date',
+    'minimum_use_date',
+])]
+class CatalogItem extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $table = 'catalog_items';
+
+    protected $attributes = [
+        'type' => CatalogItemType::Standard->value,
+        'inventory_policy' => InventoryPolicy::Tracked->value,
+        'has_tickets' => false,
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'category_id' => 'integer',
+            'brand_id' => 'integer',
+            'inventory_id' => 'integer',
+            'type' => CatalogItemType::class,
+            'precio' => 'decimal:2',
+            'inventory_policy' => InventoryPolicy::class,
+            'has_tickets' => 'boolean',
+            'maximum_use_date' => 'datetime',
+            'minimum_use_date' => 'datetime',
+        ];
+    }
+
+    /** @return BelongsTo<Tenant, $this> */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
+    }
+
+    /** @return BelongsTo<Category, $this> */
+    public function category(): BelongsTo
+    {
+        return $this->belongsTo(Category::class);
+    }
+
+    /** @return BelongsTo<Brand, $this> */
+    public function brand(): BelongsTo
+    {
+        return $this->belongsTo(Brand::class);
+    }
+
+    /** @return BelongsTo<Inventory, $this> */
+    public function inventory(): BelongsTo
+    {
+        return $this->belongsTo(Inventory::class);
+    }
+
+    /** @return HasMany<BundleComponent, $this> */
+    public function bundleComponents(): HasMany
+    {
+        return $this->hasMany(BundleComponent::class, 'bundle_catalog_item_id');
+    }
+
+    /** @return HasMany<BundleComponent, $this> */
+    public function bundleComponentUsages(): HasMany
+    {
+        return $this->hasMany(BundleComponent::class, 'component_catalog_item_id');
+    }
+
+    /** @return HasMany<Variant, $this> */
+    public function variants(): HasMany
+    {
+        return $this->hasMany(Variant::class);
+    }
+
+    /** @return BelongsToMany<Attribute, $this> */
+    public function attributes(): BelongsToMany
+    {
+        return $this->belongsToMany(Attribute::class, 'item_attributes')
+            ->withTimestamps();
+    }
+
+    /** @return HasMany<ItemAttribute, $this> */
+    public function itemAttributes(): HasMany
+    {
+        return $this->hasMany(ItemAttribute::class);
+    }
+
+    /** @return HasMany<FeaturedItem, $this> */
+    public function featuredItems(): HasMany
+    {
+        return $this->hasMany(FeaturedItem::class);
+    }
+
+    /** @return BelongsToMany<Attachment, $this> */
+    public function attachments(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Attachment::class,
+            'catalog_items_attachments',
+            'catalog_item_id',
+            'attachment_id'
+        )
+            ->withPivot('orden')
+            ->wherePivotNull('variant_id')
+            ->orderByPivot('orden');
+    }
+
+    public function availableStock(): ?int
+    {
+        return app(CatalogInventoryService::class)->availableQuantity($this);
+    }
+
+    public function isAvailable(): bool
+    {
+        if ($this->type === CatalogItemType::Bundle) {
+            $availableStock = $this->availableStock();
+
+            return $availableStock === null || $availableStock > 0;
+        }
+
+        if ($this->inventory_policy === InventoryPolicy::Unlimited) {
+            return true;
+        }
+
+        return ($this->availableStock() ?? 0) > 0;
+    }
+
+    public function getPrice(): float
+    {
+        return (float) $this->precio;
+    }
+
+    public function getName(): string
+    {
+        return $this->nombre;
+    }
+
+    public function getMinimumUseDate(): ?CarbonInterface
+    {
+        return $this->minimum_use_date;
+    }
+
+    public function getMaximumUseDate(): ?CarbonInterface
+    {
+        return $this->maximum_use_date;
+    }
+
+    public function isBundle(): bool
+    {
+        return $this->type === CatalogItemType::Bundle;
+    }
+}

app/Domains/Catalog/Models/Category.php

@@ -20,6 +20,9 @@ class Category extends Model
 
     protected $table = 'categorias';
 
+    /**
+     * @return array<string, string>
+     */
     protected function casts(): array
     {
         return [
@@ -55,4 +58,10 @@ class Category extends Model
     {
         return $this->hasMany(self::class, 'categoria_id');
     }
+
+    /** @return HasMany<CatalogItem, $this> */
+    public function catalogItems(): HasMany
+    {
+        return $this->hasMany(CatalogItem::class);
+    }
 }

app/Domains/Catalog/Models/FeaturedGroup.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Catalog\Enums\ProductLayout;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'tenant_code',
+    'product_layout',
+    'group_layout',
+    'group_name',
+    'group_order',
+])]
+class FeaturedGroup extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $table = 'featured_groups';
+
+    protected function casts(): array
+    {
+        return [
+            'product_layout' => ProductLayout::class,
+            'group_layout' => GroupLayout::class,
+            'group_order' => 'integer',
+        ];
+    }
+
+    /** @return BelongsTo<Tenant, $this> */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
+    }
+
+    /** @return HasMany<FeaturedItem, $this> */
+    public function featuredItems(): HasMany
+    {
+        return $this->hasMany(FeaturedItem::class)->orderBy('order');
+    }
+}

app/Domains/Catalog/Models/FeaturedItem.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'featured_group_id',
+    'catalog_item_id',
+    'order',
+])]
+class FeaturedItem extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $table = 'featured_items';
+
+    protected function casts(): array
+    {
+        return [
+            'featured_group_id' => 'integer',
+            'catalog_item_id' => 'integer',
+            'order' => 'integer',
+        ];
+    }
+
+    /** @return BelongsTo<FeaturedGroup, $this> */
+    public function featuredGroup(): BelongsTo
+    {
+        return $this->belongsTo(FeaturedGroup::class);
+    }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class);
+    }
+}

app/Domains/Catalog/Models/Inventory.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+#[Fillable([
+    'sold_units',
+    'reserved_stock',
+    'real_stock',
+])]
+class Inventory extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $table = 'inventories';
+
+    protected $attributes = [
+        'sold_units' => 0,
+        'reserved_stock' => 0,
+        'real_stock' => 0,
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'sold_units' => 'integer',
+            'reserved_stock' => 'integer',
+            'real_stock' => 'integer',
+        ];
+    }
+
+    /** @return HasOne<CatalogItem, $this> */
+    public function catalogItem(): HasOne
+    {
+        return $this->hasOne(CatalogItem::class);
+    }
+
+    /** @return HasOne<Variant, $this> */
+    public function variant(): HasOne
+    {
+        return $this->hasOne(Variant::class);
+    }
+
+    public function availableStock(): int
+    {
+        return max(0, $this->real_stock - $this->reserved_stock);
+    }
+
+    public function reserve(int $amount, bool $tracksInventory): void
+    {
+        if ($amount < 0) {
+            throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
+        }
+
+        if ($tracksInventory && $this->availableStock() < $amount) {
+            throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
+        }
+
+        $this->reserved_stock += $amount;
+        $this->save();
+    }
+
+    public function release(int $amount): void
+    {
+        if ($amount < 0 || $this->reserved_stock < $amount) {
+            throw new \InvalidArgumentException('La cantidad reservada no es válida.');
+        }
+
+        $this->reserved_stock -= $amount;
+        $this->save();
+    }
+
+    public function buy(int $amount, bool $tracksInventory): void
+    {
+        if ($amount < 0 || $this->reserved_stock < $amount) {
+            throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
+        }
+
+        if ($tracksInventory && $this->real_stock < $amount) {
+            throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
+        }
+
+        if ($tracksInventory) {
+            $this->real_stock -= $amount;
+        }
+
+        $this->reserved_stock -= $amount;
+        $this->sold_units += $amount;
+        $this->save();
+    }
+}

app/Domains/Catalog/Models/ItemAttribute.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'catalog_item_id',
+    'attribute_id',
+])]
+class ItemAttribute extends Model
+{
+    use HasFactory;
+
+    protected $table = 'item_attributes';
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class);
+    }
+
+    /** @return BelongsTo<Attribute, $this> */
+    public function attribute(): BelongsTo
+    {
+        return $this->belongsTo(Attribute::class);
+    }
+
+    /** @return HasMany<VariantDefinition, $this> */
+    public function variantDefinitions(): HasMany
+    {
+        return $this->hasMany(VariantDefinition::class);
+    }
+}

app/Domains/Catalog/Models/Product.php

@@ -1,304 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\ProductAttribute;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-#[Fillable([
-    'tenant_codigo',
-    'categoria_id',
-    'brand_id',
-    'slug',
-    'nombre',
-    'descripcion',
-    'precio',
-])]
-class Product extends Model
-{
-    use HasFactory;
-
-    protected $table = 'productos';
-    
-    protected ?ProductVariant $selectedVariant = null;
-    protected function casts(): array
-    {
-        return [
-            'categoria_id' => 'integer',
-            'brand_id' => 'integer',
-            'precio' => 'decimal:2',
-        ];
-    }
-
-    /**
-     * @return BelongsTo<Tenant, $this>
-     */
-    public function tenant(): BelongsTo
-    {
-        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
-    }
-
-    /**
-     * @return BelongsTo<Category, $this>
-     */
-    public function category(): BelongsTo
-    {
-        return $this->belongsTo(Category::class, 'categoria_id');
-    }
-
-    /**
-     * @return BelongsTo<Brand, $this>
-     */
-    public function brand(): BelongsTo
-    {
-        return $this->belongsTo(Brand::class, 'brand_id');
-    }
-
-    /**
-     * @return HasMany<ProductVariant, $this>
-     */
-    public function variants(): HasMany
-    {
-        return $this->hasMany(ProductVariant::class, 'producto_id');
-    }
-
-    /**
-     * @return BelongsToMany<Attribute, $this>
-     */
-    public function attributes(): BelongsToMany
-    {
-        return $this->belongsToMany(
-            Attribute::class,
-            'products_attributes',
-            'product_id',
-            'attribute_id'
-        )->withTimestamps();
-    }
-
-    /**
-     * @return HasMany<ProductAttribute, $this>
-     */
-    public function productAttributes(): HasMany
-    {
-        return $this->hasMany(ProductAttribute::class, 'product_id');
-    }
-
-    /**
-     * @return BelongsToMany<Attachment, $this>
-     */
-    public function attachments(): BelongsToMany
-    {
-        return $this->belongsToMany(
-            Attachment::class,
-            'productos_attachments',
-            'producto_id',
-            'attachment_id'
-        )->withTimestamps();
-    }
-
-    /**
-     * Create a variant for this product with its definitions.
-     *
-     * @param array<string, mixed> $data
-     */
-    public function createVariant(array $data): ProductVariant
-    {
-        $definitions = $data['definitions'] ?? [];
-        $this->validateVariantDefinitions($definitions);
-
-        unset($data['definitions']);
-
-        /** @var ProductVariant $variant */
-        $variant = $this->variants()->create($data);
-        $variant->definitions()->createMany($definitions);
-
-        return $variant;
-    }
-
-    /**
-     * Create multiple variants for this product.
-     *
-     * @param array<int, array<string, mixed>> $variantsData
-     * @return \Illuminate\Database\Eloquent\Collection<int, ProductVariant>
-     */
-    public function createVariants(array $variantsData): \Illuminate\Database\Eloquent\Collection
-    {
-        $variants = new \Illuminate\Database\Eloquent\Collection();
-
-        foreach ($variantsData as $variantData) {
-            $variants->push($this->createVariant($variantData));
-        }
-
-        return $variants;
-    }
-
-    /**
-     * Update a product variant.
-     *
-     * @param array<string, mixed> $data
-     */
-    public function updateVariant(ProductVariant $variant, array $data): ProductVariant
-    {
-        $definitions = $data['definitions'] ?? [];
-        $this->validateVariantDefinitions($definitions);
-
-        unset($data['definitions']);
-        unset($data['producto_id']);
-
-        $variant->update($data);
-        $variant->definitions()->delete();
-        $variant->definitions()->createMany($definitions);
-
-        return $variant;
-    }
-
-    /**
-     * Delete a product variant.
-     */
-    public function deleteVariant(ProductVariant $variant): void
-    {
-        $variant->definitions()->delete();
-        $variant->delete();
-    }
-
-    /**
-     * Validate variant definitions options against Attribute configuration.
-     *
-     * @param array $definitions
-     * @throws \InvalidArgumentException
-     */
-    protected function validateVariantDefinitions(array $definitions): void
-    {
-        foreach ($definitions as $definition) {
-            $productAttributeId = $definition['products_attribute_id'] ?? null;
-            if (! $productAttributeId) {
-                continue;
-            }
-
-            $productAttribute = $this->productAttributes()
-                ->with('attribute.options')
-                ->find($productAttributeId);
-
-            $attribute = $productAttribute?->attribute;
-
-            if (! $productAttribute || ! $attribute) {
-                throw new \InvalidArgumentException("Product attribute with ID {$productAttributeId} not found for product {$this->id}.");
-            }
-
-            if ($attribute->type === \App\Domains\Shared\Enums\FieldType::Select) {
-                $allowedValues = $attribute->options()->pluck('value')->toArray();
-                $val = $definition['value'] ?? null;
-                if ($val !== null && ! in_array($val, $allowedValues, true)) {
-                    throw new \InvalidArgumentException("The value '{$val}' is not a valid option for the select attribute '{$attribute->nombre}'.");
-                }
-            } elseif ($attribute->type === \App\Domains\Shared\Enums\FieldType::Multiselect) {
-                $allowedValues = $attribute->options()->pluck('value')->toArray();
-                $val = $definition['value'] ?? null;
-                if ($val !== null) {
-                    $values = [];
-                    if (is_array($val)) {
-                        $values = $val;
-                    } else {
-                        $decoded = json_decode($val, true);
-                        if (is_array($decoded)) {
-                            $values = $decoded;
-                        } else {
-                            $values = array_map('trim', explode(',', $val));
-                        }
-                    }
-                    foreach ($values as $v) {
-                        if (! in_array($v, $allowedValues, true)) {
-                            throw new \InvalidArgumentException("The value '{$v}' is not a valid option for the multiselect attribute '{$attribute->nombre}'.");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Create an attribute.
-     *
-     * @param array<string, mixed> $data
-     */
-    public static function createAttribute(Tenant $tenant, array $data): Attribute
-    {
-        $options = $data['options'] ?? [];
-        unset($data['options']);
-
-        $type = \App\Domains\Shared\Enums\FieldType::from((string) $data['type']);
-        if (! $type->supportsOptions() && ! empty($options)) {
-            throw new \InvalidArgumentException('Options are only allowed for select and multiselect attributes.');
-        }
-
-        if (! $type->supportsOptions()) {
-            $data['metadata_schema'] = null;
-        }
-
-        /** @var Attribute $attribute */
-        $attribute = Attribute::query()->create([
-            ...$data,
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-        $attribute->options()->createMany($options);
-
-        return $attribute->load('options');
-    }
-
-    /**
-     * Update an attribute.
-     *
-     * @param array<string, mixed> $data
-     */
-    public static function updateAttribute(Attribute $attribute, array $data): Attribute
-    {
-        $options = $data['options'] ?? [];
-        unset($data['options']);
-
-        $typeStr = $data['type'] ?? $attribute->type->value;
-        $type = \App\Domains\Shared\Enums\FieldType::from((string) $typeStr);
-        if (! $type->supportsOptions() && ! empty($options)) {
-            throw new \InvalidArgumentException('Options are only allowed for select and multiselect attributes.');
-        }
-
-        if (! $type->supportsOptions()) {
-            $data['metadata_schema'] = null;
-        }
-
-        $attribute->update($data);
-        $attribute->options()->delete();
-        $attribute->options()->createMany($options);
-
-        return $attribute->load('options');
-    }
-
-    /**
-     * Delete an attribute.
-     */
-    public static function deleteAttribute(Attribute $attribute): void
-    {
-        $attribute->options()->delete();
-        $attribute->delete();
-    }
-
-    
-
-    public function setSelectedVariant(ProductVariant $variant): void
-    {
-        $this->selectedVariant = $variant;
-    }
-
-    public function getSelectedVariant(): ?ProductVariant
-    {
-        return $this->selectedVariant;
-    }
-}

app/Domains/Catalog/Models/ProductAttribute.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-#[Fillable([
-    'product_id',
-    'attribute_id',
-])]
-class ProductAttribute extends Model
-{
-    use HasFactory;
-
-    protected $table = 'products_attributes';
-
-    /**
-     * @return BelongsTo<Product, $this>
-     */
-    public function product(): BelongsTo
-    {
-        return $this->belongsTo(Product::class, 'product_id');
-    }
-
-    /**
-     * @return BelongsTo<Attribute, $this>
-     */
-    public function attribute(): BelongsTo
-    {
-        return $this->belongsTo(Attribute::class, 'attribute_id');
-    }
-
-    /**
-     * @return HasMany<ProductVariantDefinition, $this>
-     */
-    public function variantDefinitions(): HasMany
-    {
-        return $this->hasMany(ProductVariantDefinition::class, 'products_attribute_id');
-    }
-}

app/Domains/Catalog/Models/ProductVariant.php

@@ -1,160 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use App\Domains\Attachable\Models\Attachment;
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-use Illuminate\Database\Eloquent\Casts\Attribute;
-
-#[Fillable([
-    'producto_id',
-    'stock_real',
-    'stock_reservado',
-    'stock',
-    'is_placeholder',
-])]
-class ProductVariant extends Model
-{
-    use HasFactory;
-
-    protected $table = 'productos_variantes';
-
-    protected $appends = ['stock_tecnico'];
-
-    protected static function booted(): void
-    {
-        static::saving(function (ProductVariant $variant) {
-            $variant->validateStock();
-        });
-    }
-
-    public function validateStock(): void
-    {
-        if ($this->stock_real < 0) {
-            throw new \InvalidArgumentException('El stock real no puede ser negativo.');
-        }
-
-        if ($this->stock_reservado < 0) {
-            throw new \InvalidArgumentException('El stock reservado no puede ser negativo.');
-        }
-
-        if ($this->stock_reservado > $this->stock_real) {
-            throw new \InvalidArgumentException('El stock reservado no puede ser mayor que el stock real.');
-        }
-    }
-
-    public function incrementRealStock(int $amount): void
-    {
-        if ($amount < 0) {
-            throw new \InvalidArgumentException('El monto a incrementar debe ser positivo.');
-        }
-        $this->stock_real += $amount;
-        $this->save();
-    }
-
-    public function decrementRealStock(int $amount): void
-    {
-        if ($amount < 0) {
-            throw new \InvalidArgumentException('El monto a decrementar debe ser positivo.');
-        }
-        $this->stock_real -= $amount;
-        $this->save();
-    }
-
-    public function incrementReservedStock(int $amount): void
-    {
-        if ($amount < 0) {
-            throw new \InvalidArgumentException('El monto a incrementar debe ser positivo.');
-        }
-        $this->stock_reservado += $amount;
-        $this->save();
-    }
-
-    public function decrementReservedStock(int $amount): void
-    {
-        if ($amount < 0) {
-            throw new \InvalidArgumentException('El monto a decrementar debe ser positivo.');
-        }
-        $this->stock_reservado -= $amount;
-        $this->save();
-    }
-
-    public function confirmReservedStock(int $amount): void
-    {
-        if ($amount < 0) {
-            throw new \InvalidArgumentException('El monto a confirmar debe ser positivo.');
-        }
-
-        if ($this->stock_real < $amount) {
-            throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la reserva.');
-        }
-
-        if ($this->stock_reservado < $amount) {
-            throw new \InvalidArgumentException('No hay suficiente stock reservado para confirmar la reserva.');
-        }
-
-        $this->stock_real -= $amount;
-        $this->stock_reservado -= $amount;
-        $this->save();
-    }
-
-    protected function stockTecnico(): Attribute
-    {
-        return Attribute::get(fn () => $this->stock_real - $this->stock_reservado);
-    }
-
-    protected function stock(): Attribute
-    {
-        return Attribute::make(
-            get: fn () => $this->stock_real,
-            set: fn ($value) => [
-                'stock_real' => $value,
-            ]
-        );
-    }
-
-    protected function casts(): array
-    {
-        return [
-            'producto_id' => 'integer',
-            'stock_real' => 'integer',
-            'stock_reservado' => 'integer',
-            'is_placeholder' => 'boolean',
-        ];
-    }
-
-    /**
-     * @return BelongsTo<Product, $this>
-     */
-    public function product(): BelongsTo
-    {
-        return $this->belongsTo(Product::class, 'producto_id');
-    }
-
-    /**
-     * @return HasMany<ProductVariantDefinition, $this>
-     */
-    public function definitions(): HasMany
-    {
-        return $this->hasMany(ProductVariantDefinition::class, 'producto_variante_id');
-    }
-
-    /**
-     * @return BelongsToMany<Attachment, $this>
-     */
-    public function attachments(): BelongsToMany
-    {
-        return $this->belongsToMany(
-            Attachment::class,
-            'variantes_attachments',
-            'variante_id',
-            'attachment_id'
-        )->withTimestamps();
-    }
-}

app/Domains/Catalog/Models/ProductVariantDefinition.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'producto_variante_id',
-    'products_attribute_id',
-    'value',
-])]
-class ProductVariantDefinition extends Model
-{
-    use HasFactory;
-
-    protected $table = 'productos_variantes_values';
-
-    /**
-     * @return BelongsTo<ProductVariant, $this>
-     */
-    public function variant(): BelongsTo
-    {
-        return $this->belongsTo(ProductVariant::class, 'producto_variante_id');
-    }
-
-    /**
-     * @return BelongsTo<ProductAttribute, $this>
-     */
-    public function productAttribute(): BelongsTo
-    {
-        return $this->belongsTo(ProductAttribute::class, 'products_attribute_id');
-    }
-}

app/Domains/Catalog/Models/Variant.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use App\Domains\Attachable\Models\Attachment;
+use Carbon\CarbonInterface;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'catalog_item_id',
+    'inventory_id',
+    'minimum_use_date',
+    'maximum_use_date',
+])]
+class Variant extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $table = 'variantes';
+
+    protected function casts(): array
+    {
+        return [
+            'catalog_item_id' => 'integer',
+            'inventory_id' => 'integer',
+            'minimum_use_date' => 'datetime',
+            'maximum_use_date' => 'datetime',
+        ];
+    }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class);
+    }
+
+    /** @return BelongsTo<Inventory, $this> */
+    public function inventory(): BelongsTo
+    {
+        return $this->belongsTo(Inventory::class);
+    }
+
+    /** @return HasMany<VariantDefinition, $this> */
+    public function definitions(): HasMany
+    {
+        return $this->hasMany(VariantDefinition::class);
+    }
+
+    /** @return BelongsToMany<Attachment, $this> */
+    public function attachments(): BelongsToMany
+    {
+        $relation = $this->belongsToMany(
+            Attachment::class,
+            'catalog_items_attachments',
+            'variant_id',
+            'attachment_id'
+        )
+            ->withPivot('orden')
+            ->orderByPivot('orden');
+
+        if ($this->catalog_item_id !== null) {
+            $relation->withPivotValue('catalog_item_id', $this->catalog_item_id);
+        }
+
+        return $relation;
+    }
+
+    public function getPrice(): float
+    {
+        return $this->catalogItem->getPrice();
+    }
+
+    public function getName(): string
+    {
+        $name = $this->catalogItem->nombre;
+        $this->loadMissing('definitions.itemAttribute.attribute');
+        $definitions = $this->definitions
+            ->map(function (VariantDefinition $definition): ?string {
+                $attributeName = $definition->itemAttribute?->attribute?->nombre;
+
+                return $attributeName
+                    ? "{$attributeName}: {$definition->value}"
+                    : $definition->value;
+            })
+            ->filter()
+            ->implode(', ');
+
+        return $definitions === '' ? $name : "{$name} ({$definitions})";
+    }
+
+    public function getMinimumUseDate(): ?CarbonInterface
+    {
+        return $this->minimum_use_date
+            ?? $this->catalogItem->getMinimumUseDate();
+    }
+
+    public function getMaximumUseDate(): ?CarbonInterface
+    {
+        return $this->maximum_use_date
+            ?? $this->catalogItem->getMaximumUseDate();
+    }
+}

app/Domains/Catalog/Models/VariantDefinition.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'variant_id',
+    'item_attribute_id',
+    'value',
+])]
+class VariantDefinition extends Model
+{
+    use HasFactory;
+
+    protected $table = 'variant_values';
+
+    /** @return BelongsTo<Variant, $this> */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(Variant::class);
+    }
+
+    /** @return BelongsTo<ItemAttribute, $this> */
+    public function itemAttribute(): BelongsTo
+    {
+        return $this->belongsTo(ItemAttribute::class);
+    }
+}

app/Domains/Catalog/Policies/.gitkeep

@@ -1 +0,0 @@
-

app/Domains/Catalog/Requests/CatalogItemDetailRequest.php

@@ -4,21 +4,18 @@ namespace App\Domains\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class StoreBrandRequest extends FormRequest
+class CatalogItemDetailRequest extends FormRequest
 {
     public function authorize(): bool
     {
         return true;
     }
 
-    /**
-     * @return array<string, mixed>
-     */
+    /** @return array<string, list<string>> */
     public function rules(): array
     {
         return [
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
+            'variant_id' => ['sometimes', 'integer', 'min:1'],
         ];
     }
 }

app/Domains/Catalog/Requests/CategoryPageRequest.php

@@ -4,20 +4,18 @@ namespace App\Domains\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ProductDetailRequest extends FormRequest
+class CategoryPageRequest extends FormRequest
 {
     public function authorize(): bool
     {
         return true;
     }
 
-    /**
-     * @return array<string, mixed>
-     */
+    /** @return array<string, list<string>> */
     public function rules(): array
     {
         return [
-            'variant_id' => ['sometimes', 'integer'],
+            'page' => ['sometimes', 'integer', 'min:1'],
         ];
     }
 }

app/Domains/Catalog/Requests/FeaturedGroupPageRequest.php

@@ -4,21 +4,18 @@ namespace App\Domains\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class UpdateBrandRequest extends FormRequest
+class FeaturedGroupPageRequest extends FormRequest
 {
     public function authorize(): bool
     {
         return true;
     }
 
-    /**
-     * @return array<string, mixed>
-     */
+    /** @return array<string, list<string>> */
     public function rules(): array
     {
         return [
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
+            'page' => ['sometimes', 'integer', 'min:1'],
         ];
     }
 }

app/Domains/Catalog/Requests/SearchCatalogItemsRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SearchCatalogItemsRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        return [
+            'q' => ['required', 'string', 'min:2', 'max:100'],
+            'page' => ['sometimes', 'integer', 'min:1'],
+        ];
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('q') && is_string($this->input('q'))) {
+            $this->merge(['q' => trim($this->string('q')->toString())]);
+        }
+    }
+}

app/Domains/Catalog/Requests/StoreAttributeRequest.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Shared\Enums\FieldType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Validator;
-
-class StoreAttributeRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'codigo' => [
-                'required',
-                'string',
-                'max:255',
-                Rule::unique('attribute', 'codigo')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'nombre' => ['required', 'string', 'max:255'],
-            'is_required' => ['sometimes', 'boolean'],
-            'metadata_schema' => ['nullable', 'array'],
-            'type' => ['required', Rule::enum(FieldType::class)],
-            'options' => [
-                Rule::requiredIf(fn (): bool => in_array($this->input('type'), [
-                    FieldType::Select->value,
-                    FieldType::Multiselect->value,
-                ], true)),
-                Rule::prohibitedIf(fn (): bool => ! in_array($this->input('type'), [
-                    FieldType::Select->value,
-                    FieldType::Multiselect->value,
-                ], true)),
-                'array',
-            ],
-            'options.*.value' => ['required', 'string', 'max:255'],
-            'options.*.label' => ['required', 'string', 'max:255'],
-            'options.*.sort_order' => ['sometimes', 'integer'],
-            'options.*.metadata' => ['nullable', 'array'],
-        ];
-    }
-
-    public function withValidator(Validator $validator): void
-    {
-        $validator->after(function (Validator $validator): void {
-            $type = $this->input('type');
-            $supportsOptions = in_array($type, [FieldType::Select->value, FieldType::Multiselect->value], true);
-
-            if (! $supportsOptions && $this->filled('metadata_schema')) {
-                $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');
-            }
-
-            if (! $supportsOptions && $this->filled('options')) {
-                $validator->errors()->add('options', 'Options are only allowed for select and multiselect attributes.');
-            }
-        });
-    }
-}

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StoreCatalogItemRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, mixed> */
+    public function rules(): array
+    {
+        $tenantCode = $this->route('tenant')?->codigo;
+        $type = $this->input('type', CatalogItemType::Standard->value);
+        $isBundle = $type === CatalogItemType::Bundle->value;
+
+        return [
+            'tenant_code' => ['prohibited'],
+            'type' => ['sometimes', Rule::enum(CatalogItemType::class)],
+            'category_id' => [
+                'sometimes',
+                'nullable',
+                'integer',
+                Rule::exists('categorias', 'id')->where(
+                    fn ($query) => $query->where('tenant_code', $tenantCode)
+                ),
+            ],
+            'brand_id' => [
+                'sometimes',
+                'nullable',
+                'integer',
+                Rule::exists('brands', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
+                ),
+            ],
+            'slug' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('catalog_items', 'slug')->where(
+                    fn ($query) => $query->where('tenant_code', $tenantCode)
+                ),
+            ],
+            'nombre' => ['required', 'string', 'max:255'],
+            'descripcion' => ['sometimes', 'nullable', 'string'],
+            'precio' => ['required', 'numeric', 'min:0'],
+            'inventory_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(InventoryPolicy::class)],
+            'has_tickets' => [Rule::prohibitedIf($isBundle), 'sometimes', 'boolean'],
+            'minimum_use_date' => [Rule::prohibitedIf($isBundle), 'sometimes', 'nullable', 'date'],
+            'maximum_use_date' => [Rule::prohibitedIf($isBundle), 'sometimes', 'nullable', 'date', 'after_or_equal:minimum_use_date'],
+            'real_stock' => [Rule::prohibitedIf($isBundle), 'sometimes', 'integer', 'min:0'],
+            'inventory_id' => ['prohibited'],
+            'reserved_stock' => ['prohibited'],
+            'sold_units' => ['prohibited'],
+            'attribute_codes' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
+            'attribute_codes.*' => [
+                'required',
+                'string',
+                'distinct',
+                Rule::exists('attribute', 'codigo')->where(
+                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
+                ),
+            ],
+            'images' => ['sometimes', 'array'],
+            'images.*' => ['required', new ImageOrBase64Rule],
+            'variants' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
+            'variants.*.real_stock' => ['sometimes', 'integer', 'min:0'],
+            'variants.*.inventory_id' => ['prohibited'],
+            'variants.*.reserved_stock' => ['prohibited'],
+            'variants.*.sold_units' => ['prohibited'],
+            'variants.*.minimum_use_date' => ['sometimes', 'nullable', 'date'],
+            'variants.*.maximum_use_date' => [
+                'sometimes',
+                'nullable',
+                'date',
+                'after_or_equal:variants.*.minimum_use_date',
+            ],
+            'variants.*.values' => ['sometimes', 'array'],
+            'variants.*.values.*' => ['nullable', 'string'],
+            'variants.*.images' => ['sometimes', 'array'],
+            'variants.*.images.*' => ['required', new ImageOrBase64Rule],
+            'components' => [
+                Rule::requiredIf($isBundle),
+                Rule::prohibitedIf(! $isBundle),
+                'array',
+                'min:1',
+            ],
+            'components.*.catalog_item_id' => [
+                'required',
+                'integer',
+                Rule::exists('catalog_items', 'id')->where(
+                    fn ($query) => $query->where('tenant_code', $tenantCode)
+                ),
+            ],
+            'components.*.variant_id' => [
+                'sometimes',
+                'nullable',
+                'integer',
+                Rule::exists('variantes', 'id'),
+            ],
+            'components.*.quantity' => ['required', 'integer', 'min:1'],
+        ];
+    }
+}

app/Domains/Catalog/Requests/StoreCategoryRequest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreCategoryRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'categoria_id' => ['nullable', 'integer', 'exists:categorias,id'],
-            'nombre' => ['required', 'string', 'max:255'],
-        ];
-    }
-}

app/Domains/Catalog/Requests/StoreProductRequest.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreProductRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'categoria_id' => ['required', 'integer'],
-            'brand_id' => [
-                'required',
-                'integer',
-                Rule::exists('brands', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'slug' => ['required', 'string', 'max:255', Rule::unique('productos', 'slug')],
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
-            'precio' => ['required', 'numeric', 'min:0'],
-            'stock' => ['sometimes', 'integer', 'min:0'],
-            'attribute_ids' => ['sometimes', 'array'],
-            'attribute_ids.*' => [
-                'required',
-                'integer',
-                Rule::exists('attribute', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'images' => ['sometimes', 'nullable', 'array'],
-            'images.*' => ['required', new ImageOrBase64Rule()],
-        ];
-    }
-}

app/Domains/Catalog/Requests/StoreProductVariantRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreProductVariantRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'stock' => ['sometimes', 'integer', 'min:0'],
-            'definitions' => ['sometimes', 'array'],
-            'definitions.*.products_attribute_id' => [
-                'required',
-                'integer',
-                'distinct',
-                Rule::exists('products_attributes', 'id')->where(
-                    fn ($query) => $query->where('product_id', $this->route('producto')?->id)
-                ),
-            ],
-            'definitions.*.value' => ['nullable', 'string'],
-            'images' => ['sometimes', 'nullable', 'array'],
-            'images.*' => ['required', new ImageOrBase64Rule()],
-        ];
-    }
-}

app/Domains/Catalog/Requests/UpdateAttributeRequest.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Shared\Enums\FieldType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Validator;
-
-class UpdateAttributeRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        /** @var Attribute|null $attribute */
-        $attribute = $this->route('attribute');
-
-        return [
-            'codigo' => [
-                'required',
-                'string',
-                'max:255',
-                Rule::unique('attribute', 'codigo')
-                    ->ignore($attribute?->id)
-                    ->where(fn ($query) => $query->where('tenant_codigo', $attribute?->tenant_codigo)),
-            ],
-            'nombre' => ['required', 'string', 'max:255'],
-            'is_required' => ['sometimes', 'boolean'],
-            'metadata_schema' => ['nullable', 'array'],
-            'type' => ['required', Rule::enum(FieldType::class)],
-            'options' => ['sometimes', 'array'],
-            'options.*.value' => ['required', 'string', 'max:255'],
-            'options.*.label' => ['required', 'string', 'max:255'],
-            'options.*.sort_order' => ['sometimes', 'integer'],
-            'options.*.metadata' => ['nullable', 'array'],
-        ];
-    }
-
-    public function withValidator(Validator $validator): void
-    {
-        $validator->after(function (Validator $validator): void {
-            $type = $this->input('type');
-            $supportsOptions = in_array($type, [FieldType::Select->value, FieldType::Multiselect->value], true);
-
-            if (! $supportsOptions && $this->filled('metadata_schema')) {
-                $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');
-            }
-
-            if (! $supportsOptions && $this->filled('options')) {
-                $validator->errors()->add('options', 'Options are only allowed for select and multiselect attributes.');
-            }
-        });
-    }
-}

app/Domains/Catalog/Requests/UpdateCategoryRequest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Catalog\Models\Category;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateCategoryRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        /** @var Category|null $category */
-        $category = $this->route('categoria');
-
-        return [
-            'categoria_id' => [
-                'nullable',
-                'integer',
-                'exists:categorias,id',
-                Rule::notIn([$category?->id]),
-            ],
-            'nombre' => ['required', 'string', 'max:255'],
-        ];
-    }
-}

app/Domains/Catalog/Requests/UpdateProductRequest.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Catalog\Models\Product;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateProductRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        /** @var Product|null $product */
-        $product = $this->route('producto');
-
-        return [
-            'categoria_id' => ['required', 'integer'],
-            'brand_id' => [
-                'required',
-                'integer',
-                Rule::exists('brands', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'slug' => [
-                'required',
-                'string',
-                'max:255',
-                Rule::unique('productos', 'slug')->ignore($product?->id),
-            ],
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
-            'precio' => ['required', 'numeric', 'min:0'],
-            'attribute_ids' => ['sometimes', 'array'],
-            'attribute_ids.*' => [
-                'required',
-                'integer',
-                Rule::exists('attribute', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'images' => ['sometimes', 'nullable', 'array'],
-            'images.*' => ['required', new ImageOrBase64Rule()],
-        ];
-    }
-}

app/Domains/Catalog/Requests/UpdateProductVariantRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateProductVariantRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'stock' => ['sometimes', 'integer', 'min:0'],
-            'definitions' => ['sometimes', 'array'],
-            'definitions.*.products_attribute_id' => [
-                'required',
-                'integer',
-                'distinct',
-                Rule::exists('products_attributes', 'id')->where(
-                    fn ($query) => $query->where('product_id', $this->route('producto')?->id)
-                ),
-            ],
-            'definitions.*.value' => ['nullable', 'string'],
-            'images' => ['sometimes', 'nullable', 'array'],
-            'images.*' => ['required', new ImageOrBase64Rule()],
-        ];
-    }
-}

app/Domains/Catalog/Resources/AttributeOptionResource.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Catalog\Models\AttributeOption
- */
-class AttributeOptionResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'value' => $this->value,
-            'label' => $this->label,
-            'sort_order' => $this->sort_order,
-            'metadata' => $this->metadata,
-        ];
-    }
-}

app/Domains/Catalog/Resources/AttributeResource.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Catalog\Models\Attribute
- */
-class AttributeResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'codigo' => $this->codigo,
-            'nombre' => $this->nombre,
-            'is_required' => $this->is_required,
-            'metadata_schema' => $this->metadata_schema,
-            'type' => $this->type?->value ?? $this->type,
-            'options' => AttributeOptionResource::collection($this->whenLoaded('options')),
-        ];
-    }
-}

app/Domains/Catalog/Resources/BrandResource.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Catalog\Models\Brand
- */
-class BrandResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'nombre' => $this->nombre,
-            'descripcion' => $this->descripcion,
-        ];
-    }
-}

app/Domains/Catalog/Resources/CatalogFeaturedGroupResource.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Models\FeaturedGroup;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin FeaturedGroup */
+class CatalogFeaturedGroupResource extends JsonResource
+{
+    /** @param array<array-key, mixed> $items */
+    public function __construct($resource, private readonly array $items)
+    {
+        parent::__construct($resource);
+    }
+
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'title' => $this->group_name,
+            'layout' => $this->product_layout->value,
+            'group_layout' => $this->group_layout->value,
+            'group_order' => $this->group_order,
+            'items' => $this->items,
+        ];
+    }
+}

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Enums\ProductLayout;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\FeaturedItem;
+use App\Domains\Catalog\Models\Variant;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin FeaturedItem */
+class CatalogFeaturedItemResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        $catalogItem = $this->catalogItem;
+
+        if ($this->featuredGroup->product_layout === ProductLayout::ColumnWithImage) {
+            return $this->columnWithImageData($catalogItem);
+        }
+
+        return [
+            'id' => $catalogItem->id,
+            'type' => $catalogItem->type->value,
+            'nombre' => $catalogItem->nombre,
+            'descripcion' => $catalogItem->descripcion,
+            'precio' => $catalogItem->precio,
+            'stock_tecnico' => $catalogItem->availableStock(),
+            'variants' => $catalogItem->variants
+                ->map(fn (Variant $variant): array => [
+                    'id' => $variant->id,
+                    'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+                        ? null
+                        : $variant->inventory->availableStock(),
+                    'values' => $variant->definitions
+                        ->mapWithKeys(fn ($definition) => [
+                            $definition->itemAttribute?->attribute?->codigo => $definition->value,
+                        ])
+                        ->filter(fn ($value, $key): bool => $key !== null),
+                ])
+                ->values(),
+        ];
+    }
+
+    /** @return array<string, mixed> */
+    private function columnWithImageData(CatalogItem $catalogItem): array
+    {
+        $attachment = $catalogItem->attachments->first()
+            ?? $catalogItem->variants
+                ->flatMap(fn (Variant $variant) => $variant->attachments)
+                ->first();
+
+        return [
+            'id' => $catalogItem->id,
+            'type' => $catalogItem->type->value,
+            'nombre' => $catalogItem->nombre,
+            'precio' => $catalogItem->precio,
+            'image' => $attachment?->getTemporaryUrl(1440),
+        ];
+    }
+}

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\ItemAttribute;
+use App\Domains\Catalog\Models\Variant;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Collection;
+
+/** @mixin CatalogItem */
+class CatalogItemDetailResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        /** @var Variant|null $selectedVariant */
+        $selectedVariant = $this->resource->getRelation('selectedVariant');
+
+        return [
+            'id' => $this->id,
+            'type' => $this->type->value,
+            'category_id' => $this->category_id,
+            'brand_id' => $this->brand_id,
+            'slug' => $this->slug,
+            'nombre' => $this->nombre,
+            'descripcion' => $this->descripcion,
+            'precio' => $this->precio,
+            'category' => $this->category?->nombre,
+            'brand' => $this->brand?->nombre,
+            'inventory_policy' => $this->inventory_policy?->value,
+            'has_tickets' => $this->has_tickets,
+            'minimum_use_date' => $this->minimum_use_date,
+            'maximum_use_date' => $this->maximum_use_date,
+            'attributes' => $this->itemAttributes
+                ->map(fn (ItemAttribute $itemAttribute): array => $this->attributeData($itemAttribute))
+                ->values(),
+            'stock_tecnico' => $this->when(
+                $selectedVariant === null,
+                fn () => $this->availableStock(),
+            ),
+            'images' => $this->when(
+                $selectedVariant === null,
+                fn () => $this->imageUrls($this->attachments),
+            ),
+            'variants' => $this->variants
+                ->map(fn (Variant $variant): array => $this->variantData($variant))
+                ->values(),
+            'selected_variant' => $this->when(
+                $selectedVariant !== null,
+                fn (): array => [
+                    ...$this->variantData($selectedVariant),
+                    'images' => $this->imageUrls($selectedVariant->attachments),
+                ],
+            ),
+            'components' => $this->when(
+                $this->isBundle(),
+                fn () => $this->bundleComponents
+                    ->map(function ($component): array {
+                        $selectedItem = $component->variant ?? $component->catalogItem;
+
+                        return [
+                            'catalog_item_id' => $component->component_catalog_item_id,
+                            'variant_id' => $component->component_variant_id,
+                            'quantity' => $component->quantity,
+                            'nombre' => $component->catalogItem->nombre,
+                            'item_nombre' => $selectedItem->getName(),
+                        ];
+                    })
+                    ->values(),
+            ),
+        ];
+    }
+
+    /** @return array<string, mixed> */
+    private function attributeData(ItemAttribute $itemAttribute): array
+    {
+        $attribute = $itemAttribute->attribute;
+        $availableValues = $this->variants
+            ->flatMap->definitions
+            ->where('item_attribute_id', $itemAttribute->id)
+            ->pluck('value')
+            ->filter()
+            ->unique();
+
+        return [
+            'id' => $attribute->id,
+            'codigo' => $attribute->codigo,
+            'nombre' => $attribute->nombre,
+            'is_required' => $attribute->is_required,
+            'metadata_schema' => $attribute->metadata_schema,
+            'type' => $attribute->type->value,
+            'options' => $attribute->options
+                ->whereIn('value', $availableValues)
+                ->map(fn ($option): array => [
+                    'id' => $option->id,
+                    'value' => $option->value,
+                    'label' => $option->label,
+                    'sort_order' => $option->sort_order,
+                    'metadata' => $option->metadata,
+                ])
+                ->values(),
+        ];
+    }
+
+    /** @return array<string, mixed> */
+    private function variantData(Variant $variant): array
+    {
+        return [
+            'id' => $variant->id,
+            'stock_tecnico' => $this->variantStock($variant),
+            'minimum_use_date' => $variant->minimum_use_date,
+            'maximum_use_date' => $variant->maximum_use_date,
+            'effective_minimum_use_date' => $variant->minimum_use_date
+                ?? $this->minimum_use_date,
+            'effective_maximum_use_date' => $variant->maximum_use_date
+                ?? $this->maximum_use_date,
+            'values' => $variant->definitions
+                ->mapWithKeys(fn ($definition) => [
+                    $definition->itemAttribute?->attribute?->codigo => $definition->value,
+                ])
+                ->filter(fn ($value, $key): bool => $key !== null),
+        ];
+    }
+
+    /** @return Collection<int, string> */
+    private function imageUrls(Collection $attachments): Collection
+    {
+        return $attachments
+            ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+            ->values();
+    }
+
+    private function variantStock(Variant $variant): ?int
+    {
+        return $this->inventory_policy === InventoryPolicy::Unlimited
+            ? null
+            : $variant->inventory->availableStock();
+    }
+}

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Models\CatalogItem;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin CatalogItem */
+class CatalogItemResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'type' => $this->type->value,
+            'category_id' => $this->category_id,
+            'brand_id' => $this->brand_id,
+            'slug' => $this->slug,
+            'nombre' => $this->nombre,
+            'descripcion' => $this->descripcion,
+            'precio' => $this->precio,
+            'inventory_policy' => $this->inventory_policy?->value,
+            'has_tickets' => $this->has_tickets,
+            'minimum_use_date' => $this->minimum_use_date,
+            'maximum_use_date' => $this->maximum_use_date,
+            'real_stock' => $this->whenLoaded('inventory', fn () => $this->inventory?->real_stock),
+            'images' => $this->whenLoaded('attachments', fn () => $this->attachments
+                ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                ->values()),
+            'variants' => $this->whenLoaded('variants', fn () => $this->variants
+                ->map(fn ($variant) => [
+                    'id' => $variant->id,
+                    'real_stock' => $variant->inventory?->real_stock,
+                    'minimum_use_date' => $variant->minimum_use_date,
+                    'maximum_use_date' => $variant->maximum_use_date,
+                    'effective_minimum_use_date' => $variant->minimum_use_date
+                        ?? $this->minimum_use_date,
+                    'effective_maximum_use_date' => $variant->maximum_use_date
+                        ?? $this->maximum_use_date,
+                    'values' => $variant->definitions
+                        ->mapWithKeys(fn ($definition) => [
+                            $definition->itemAttribute?->attribute?->codigo => $definition->value,
+                        ])
+                        ->filter(fn ($value, $key) => $key !== null),
+                    'images' => $variant->attachments
+                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                        ->values(),
+                ])
+                ->values()),
+        ];
+    }
+}

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Variant;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin CatalogItem */
+class CatalogSearchItemResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        $attachment = $this->attachments->first()
+            ?? $this->variants
+                ->flatMap(fn (Variant $variant) => $variant->attachments)
+                ->first();
+
+        return [
+            'id' => $this->id,
+            'type' => $this->type->value,
+            'nombre' => $this->nombre,
+            'descripcion' => $this->descripcion,
+            'precio' => $this->precio,
+            'image' => $attachment?->getTemporaryUrl(1440),
+            'stock_tecnico' => $this->availableStock(),
+            'variants' => $this->variants
+                ->map(fn (Variant $variant): array => [
+                    'id' => $variant->id,
+                    'stock_tecnico' => $this->inventory_policy === InventoryPolicy::Unlimited
+                        ? null
+                        : $variant->inventory?->availableStock(),
+                    'values' => $variant->definitions
+                        ->mapWithKeys(fn ($definition) => [
+                            $definition->itemAttribute?->attribute?->codigo => $definition->value,
+                        ])
+                        ->filter(fn ($value, $key): bool => $key !== null),
+                ])
+                ->values(),
+        ];
+    }
+}

app/Domains/Catalog/Resources/CategoryResource.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Catalog\Models\Category
- */
-class CategoryResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'is_global' => $this->resource->isGlobal(),
-            'nombre' => $this->nombre,
-            'parent' => $this->whenLoaded('parent', fn () => $this->serializeRelatedCategory($this->parent)),
-            'sub_categories' => $this->whenLoaded('subCategories', fn () =>
-                $this->subCategories->map(fn ($category) => $this->serializeRelatedCategory($category))->values()
-            ),
-        ];
-    }
-
-    /**
-     * @return array<string, mixed>|null
-     */
-    protected function serializeRelatedCategory(?\App\Domains\Catalog\Models\Category $category): ?array
-    {
-        if ($category === null) {
-            return null;
-        }
-
-        return [
-            'id' => $category->id,
-            'is_global' => $category->isGlobal(),
-            'nombre' => $category->nombre,
-        ];
-    }
-}

app/Domains/Catalog/Resources/ProductResource.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use App\Domains\Catalog\Models\Product;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin Product
- */
-class ProductResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'category_id' => $this->categoria_id,
-            'brand_id' => $this->brand_id,
-            'slug' => $this->slug,
-            'nombre' => $this->nombre,
-            'descripcion' => $this->descripcion,
-            'precio' => $this->precio,
-            'category' => $this->whenLoaded('category', fn () => $this->category?->nombre),
-            'brand' => $this->whenLoaded('brand', fn () => $this->brand?->nombre),
-            'images' => $this->whenLoaded('attachments', fn () => $this->attachments
-                ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                ->values()
-            ),
-            'attributes' => AttributeResource::collection($this->whenLoaded('attributes')),
-            'variants_map' => $this->whenLoaded('variants', fn () => $this->variants
-                ->map(fn ($variant) => [
-                    'variant_id' => $variant->id,
-                    'cantidad_maxima' => $variant->stock_tecnico,
-                    'attributes' => $variant->definitions
-                        ->mapWithKeys(fn ($definition) => [
-                            $definition->productAttribute?->attribute?->codigo => $definition->value,
-                        ])
-                        ->filter(fn ($value, $key) => $key !== null)
-                        ->toArray(),
-                ])
-                ->values()
-            ),
-            'variant' => $this->when(
-                $this->getSelectedVariant() !== null,
-                fn () => ProductVariantResource::make($this->getSelectedVariant())
-            ),
-        ];
-    }
-}

app/Domains/Catalog/Resources/ProductVariantDefinitionResource.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Catalog\Models\ProductVariantDefinition
- */
-class ProductVariantDefinitionResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'producto_variante_id' => $this->producto_variante_id,
-            'products_attribute_id' => $this->products_attribute_id,
-            'attribute_id' => $this->whenLoaded('productAttribute', fn () => $this->productAttribute?->attribute_id),
-            'value' => $this->value,
-            'attribute' => $this->whenLoaded('productAttribute', fn () => $this->productAttribute?->attribute?->nombre),
-            'metadata' => $this->resolveMetadata(),
-        ];
-    }
-
-    /**
-     * @return array<string, mixed>|null
-     */
-    protected function resolveMetadata(): ?array
-    {
-        if (! $this->relationLoaded('productAttribute')) {
-            return null;
-        }
-
-        $attribute = $this->productAttribute?->attribute;
-
-        if (! $attribute?->relationLoaded('options')) {
-            return null;
-        }
-
-        $option = $attribute->options->firstWhere('value', $this->value);
-
-        if ($option === null || $option->metadata === null) {
-            return null;
-        }
-
-        return $option->metadata;
-    }
-}

app/Domains/Catalog/Resources/ProductVariantResource.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use App\Domains\Catalog\Models\ProductVariant;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin ProductVariant
- */
-class ProductVariantResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'cantidad_maxima' => $this->stock_tecnico,
-            'product' => ProductResource::make($this->whenLoaded('product')),
-            'definitions' => $this->whenLoaded(
-                'definitions',
-                fn () => $this->definitions
-                    ->mapWithKeys(fn ($definition) => [
-                        $definition->productAttribute?->attribute?->codigo => $definition->value,
-                    ])
-                    ->filter(fn ($value, $key) => $key !== null)
-                    ->toArray()
-            ),
-            'images' => $this->whenLoaded('attachments', function () {
-                if ($this->attachments->isNotEmpty()) {
-                    return $this->attachments
-                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                        ->values();
-                }
-
-                if ($this->relationLoaded('fallbackAttachments')) {
-                    return $this->fallbackAttachments
-                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                        ->values();
-                }
-
-                if ($this->relationLoaded('product') && $this->product?->relationLoaded('attachments')) {
-                    return $this->product->attachments
-                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                        ->values();
-                }
-
-                return collect();
-            }),
-        ];
-    }
-}

app/Domains/Catalog/Services/CatalogInventoryService.php

@@ -0,0 +1,218 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\BundleComponent;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\Variant;
+use Illuminate\Support\Facades\DB;
+
+class CatalogInventoryService
+{
+    public function availableQuantity(CatalogItem|Variant $selection): ?int
+    {
+        if ($selection instanceof CatalogItem
+            && $selection->type === CatalogItemType::Standard
+            && $selection->relationLoaded('inventory')
+            && $selection->inventory !== null) {
+            return $selection->inventory_policy === InventoryPolicy::Unlimited
+                ? null
+                : $selection->inventory->availableStock();
+        }
+
+        if ($selection instanceof CatalogItem
+            && $selection->type === CatalogItemType::Standard
+            && $selection->inventory_id === null) {
+            if ($selection->inventory_policy === InventoryPolicy::Unlimited) {
+                return null;
+            }
+
+            $selection->loadMissing('variants.inventory');
+
+            return $selection->variants->sum(
+                fn (Variant $variant): int => $variant->inventory->availableStock(),
+            );
+        }
+
+        $requirements = $this->inventoryRequirements($selection);
+        $trackedRequirements = array_filter(
+            $requirements,
+            fn (array $requirement): bool => $requirement['tracks_inventory'],
+        );
+
+        if ($trackedRequirements === []) {
+            return null;
+        }
+
+        $inventories = Inventory::query()
+            ->whereKey(array_keys($trackedRequirements))
+            ->get()
+            ->keyBy('id');
+        $available = [];
+
+        foreach ($trackedRequirements as $inventoryId => $requirement) {
+            $inventory = $inventories->get($inventoryId)
+                ?? throw new \InvalidArgumentException('No se encontro el inventario requerido.');
+            $available[] = intdiv(
+                $inventory->availableStock(),
+                $requirement['quantity'],
+            );
+        }
+
+        return min($available);
+    }
+
+    public function reserve(CatalogItem|Variant $selection, int $quantity): void
+    {
+        $this->mutate($selection, $quantity, 'reserve');
+    }
+
+    public function release(CatalogItem|Variant $selection, int $quantity): void
+    {
+        $this->mutate($selection, $quantity, 'release');
+    }
+
+    public function commit(CatalogItem|Variant $selection, int $quantity): void
+    {
+        $this->mutate($selection, $quantity, 'commit');
+    }
+
+    private function mutate(
+        CatalogItem|Variant $selection,
+        int $quantity,
+        string $operation,
+    ): void {
+        if ($quantity <= 0) {
+            throw new \InvalidArgumentException('La cantidad debe ser mayor a cero.');
+        }
+
+        DB::transaction(function () use ($selection, $quantity, $operation): void {
+            $requirements = $this->inventoryRequirements($selection);
+            ksort($requirements);
+            $inventories = Inventory::query()
+                ->whereKey(array_keys($requirements))
+                ->orderBy('id')
+                ->lockForUpdate()
+                ->get()
+                ->keyBy('id');
+
+            foreach ($requirements as $inventoryId => $requirement) {
+                $inventory = $inventories->get($inventoryId)
+                    ?? throw new \InvalidArgumentException('No se encontro el inventario requerido.');
+                $requiredQuantity = $requirement['quantity'] * $quantity;
+
+                if ($operation === 'reserve'
+                    && $requirement['tracks_inventory']
+                    && $inventory->availableStock() < $requiredQuantity) {
+                    throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
+                }
+
+                if (in_array($operation, ['release', 'commit'], true)
+                    && $inventory->reserved_stock < $requiredQuantity) {
+                    throw new \InvalidArgumentException('La cantidad reservada no alcanza para la operacion.');
+                }
+
+                if ($operation === 'commit'
+                    && $requirement['tracks_inventory']
+                    && $inventory->real_stock < $requiredQuantity) {
+                    throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
+                }
+            }
+
+            foreach ($requirements as $inventoryId => $requirement) {
+                /** @var Inventory $inventory */
+                $inventory = $inventories->get($inventoryId);
+                $requiredQuantity = $requirement['quantity'] * $quantity;
+
+                match ($operation) {
+                    'reserve' => $inventory->reserve($requiredQuantity, $requirement['tracks_inventory']),
+                    'release' => $inventory->release($requiredQuantity),
+                    'commit' => $inventory->buy($requiredQuantity, $requirement['tracks_inventory']),
+                };
+            }
+        });
+    }
+
+    /**
+     * @return array<int, array{quantity: int, tracks_inventory: bool}>
+     */
+    private function inventoryRequirements(CatalogItem|Variant $selection): array
+    {
+        if ($selection instanceof Variant) {
+            $selection->loadMissing('catalogItem');
+
+            return $this->singleRequirement(
+                $selection->inventory_id,
+                $selection->catalogItem->inventory_policy,
+            );
+        }
+
+        if ($selection->type !== CatalogItemType::Bundle) {
+            return $this->singleRequirement(
+                $selection->inventory_id,
+                $selection->inventory_policy,
+            );
+        }
+
+        $selection->loadMissing([
+            'bundleComponents.catalogItem',
+            'bundleComponents.variant.catalogItem',
+        ]);
+        $requirements = [];
+
+        foreach ($selection->bundleComponents as $component) {
+            $this->addComponentRequirement($requirements, $component);
+        }
+
+        if ($requirements === []) {
+            throw new \InvalidArgumentException('El bundle no tiene componentes.');
+        }
+
+        return $requirements;
+    }
+
+    /** @return array<int, array{quantity: int, tracks_inventory: bool}> */
+    private function singleRequirement(
+        ?int $inventoryId,
+        ?InventoryPolicy $policy,
+    ): array {
+        if ($inventoryId === null || $policy === null) {
+            throw new \InvalidArgumentException('El item requiere una variante con inventario.');
+        }
+
+        return [
+            $inventoryId => [
+                'quantity' => 1,
+                'tracks_inventory' => $policy === InventoryPolicy::Tracked,
+            ],
+        ];
+    }
+
+    /**
+     * @param  array<int, array{quantity: int, tracks_inventory: bool}>  $requirements
+     */
+    private function addComponentRequirement(array &$requirements, BundleComponent $component): void
+    {
+        $selectedItem = $component->variant ?? $component->catalogItem;
+        $inventoryId = $selectedItem->inventory_id;
+        $policy = $component->catalogItem->inventory_policy;
+
+        if ($inventoryId === null || $policy === null) {
+            throw new \InvalidArgumentException('Un componente del bundle no tiene inventario.');
+        }
+
+        if (isset($requirements[$inventoryId])) {
+            $requirements[$inventoryId]['quantity'] += $component->quantity;
+
+            return;
+        }
+
+        $requirements[$inventoryId] = [
+            'quantity' => $component->quantity,
+            'tracks_inventory' => $policy === InventoryPolicy::Tracked,
+        ];
+    }
+}