Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99427cd48c |
187
.github/copilot-context.md
vendored
187
.github/copilot-context.md
vendored
@@ -1,187 +0,0 @@
|
||||
# Configuración Avanzada de GitHub Copilot para ServiceManagerWeb
|
||||
|
||||
## Variables de Contexto Importantes
|
||||
|
||||
### Configuración del Sistema
|
||||
```env
|
||||
# Variables críticas a considerar
|
||||
DATABASE_URL=postgresql+asyncpg://user:pass@localhost:5432/servicemanager
|
||||
REDIS_URL=redis://localhost:6379/0
|
||||
JWT_SECRET_KEY=your-secret-key
|
||||
TENANT_ISOLATION=strict
|
||||
CORS_ORIGINS=["http://localhost:3000", "http://localhost:3001"]
|
||||
```
|
||||
|
||||
### Modelos de Datos Clave
|
||||
|
||||
#### User Model Completo
|
||||
```python
|
||||
class User(Base):
|
||||
__tablename__ = "users"
|
||||
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
tenant_id: Mapped[int] = mapped_column(ForeignKey("tenants.id"))
|
||||
email: Mapped[str] = mapped_column(unique=True, index=True)
|
||||
role: Mapped[UserRole] = mapped_column(default=UserRole.CLIENT_USER)
|
||||
is_active: Mapped[bool] = mapped_column(default=True)
|
||||
created_at: Mapped[datetime] = mapped_column(default=datetime.utcnow)
|
||||
```
|
||||
|
||||
#### Ticket Workflow States
|
||||
```python
|
||||
class TicketStatus(str, Enum):
|
||||
OPEN = "open"
|
||||
IN_PROGRESS = "in_progress"
|
||||
PENDING_CLIENT = "pending_client"
|
||||
RESOLVED = "resolved"
|
||||
CLOSED = "closed"
|
||||
CANCELLED = "cancelled"
|
||||
```
|
||||
|
||||
## Reglas de Implementación Específicas
|
||||
|
||||
### 1. Multi-Tenancy Estricto
|
||||
- NUNCA hacer queries sin filtrar por `tenant_id`
|
||||
- Middleware de tenant debe estar en toda request
|
||||
- Validar permisos a nivel de tenant antes de operaciones
|
||||
|
||||
### 2. Audit Trail Obligatorio
|
||||
```python
|
||||
async def log_audit_event(
|
||||
action: str,
|
||||
resource_type: str,
|
||||
resource_id: int,
|
||||
user_id: int,
|
||||
tenant_id: int,
|
||||
details: dict = None
|
||||
):
|
||||
# Implementar en todas las operaciones CRUD críticas
|
||||
```
|
||||
|
||||
### 3. Error Handling Consistente
|
||||
```python
|
||||
# Backend
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Insufficient permissions for tenant resource"
|
||||
)
|
||||
|
||||
# Frontend
|
||||
import { toast } from '$lib/stores/toast';
|
||||
toast.error("Error al procesar la solicitud");
|
||||
```
|
||||
|
||||
### 4. Performance Patterns
|
||||
```python
|
||||
# Queries con paginación siempre
|
||||
async def get_tickets_paginated(
|
||||
db: AsyncSession,
|
||||
tenant_id: int,
|
||||
skip: int = 0,
|
||||
limit: int = 20
|
||||
) -> Tuple[List[Ticket], int]:
|
||||
# Select con join optimizado + count total
|
||||
```
|
||||
|
||||
## Componentes Frontend Reutilizables
|
||||
|
||||
### Layout Structure
|
||||
```
|
||||
+layout.svelte (global)
|
||||
├── Header.svelte (navigation)
|
||||
├── Sidebar.svelte (menu)
|
||||
└── Toast.svelte (notifications)
|
||||
```
|
||||
|
||||
### Form Patterns
|
||||
```typescript
|
||||
// Validation con Zod
|
||||
const createTicketSchema = z.object({
|
||||
title: z.string().min(5).max(200),
|
||||
description: z.string().min(10),
|
||||
priority: z.nativeEnum(TicketPriority),
|
||||
category_id: z.number().positive()
|
||||
});
|
||||
```
|
||||
|
||||
## Debugging y Logging
|
||||
|
||||
### Backend Logging
|
||||
```python
|
||||
import structlog
|
||||
logger = structlog.get_logger(__name__)
|
||||
|
||||
# En cada endpoint
|
||||
logger.info(
|
||||
"ticket_created",
|
||||
ticket_id=ticket.id,
|
||||
user_id=current_user.id,
|
||||
tenant_id=current_user.tenant_id,
|
||||
correlation_id=request.correlation_id
|
||||
)
|
||||
```
|
||||
|
||||
### Frontend Error Boundary
|
||||
```svelte
|
||||
<!-- En +layout.svelte -->
|
||||
{#if $page.error}
|
||||
<ErrorComponent error={$page.error} />
|
||||
{/if}
|
||||
```
|
||||
|
||||
## Comandos de Desarrollo Específicos
|
||||
|
||||
```bash
|
||||
# Backend development
|
||||
cd backend && uvicorn app.main:app --reload --port 8000
|
||||
|
||||
# Frontend internal (admin panel)
|
||||
cd frontend-internal && npm run dev -- --port 3001
|
||||
|
||||
# Frontend client (customer portal)
|
||||
cd frontend-client && npm run dev -- --port 3000
|
||||
|
||||
# Workers
|
||||
cd workers && celery -A app.celery worker --loglevel=info
|
||||
|
||||
# Full stack con Docker
|
||||
docker-compose -f docker-compose.dev.yml up
|
||||
|
||||
# Database operations
|
||||
docker-compose exec backend alembic revision --autogenerate -m "Description"
|
||||
docker-compose exec backend alembic upgrade head
|
||||
|
||||
# Testing complete
|
||||
docker-compose exec backend pytest -v --cov=app
|
||||
```
|
||||
|
||||
## Code Review Checklist
|
||||
|
||||
- [ ] ✅ Multi-tenant isolation verificado
|
||||
- [ ] 🔒 Autenticación/autorización implementada
|
||||
- [ ] 📊 Audit logging en operaciones críticas
|
||||
- [ ] 🚀 Performance considerado (índices, paginación)
|
||||
- [ ] 🧪 Tests unitarios/integración agregados
|
||||
- [ ] 📝 OpenAPI documentation actualizada
|
||||
- [ ] 🎨 UI/UX consistente con design system
|
||||
- [ ] 🐛 Error handling comprehensivo
|
||||
- [ ] 📱 Responsive design verificado
|
||||
- [ ] 🔍 Type safety con TypeScript/mypy
|
||||
|
||||
## Herramientas de Calidad
|
||||
|
||||
```bash
|
||||
# Python quality
|
||||
ruff check . --fix
|
||||
black .
|
||||
mypy .
|
||||
bandit -r app/
|
||||
safety check
|
||||
|
||||
# JavaScript/TypeScript quality
|
||||
npm run lint
|
||||
npm run type-check
|
||||
npm run format
|
||||
```
|
||||
|
||||
Esta configuración te ayudará a mantener la calidad enterprise del sistema ServiceManagerWeb.
|
||||
94
.github/copilot-instructions.md
vendored
94
.github/copilot-instructions.md
vendored
@@ -98,98 +98,4 @@ black .
|
||||
mypy .
|
||||
```
|
||||
|
||||
## Configuración de IA Especializada
|
||||
|
||||
### Prioridades de Asistencia
|
||||
1. **Seguridad primero**: Siempre implementar autenticación/autorización en nuevos endpoints
|
||||
2. **Multi-tenancy**: Verificar aislamiento de datos entre tenants en toda nueva funcionalidad
|
||||
3. **Performance**: Considerar impacto en bases de datos grandes (índices, paginación, caching)
|
||||
4. **Auditabilidad**: Registrar acciones sensibles en el sistema de audit
|
||||
5. **Escalabilidad**: Código preparado para crecimiento empresarial
|
||||
|
||||
### Patrones Preferidos
|
||||
|
||||
#### Backend (FastAPI)
|
||||
```python
|
||||
# Estructura de endpoint típica
|
||||
@router.post("/", response_model=schemas.TicketResponse)
|
||||
async def create_ticket(
|
||||
ticket: schemas.TicketCreate,
|
||||
current_user: models.User = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
# 1. Validar permisos multi-tenant
|
||||
# 2. Procesar lógica de negocio
|
||||
# 3. Audit log
|
||||
# 4. Return response
|
||||
```
|
||||
|
||||
#### Frontend (SvelteKit)
|
||||
```typescript
|
||||
// Store pattern con Zod validation
|
||||
import { z } from 'zod';
|
||||
import { writable } from 'svelte/store';
|
||||
|
||||
const TicketSchema = z.object({
|
||||
title: z.string().min(5),
|
||||
priority: z.enum(['LOW', 'MEDIUM', 'HIGH', 'URGENT'])
|
||||
});
|
||||
```
|
||||
|
||||
### Contexto de Archivos Clave
|
||||
|
||||
#### Backend Core
|
||||
- `app/core/security.py`: JWT, permissions, rate limiting
|
||||
- `app/middleware/tenant.py`: Multi-tenant context
|
||||
- `app/models/`: SQLAlchemy models con relationships
|
||||
- `app/api/v1/endpoints/`: Endpoints REST por dominio
|
||||
|
||||
#### Frontend Routing
|
||||
- `frontend-internal/`: Panel administrativo interno
|
||||
- `frontend-client/`: Portal de clientes
|
||||
- Ambos usan SvelteKit con layout compartido
|
||||
|
||||
#### Workers/Tasks
|
||||
- `workers/app/tasks/`: Tareas Celery asíncronas
|
||||
- `email_tasks.py`: Notificaciones y plantillas
|
||||
- `sla_tasks.py`: Monitoreo de SLAs automático
|
||||
|
||||
### Troubleshooting Común
|
||||
|
||||
#### Database Issues
|
||||
```bash
|
||||
# Reset migrations
|
||||
docker-compose exec backend alembic downgrade base
|
||||
docker-compose exec backend alembic upgrade head
|
||||
```
|
||||
|
||||
#### Multi-tenant Debug
|
||||
- Verificar `tenant_context` middleware
|
||||
- Headers: `X-Tenant-ID` en requests
|
||||
- Queries siempre filtrar por tenant_id
|
||||
|
||||
#### Frontend Build Errors
|
||||
```bash
|
||||
cd frontend-internal && npm run build
|
||||
cd frontend-client && npm run build
|
||||
```
|
||||
|
||||
### Convenciones de Desarrollo
|
||||
|
||||
#### Naming
|
||||
- **Models**: PascalCase (User, Ticket, TenantOrganization)
|
||||
- **Endpoints**: kebab-case (/api/v1/user-management/)
|
||||
- **Components**: PascalCase.svelte (TicketCard.svelte)
|
||||
- **Stores**: camelCase (ticketStore.ts)
|
||||
|
||||
#### Error Handling
|
||||
- Backend: HTTPException con status codes apropiados
|
||||
- Frontend: Toast notifications para UX
|
||||
- Logs: Structured logging con correlation IDs
|
||||
|
||||
#### Testing Strategy
|
||||
- Unit: Lógica de negocio y validaciones
|
||||
- Integration: Endpoints completos con DB
|
||||
- E2E: Flujos críticos multi-tenant
|
||||
|
||||
Cuando trabajes en este proyecto, siempre considera la naturaleza multi-tenant y empresarial del sistema.
|
||||
BIN
Zpracticante/Backups/respaldo_docker_v1.sql
Normal file
BIN
Zpracticante/Backups/respaldo_docker_v1.sql
Normal file
Binary file not shown.
BIN
Zpracticante/Documentacion Practicas.docx
Normal file
BIN
Zpracticante/Documentacion Practicas.docx
Normal file
Binary file not shown.
Binary file not shown.
22
backend/add_columns.py
Normal file
22
backend/add_columns.py
Normal file
@@ -0,0 +1,22 @@
|
||||
import asyncio
|
||||
from sqlalchemy import text
|
||||
from app.core.database import engine
|
||||
|
||||
async def add_columns():
|
||||
print("Starting schema update...")
|
||||
async with engine.begin() as conn:
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE tickets ADD COLUMN system_id UUID REFERENCES systems(id)"))
|
||||
print("Added system_id column")
|
||||
except Exception as e:
|
||||
print(f"Error adding system_id (might exist): {e}")
|
||||
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE tickets ADD COLUMN category_id UUID REFERENCES categories(id)"))
|
||||
print("Added category_id column")
|
||||
except Exception as e:
|
||||
print(f"Error adding category_id (might exist): {e}")
|
||||
print("Schema update finished.")
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(add_columns())
|
||||
@@ -1,54 +1,7 @@
|
||||
# A generic, single database configuration for ServiceManagerWeb
|
||||
|
||||
[alembic]
|
||||
# path to migration scripts
|
||||
script_location = migrations
|
||||
script_location = backend/alembic
|
||||
sqlalchemy.url = postgresql+asyncpg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
|
||||
|
||||
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
||||
# Uncomment the line below if you want the files to be prepended with date and time
|
||||
# file_template = %%(year)d%%(month).2d%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
||||
|
||||
# sys.path path, will be prepended to sys.path if present.
|
||||
# defaults to the current working directory.
|
||||
prepend_sys_path = .
|
||||
|
||||
# timezone to use when rendering the date within the migration file
|
||||
# as well as the filename.
|
||||
# If specified, requires the python-dateutil library that can be
|
||||
# installed by adding `alembic[tz]` to the pip requirements
|
||||
# string value is passed to dateutil.tz.gettz()
|
||||
# leave blank for localtime
|
||||
# timezone =
|
||||
|
||||
# max length of characters to apply to the
|
||||
# "slug" field
|
||||
# truncate_slug_length = 40
|
||||
|
||||
# set to 'true' to run the environment during
|
||||
# the 'revision' command, regardless of autogenerate
|
||||
# revision_environment = false
|
||||
|
||||
# set to 'true' to allow .pyc and .pyo files without
|
||||
# a source .py file to be detected as revisions in the
|
||||
# versions/ directory
|
||||
# sourceless = false
|
||||
|
||||
# version path separator; As mentioned above, this is the character used to split
|
||||
# version_locations. The default within new alembic.ini files is "os", which uses
|
||||
# os.pathsep. If this key is omitted entirely, it falls back to the legacy
|
||||
# behavior of splitting on spaces and/or commas.
|
||||
# Valid values for version_path_separator are:
|
||||
#
|
||||
# version_path_separator = :
|
||||
# version_path_separator = ;
|
||||
# version_path_separator = space
|
||||
version_path_separator = os
|
||||
|
||||
# the output encoding used when revision files
|
||||
# are written from script.py.mako
|
||||
# output_encoding = utf-8
|
||||
|
||||
# Logging configuration
|
||||
[loggers]
|
||||
keys = root,sqlalchemy,alembic
|
||||
|
||||
@@ -80,5 +33,4 @@ level = NOTSET
|
||||
formatter = generic
|
||||
|
||||
[formatter_generic]
|
||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||
datefmt = %H:%M:%S
|
||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||
65
backend/alembic/env.py
Normal file
65
backend/alembic/env.py
Normal file
@@ -0,0 +1,65 @@
|
||||
from logging.config import fileConfig
|
||||
from sqlalchemy import engine_from_config
|
||||
from sqlalchemy import pool
|
||||
from alembic import context
|
||||
import os
|
||||
from dotenv import load_dotenv
|
||||
import sys
|
||||
import os
|
||||
from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
|
||||
import asyncio
|
||||
|
||||
# Cargar variables de entorno desde .env
|
||||
load_dotenv()
|
||||
|
||||
# Agregar el directorio 'backend' al PYTHONPATH
|
||||
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
# Configuración de Alembic
|
||||
config = context.config
|
||||
|
||||
# Configurar logging
|
||||
if config.config_file_name is not None:
|
||||
fileConfig(config.config_file_name)
|
||||
|
||||
# Agregar la URL de la base de datos desde las variables de entorno
|
||||
config.set_main_option(
|
||||
"sqlalchemy.url",
|
||||
os.getenv("DATABASE_URL", "postgresql+asyncpg://user:password@localhost/dbname")
|
||||
)
|
||||
|
||||
# Importar modelos para las migraciones
|
||||
from app.models import * # Importa todos los modelos aquí
|
||||
from app.core.database import Base
|
||||
|
||||
target_metadata = Base.metadata # Reemplaza con tu metadata
|
||||
|
||||
# Cambiar el motor a asíncrono para Alembic
|
||||
from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
|
||||
|
||||
# Crear el motor asíncrono
|
||||
connectable = create_async_engine(
|
||||
os.getenv("DATABASE_URL", "postgresql+asyncpg://user:password@localhost/dbname"),
|
||||
echo=True, # Habilitar logs para depuración
|
||||
)
|
||||
|
||||
async def run_migrations():
|
||||
async with connectable.connect() as connection:
|
||||
await connection.run_sync(do_run_migrations)
|
||||
|
||||
def do_run_migrations(connection):
|
||||
context.configure(connection=connection, target_metadata=target_metadata)
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
# Configurar migraciones en modo offline
|
||||
def run_migrations_offline():
|
||||
context.configure(url=os.getenv("DATABASE_URL"), target_metadata=target_metadata, literal_binds=True)
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
if context.is_offline_mode():
|
||||
run_migrations_offline()
|
||||
else:
|
||||
asyncio.run(run_migrations())
|
||||
28
backend/alembic/versions/add_clients_table.py
Normal file
28
backend/alembic/versions/add_clients_table.py
Normal file
@@ -0,0 +1,28 @@
|
||||
"""
|
||||
Add clients table
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import inspect
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = "add_clients_table"
|
||||
down_revision = None
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
def upgrade():
|
||||
bind = op.get_bind()
|
||||
inspector = inspect(bind)
|
||||
if 'clients' not in inspector.get_table_names():
|
||||
op.create_table(
|
||||
'clients',
|
||||
sa.Column('id', sa.Integer, primary_key=True, autoincrement=True),
|
||||
sa.Column('name', sa.String, nullable=False),
|
||||
sa.Column('email', sa.String, nullable=False, unique=True),
|
||||
sa.Column('phone', sa.String, nullable=False),
|
||||
)
|
||||
|
||||
def downgrade():
|
||||
op.drop_table('clients')
|
||||
20
backend/alembic/versions/add_system_id_to_tickets.py
Normal file
20
backend/alembic/versions/add_system_id_to_tickets.py
Normal file
@@ -0,0 +1,20 @@
|
||||
"""
|
||||
Agregar columna system_id a la tabla tickets
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
# Revisión ID y dependencias
|
||||
revision = 'add_system_id_to_tickets'
|
||||
down_revision = None
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
def upgrade():
|
||||
"""Agregar columna system_id a la tabla tickets."""
|
||||
op.add_column('tickets', sa.Column('system_id', sa.UUID, nullable=True))
|
||||
|
||||
def downgrade():
|
||||
"""Eliminar columna system_id de la tabla tickets."""
|
||||
op.drop_column('tickets', 'system_id')
|
||||
18
backend/alembic/versions/add_updated_at_to_category.py
Normal file
18
backend/alembic/versions/add_updated_at_to_category.py
Normal file
@@ -0,0 +1,18 @@
|
||||
"""
|
||||
Add updated_at column to ticket_categories
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = "add_updated_at_to_category"
|
||||
down_revision = "add_clients_table"
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
def upgrade():
|
||||
op.add_column("ticket_categories", sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True))
|
||||
|
||||
def downgrade():
|
||||
op.drop_column("ticket_categories", "updated_at")
|
||||
@@ -9,7 +9,6 @@ from app.core.database import get_db
|
||||
from app.core.security import security
|
||||
from app.core.config import get_settings
|
||||
from app.models.user import User, UserRole
|
||||
from app.models.tenant import Tenant
|
||||
|
||||
settings = get_settings()
|
||||
|
||||
@@ -57,19 +56,12 @@ async def get_current_active_superuser(
|
||||
)
|
||||
return current_user
|
||||
|
||||
|
||||
async def get_current_tenant(
|
||||
async def get_current_active_user(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
) -> Tenant:
|
||||
"""Obtener el tenant del usuario actual."""
|
||||
result = await db.execute(select(Tenant).where(Tenant.id == current_user.tenant_id))
|
||||
tenant = result.scalar_one_or_none()
|
||||
|
||||
if not tenant:
|
||||
) -> User:
|
||||
if not current_user.is_active:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Tenant not found"
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Inactive user",
|
||||
)
|
||||
|
||||
return tenant
|
||||
return current_user
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
"""Schemas package initialization."""
|
||||
|
||||
from .client_profile import (
|
||||
ClientProfileCreate,
|
||||
ClientProfileUpdate,
|
||||
ClientProfileResponse,
|
||||
ClientProfileSummary
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"ClientProfileCreate",
|
||||
"ClientProfileUpdate",
|
||||
"ClientProfileResponse",
|
||||
"ClientProfileSummary"
|
||||
]
|
||||
@@ -1,25 +0,0 @@
|
||||
"""
|
||||
Attachment Schemas - ServiceManagerWeb
|
||||
"""
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
import uuid
|
||||
|
||||
|
||||
class AttachmentResponse(BaseModel):
|
||||
"""Schema para respuesta de attachment"""
|
||||
id: uuid.UUID
|
||||
ticket_id: uuid.UUID
|
||||
comment_id: Optional[uuid.UUID] = None
|
||||
uploaded_by: uuid.UUID
|
||||
filename: str
|
||||
original_filename: str
|
||||
mime_type: str
|
||||
file_size: int
|
||||
file_path: str
|
||||
uploaded_by_name: Optional[str] = None
|
||||
created_at: datetime
|
||||
download_url: Optional[str] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
@@ -1,191 +0,0 @@
|
||||
"""
|
||||
Audit Schemas - ServiceManagerWeb
|
||||
|
||||
Schemas Pydantic para endpoints de auditoría
|
||||
"""
|
||||
|
||||
from pydantic import BaseModel, Field, UUID4
|
||||
from typing import Optional, Dict, Any
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
class AuditLogBase(BaseModel):
|
||||
"""Schema base para audit logs."""
|
||||
action: str = Field(..., description="Acci├│n realizada (ej: ticket.create)")
|
||||
resource_type: str = Field(..., description="Tipo de recurso (ticket, user, etc.)")
|
||||
resource_id: Optional[UUID4] = Field(None, description="ID del recurso afectado")
|
||||
extra_metadata: Optional[Dict[str, Any]] = Field(None, description="Metadata adicional", alias="metadata")
|
||||
|
||||
|
||||
class AuditLogResponse(AuditLogBase):
|
||||
"""
|
||||
Schema de respuesta para audit logs.
|
||||
|
||||
Incluye toda la informaci├│n del log con datos del usuario.
|
||||
"""
|
||||
id: UUID4
|
||||
tenant_id: UUID4
|
||||
user_id: Optional[UUID4]
|
||||
|
||||
# Informaci├│n del usuario (si existe)
|
||||
user_email: Optional[str] = None
|
||||
user_name: Optional[str] = None
|
||||
user_role: Optional[str] = None
|
||||
|
||||
# Contexto de la acci├│n
|
||||
ip_address: Optional[str]
|
||||
user_agent: Optional[str]
|
||||
correlation_id: Optional[UUID4]
|
||||
|
||||
# Cambios realizados
|
||||
old_values: Optional[Dict[str, Any]]
|
||||
new_values: Optional[Dict[str, Any]]
|
||||
|
||||
# Timestamp
|
||||
created_at: datetime
|
||||
|
||||
# Display friendly
|
||||
action_display: str = Field(description="Acci├│n en formato amigable")
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
# ===================================
|
||||
# SECURITY ANALYSIS SCHEMAS
|
||||
# ===================================
|
||||
|
||||
class SecurityThreatPattern(BaseModel):
|
||||
"""Patrón de amenaza detectado."""
|
||||
type: str = Field(description="Tipo de amenaza (brute_force, privilege_escalation, etc.)")
|
||||
severity: str = Field(description="Severidad: low, medium, high, critical")
|
||||
description: str = Field(description="Descripción de la amenaza")
|
||||
occurrences: int = Field(description="Número de ocurrencias")
|
||||
affected_ips: list[str] = Field(default=[], description="IPs involucradas")
|
||||
affected_users: list[str] = Field(default=[], description="Usuarios afectados")
|
||||
first_seen: datetime = Field(description="Primera ocurrencia")
|
||||
last_seen: datetime = Field(description="Última ocurrencia")
|
||||
recommendations: list[str] = Field(default=[], description="Recomendaciones de acción")
|
||||
|
||||
|
||||
class SecurityAnalysisResponse(BaseModel):
|
||||
"""Análisis completo de seguridad."""
|
||||
overall_risk_level: str = Field(description="Nivel de riesgo general: safe, low, medium, high, critical")
|
||||
total_threats_detected: int = Field(description="Total de amenazas detectadas")
|
||||
threats: list[SecurityThreatPattern] = Field(description="Lista de amenazas detectadas")
|
||||
analysis_period_hours: int = Field(description="Período de análisis en horas")
|
||||
generated_at: datetime = Field(description="Timestamp del análisis")
|
||||
|
||||
# Estadísticas de seguridad
|
||||
failed_login_attempts: int = Field(description="Intentos fallidos de login")
|
||||
suspicious_ips_count: int = Field(description="IPs sospechosas detectadas")
|
||||
critical_actions_count: int = Field(description="Acciones críticas realizadas")
|
||||
|
||||
# Opciones de acción
|
||||
recommended_actions: list[str] = Field(default=[], description="Acciones recomendadas")
|
||||
|
||||
|
||||
class SecurityActionRequest(BaseModel):
|
||||
"""Solicitud de acción de seguridad."""
|
||||
action_type: str = Field(description="Tipo de acción: block_ip, notify_admin, reset_password, etc.")
|
||||
target: str = Field(description="Objetivo de la acción (IP, email, etc.)")
|
||||
reason: str = Field(description="Razón de la acción")
|
||||
duration_minutes: Optional[int] = Field(None, description="Duración del bloqueo en minutos")
|
||||
|
||||
|
||||
class SecurityActionResponse(BaseModel):
|
||||
"""Respuesta de acción de seguridad."""
|
||||
success: bool = Field(description="Si la acción fue exitosa")
|
||||
message: str = Field(description="Mensaje descriptivo")
|
||||
action_id: Optional[UUID4] = Field(None, description="ID de la acción registrada")
|
||||
|
||||
|
||||
class SecurityIncidentResponse(BaseModel):
|
||||
"""Respuesta para incidentes de seguridad."""
|
||||
id: str = Field(description="ID único del incidente")
|
||||
title: str = Field(description="Título del incidente")
|
||||
description: Optional[str] = Field(None, description="Descripción detallada")
|
||||
severity: str = Field(description="Severidad: low, medium, high, critical")
|
||||
status: str = Field(description="Estado: active, investigating, resolved")
|
||||
incident_type: str = Field(description="Tipo de incidente")
|
||||
affected_user: Optional[str] = Field(None, description="Usuario afectado")
|
||||
source_ip: Optional[str] = Field(None, description="IP origen del incidente")
|
||||
evidence: list[str] = Field(default=[], description="Evidencia del incidente")
|
||||
metadata: Optional[Dict[str, Any]] = Field(None, description="Metadata adicional")
|
||||
created_at: datetime = Field(description="Fecha de creación")
|
||||
updated_at: Optional[datetime] = Field(None, description="Última actualización")
|
||||
resolved_at: Optional[datetime] = Field(None, description="Fecha de resolución")
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class SecurityIncidentListResponse(BaseModel):
|
||||
"""Respuesta paginada de incidentes de seguridad."""
|
||||
incidents: list[SecurityIncidentResponse]
|
||||
total: int = Field(description="Total de incidentes")
|
||||
page: int = Field(description="Página actual")
|
||||
per_page: int = Field(description="Incidentes por página")
|
||||
total_pages: int = Field(description="Total de páginas")
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class AuditLogFilters(BaseModel):
|
||||
"""
|
||||
Filtros para consulta de audit logs.
|
||||
|
||||
Permite filtrar por m├║ltiples criterios.
|
||||
"""
|
||||
# Paginaci├│n
|
||||
page: int = Field(default=1, ge=1, description="Número de página")
|
||||
per_page: int = Field(default=50, ge=1, le=100, description="Elementos por página")
|
||||
|
||||
# Filtros
|
||||
user_id: Optional[UUID4] = Field(None, description="Filtrar por usuario")
|
||||
action: Optional[str] = Field(None, description="Filtrar por acción específica")
|
||||
resource_type: Optional[str] = Field(None, description="Filtrar por tipo de recurso")
|
||||
resource_id: Optional[UUID4] = Field(None, description="Filtrar por ID de recurso")
|
||||
|
||||
# Rango de fechas
|
||||
date_from: Optional[datetime] = Field(None, description="Fecha inicio (ISO 8601)")
|
||||
date_to: Optional[datetime] = Field(None, description="Fecha fin (ISO 8601)")
|
||||
|
||||
# B├║squeda
|
||||
search: Optional[str] = Field(None, description="B├║squeda en acciones o recursos")
|
||||
|
||||
|
||||
class AuditLogStats(BaseModel):
|
||||
"""
|
||||
Estadísticas de auditoría.
|
||||
|
||||
Resumen de actividad del sistema.
|
||||
"""
|
||||
total_actions: int = Field(description="Total de acciones registradas")
|
||||
actions_today: int = Field(description="Acciones en las ├║ltimas 24 horas")
|
||||
actions_this_week: int = Field(description="Acciones en los últimos 7 días")
|
||||
critical_actions_today: int = Field(description="Acciones críticas hoy (delete, cambios sensibles)")
|
||||
|
||||
# Top acciones
|
||||
top_actions: Dict[str, int] = Field(description="Acciones más frecuentes")
|
||||
|
||||
# Top usuarios
|
||||
top_users: Dict[str, int] = Field(description="Usuarios más activos")
|
||||
|
||||
# Actividad por tipo de recurso
|
||||
by_resource_type: Dict[str, int] = Field(description="Acciones por tipo de recurso")
|
||||
|
||||
|
||||
class AuditLogListResponse(BaseModel):
|
||||
"""
|
||||
Respuesta paginada de audit logs.
|
||||
"""
|
||||
logs: list[AuditLogResponse]
|
||||
total: int = Field(description="Total de registros")
|
||||
page: int = Field(description="Página actual")
|
||||
per_page: int = Field(description="Registros por página")
|
||||
total_pages: int = Field(description="Total de páginas")
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
@@ -1,202 +0,0 @@
|
||||
"""
|
||||
Client Profile Schemas - ServiceManagerWeb
|
||||
Esquemas de validación para el perfil empresarial de clientes
|
||||
"""
|
||||
|
||||
from pydantic import BaseModel, Field, validator, EmailStr
|
||||
from typing import Optional
|
||||
from decimal import Decimal
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
|
||||
|
||||
class ClientProfileBase(BaseModel):
|
||||
"""Schema base para ClientProfile."""
|
||||
|
||||
# === INFORMACIÓN GENERAL ===
|
||||
business_name: Optional[str] = Field(None, max_length=255, description="Razón social")
|
||||
commercial_name: Optional[str] = Field(None, max_length=255, description="Nombre comercial")
|
||||
client_code: Optional[str] = Field(None, max_length=50, description="Clave de cliente")
|
||||
client_type: Optional[str] = Field(None, max_length=50, description="Tipo de cliente")
|
||||
rfc: Optional[str] = Field(None, max_length=13, description="RFC (México)")
|
||||
tax_id: Optional[str] = Field(None, max_length=50, description="ID fiscal general")
|
||||
|
||||
# === UBICACIÓN ===
|
||||
country: Optional[str] = Field(None, max_length=100, description="País")
|
||||
state: Optional[str] = Field(None, max_length=100, description="Estado/Provincia")
|
||||
city: Optional[str] = Field(None, max_length=100, description="Ciudad")
|
||||
address: Optional[str] = Field(None, description="Dirección completa")
|
||||
external_number: Optional[str] = Field(None, max_length=20, description="Número exterior")
|
||||
internal_number: Optional[str] = Field(None, max_length=20, description="Número interior")
|
||||
postal_code: Optional[str] = Field(None, max_length=10, description="Código postal")
|
||||
neighborhood: Optional[str] = Field(None, max_length=100, description="Colonia")
|
||||
|
||||
# === CONTACTO ===
|
||||
main_phone: Optional[str] = Field(None, max_length=20, description="Teléfono principal")
|
||||
secondary_phone: Optional[str] = Field(None, max_length=20, description="Teléfono secundario")
|
||||
direct_phone: Optional[str] = Field(None, max_length=20, description="Teléfono directo")
|
||||
phone_extension: Optional[str] = Field(None, max_length=10, description="Extensión")
|
||||
fax: Optional[str] = Field(None, max_length=20, description="Fax")
|
||||
|
||||
# === INFORMACIÓN ADICIONAL ===
|
||||
business_hours: Optional[str] = Field(None, max_length=255, description="Horario de atención")
|
||||
website: Optional[str] = Field(None, max_length=255, description="Página web")
|
||||
main_email: Optional[EmailStr] = Field(None, description="Email principal")
|
||||
billing_email: Optional[EmailStr] = Field(None, description="Email de facturación")
|
||||
|
||||
# === MARKETING ===
|
||||
advertising_medium: Optional[str] = Field(None, max_length=255, description="Medio de publicidad")
|
||||
nationality: Optional[str] = Field(None, max_length=100, description="Nacionalidad")
|
||||
|
||||
# === CONFIGURACIÓN EMPRESARIAL ===
|
||||
logo_url: Optional[str] = Field(None, max_length=500, description="URL del logo")
|
||||
company_representative: Optional[str] = Field(None, max_length=255, description="Representante de empresa")
|
||||
legal_representative: Optional[str] = Field(None, max_length=255, description="Representante legal")
|
||||
|
||||
# === FINANZAS/FACTURACIÓN ===
|
||||
credit_limit: Optional[Decimal] = Field(None, description="Límite de crédito")
|
||||
payment_terms: Optional[str] = Field(None, max_length=100, description="Términos de pago")
|
||||
preferred_currency: str = Field("MXN", max_length=3, description="Moneda preferida")
|
||||
|
||||
# === METADATOS ===
|
||||
send_to_billing: bool = Field(False, description="Enviar a facturación")
|
||||
is_active_client: bool = Field(True, description="Cliente activo")
|
||||
is_prospect: bool = Field(False, description="Es prospecto")
|
||||
notes: Optional[str] = Field(None, description="Notas adicionales")
|
||||
|
||||
@validator('rfc')
|
||||
def validate_rfc(cls, v):
|
||||
"""Validar formato de RFC mexicano."""
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
v = v.strip().upper()
|
||||
if len(v) < 10 or len(v) > 13:
|
||||
raise ValueError('RFC debe tener entre 10 y 13 caracteres')
|
||||
|
||||
# Validación básica de formato RFC
|
||||
import re
|
||||
rfc_pattern = r'^[A-ZÑ&]{3,4}[0-9]{6}[A-Z0-9]{3}$'
|
||||
if not re.match(rfc_pattern, v):
|
||||
raise ValueError('Formato de RFC inválido')
|
||||
|
||||
return v
|
||||
|
||||
@validator('postal_code')
|
||||
def validate_postal_code(cls, v):
|
||||
"""Validar código postal."""
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
v = v.strip()
|
||||
if not v.isdigit() or len(v) != 5:
|
||||
raise ValueError('Código postal debe tener 5 dígitos')
|
||||
|
||||
return v
|
||||
|
||||
@validator('website')
|
||||
def validate_website(cls, v):
|
||||
"""Validar formato de sitio web."""
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
v = v.strip()
|
||||
if not v.startswith(('http://', 'https://')):
|
||||
v = f"https://{v}"
|
||||
|
||||
import re
|
||||
url_pattern = r'^https?://.+\..+'
|
||||
if not re.match(url_pattern, v):
|
||||
raise ValueError('Formato de sitio web inválido')
|
||||
|
||||
return v
|
||||
|
||||
@validator('preferred_currency')
|
||||
def validate_currency(cls, v):
|
||||
"""Validar código de moneda."""
|
||||
valid_currencies = ['MXN', 'USD', 'EUR', 'GBP', 'CAD']
|
||||
if v not in valid_currencies:
|
||||
raise ValueError(f'Moneda debe ser una de: {", ".join(valid_currencies)}')
|
||||
return v
|
||||
|
||||
|
||||
class ClientProfileCreate(ClientProfileBase):
|
||||
"""Schema para crear un perfil de cliente."""
|
||||
pass
|
||||
|
||||
|
||||
class ClientProfileUpdate(ClientProfileBase):
|
||||
"""Schema para actualizar un perfil de cliente."""
|
||||
pass
|
||||
|
||||
|
||||
class ClientProfileResponse(ClientProfileBase):
|
||||
"""Schema de respuesta para ClientProfile."""
|
||||
|
||||
id: uuid.UUID
|
||||
tenant_id: uuid.UUID
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
@property
|
||||
def full_address(self) -> str:
|
||||
"""Dirección completa formateada."""
|
||||
address_parts = []
|
||||
|
||||
if self.address:
|
||||
address_parts.append(self.address)
|
||||
|
||||
if self.external_number:
|
||||
if self.internal_number:
|
||||
address_parts.append(f"#{self.external_number}-{self.internal_number}")
|
||||
else:
|
||||
address_parts.append(f"#{self.external_number}")
|
||||
|
||||
if self.neighborhood:
|
||||
address_parts.append(f"Col. {self.neighborhood}")
|
||||
|
||||
if self.city and self.state:
|
||||
address_parts.append(f"{self.city}, {self.state}")
|
||||
|
||||
if self.postal_code:
|
||||
address_parts.append(f"C.P. {self.postal_code}")
|
||||
|
||||
if self.country:
|
||||
address_parts.append(self.country)
|
||||
|
||||
return ", ".join(address_parts)
|
||||
|
||||
@property
|
||||
def display_name(self) -> str:
|
||||
"""Nombre para mostrar."""
|
||||
return self.commercial_name or self.business_name or "Sin nombre"
|
||||
|
||||
|
||||
class ClientProfileSummary(BaseModel):
|
||||
"""Schema resumido para listados."""
|
||||
|
||||
id: uuid.UUID
|
||||
tenant_id: uuid.UUID
|
||||
business_name: Optional[str]
|
||||
commercial_name: Optional[str]
|
||||
rfc: Optional[str]
|
||||
client_code: Optional[str]
|
||||
city: Optional[str]
|
||||
state: Optional[str]
|
||||
main_phone: Optional[str]
|
||||
main_email: Optional[str]
|
||||
is_active_client: bool
|
||||
is_prospect: bool
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
@property
|
||||
def display_name(self) -> str:
|
||||
"""Nombre para mostrar."""
|
||||
return self.commercial_name or self.business_name or "Sin nombre"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,6 @@ from fastapi import APIRouter, HTTPException, status, Depends
|
||||
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import selectinload
|
||||
from pydantic import BaseModel, EmailStr
|
||||
from typing import Optional
|
||||
import structlog
|
||||
@@ -18,7 +17,6 @@ from app.core.security import security
|
||||
from app.core.config import get_settings
|
||||
from app.models.user import User
|
||||
from app.models.tenant import Tenant
|
||||
from app.services.audit_service import AuditService
|
||||
|
||||
router = APIRouter()
|
||||
logger = structlog.get_logger(__name__)
|
||||
@@ -100,23 +98,6 @@ async def login(
|
||||
"Login failed - invalid credentials",
|
||||
email=login_data.email
|
||||
)
|
||||
|
||||
# Registrar intento fallido en auditoría (si el usuario existe)
|
||||
if user:
|
||||
try:
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=user.tenant_id,
|
||||
user_id=None, # Login fallido = sin user_id
|
||||
action="user.login_failed",
|
||||
resource_type="user",
|
||||
resource_id=user.id,
|
||||
metadata={"email": login_data.email, "reason": "invalid_password"}
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning("Failed to log audit entry", error=str(e))
|
||||
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Credenciales inválidas"
|
||||
@@ -144,21 +125,6 @@ async def login(
|
||||
access_token = security.create_access_token(token_data)
|
||||
refresh_token = security.create_refresh_token(token_data)
|
||||
|
||||
# Registrar login exitoso en auditoría
|
||||
try:
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=user.tenant_id,
|
||||
user_id=user.id,
|
||||
action="user.login",
|
||||
resource_type="user",
|
||||
resource_id=user.id,
|
||||
metadata={"email": user.email, "success": True}
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning("Failed to log audit entry", error=str(e))
|
||||
|
||||
logger.info(
|
||||
"Login successful",
|
||||
email=login_data.email,
|
||||
@@ -260,25 +226,6 @@ async def logout(
|
||||
|
||||
# TODO: Revoke refresh token in database
|
||||
|
||||
# Registrar logout en auditoría
|
||||
try:
|
||||
import uuid
|
||||
user_id = uuid.UUID(payload["sub"])
|
||||
tenant_id = uuid.UUID(payload["tenant_id"])
|
||||
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
action="user.logout",
|
||||
resource_type="user",
|
||||
resource_id=user_id,
|
||||
metadata={"email": payload.get("email")}
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning("Failed to log audit entry", error=str(e))
|
||||
|
||||
logger.info("Logout successful", user_id=payload["sub"])
|
||||
|
||||
return {"message": "Successfully logged out"}
|
||||
@@ -310,49 +257,41 @@ async def get_current_user(
|
||||
detail="Invalid token"
|
||||
)
|
||||
|
||||
user_id = payload.get("sub")
|
||||
if not user_id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Invalid token payload"
|
||||
)
|
||||
|
||||
# Fetch actual user from database
|
||||
query = select(User).where(User.id == user_id).options(
|
||||
selectinload(User.tenant)
|
||||
)
|
||||
result = await db.execute(query)
|
||||
user = result.scalar_one_or_none()
|
||||
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found"
|
||||
)
|
||||
|
||||
if not user.is_active:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="User account is disabled"
|
||||
)
|
||||
# TODO: Fetch actual user from database
|
||||
|
||||
return {
|
||||
"id": str(user.id),
|
||||
"email": user.email,
|
||||
"first_name": user.first_name,
|
||||
"last_name": user.last_name,
|
||||
"role": user.role.value if hasattr(user.role, 'value') else user.role,
|
||||
"tenant_id": str(user.tenant_id),
|
||||
"tenant_name": user.tenant.name if user.tenant else None,
|
||||
"is_active": user.is_active,
|
||||
"is_two_factor_enabled": user.totp_secret is not None,
|
||||
"last_login": user.last_login.isoformat() if user.last_login else None,
|
||||
"created_at": user.created_at.isoformat()
|
||||
"id": payload["sub"],
|
||||
"email": payload["email"],
|
||||
"role": payload["role"],
|
||||
"tenant_id": payload["tenant_id"]
|
||||
}
|
||||
|
||||
|
||||
# ===================================
|
||||
# DEPENDENCIES
|
||||
# ===================================
|
||||
# Dependencies are imported from app.api.deps to avoid duplication
|
||||
# Use get_current_user and get_current_active_superuser from deps.py
|
||||
|
||||
async def get_current_active_user(token: str = Depends(oauth2_scheme)):
|
||||
"""
|
||||
Dependency to get current active user from token.
|
||||
|
||||
Args:
|
||||
token: Access token
|
||||
|
||||
Returns:
|
||||
Current user data
|
||||
|
||||
Raises:
|
||||
HTTPException: If token is invalid or user is inactive
|
||||
"""
|
||||
payload = security.verify_token(token)
|
||||
if not payload:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Invalid token",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
# TODO: Verify user exists and is active
|
||||
|
||||
return payload
|
||||
@@ -3,191 +3,94 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
from typing import List, Optional
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
import logging
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.models.category import Category
|
||||
from app.models.user import User
|
||||
from app.api import deps
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# ===================================
|
||||
# PYDANTIC SCHEMAS
|
||||
# ===================================
|
||||
logger = logging.getLogger("categories")
|
||||
|
||||
class CategoryCreate(BaseModel):
|
||||
"""Schema para crear categoría - NO incluye tenant_id (se asigna automáticamente)"""
|
||||
class CategoryBase(BaseModel):
|
||||
name: str
|
||||
description: Optional[str] = None
|
||||
color: Optional[str] = None
|
||||
sla_response_hours: int = 24
|
||||
sla_resolution_hours: int = 72
|
||||
auto_assign_to: Optional[uuid.UUID] = None
|
||||
is_active: bool = True
|
||||
tenant_id: Optional[uuid.UUID] = None
|
||||
|
||||
class CategoryUpdate(BaseModel):
|
||||
"""Schema para actualizar categoría"""
|
||||
class CategoryCreate(CategoryBase):
|
||||
pass
|
||||
|
||||
class CategoryUpdate(CategoryBase):
|
||||
name: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
color: Optional[str] = None
|
||||
sla_response_hours: Optional[int] = None
|
||||
sla_resolution_hours: Optional[int] = None
|
||||
auto_assign_to: Optional[uuid.UUID] = None
|
||||
is_active: Optional[bool] = None
|
||||
tenant_id: Optional[uuid.UUID] = None
|
||||
|
||||
class CategoryResponse(BaseModel):
|
||||
"""Schema de respuesta - incluye todos los campos"""
|
||||
class CategoryResponse(CategoryBase):
|
||||
id: uuid.UUID
|
||||
tenant_id: uuid.UUID # ✅ AÑADIDO
|
||||
name: str
|
||||
description: Optional[str] = None
|
||||
color: Optional[str] = None
|
||||
sla_response_hours: int
|
||||
sla_resolution_hours: int
|
||||
auto_assign_to: Optional[uuid.UUID] = None
|
||||
is_active: bool
|
||||
created_at: datetime # ✅ AÑADIDO
|
||||
updated_at: datetime # ✅ AÑADIDO
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
# ===================================
|
||||
# ENDPOINTS
|
||||
# ===================================
|
||||
|
||||
@router.get("/", response_model=List[CategoryResponse])
|
||||
async def read_categories(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user) # ✅ CORREGIDO: Type hint + no solo superuser
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Listar categorías del tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: solo muestra categorías del tenant del usuario.
|
||||
"""
|
||||
# ✅ CORREGIDO: Filtrar por tenant_id
|
||||
query = select(Category).where(
|
||||
Category.tenant_id == current_user.tenant_id
|
||||
).offset(skip).limit(limit)
|
||||
|
||||
result = await db.execute(query)
|
||||
return result.scalars().all()
|
||||
try:
|
||||
logger.debug("Fetching categories with skip=%d, limit=%d", skip, limit)
|
||||
query = select(Category).offset(skip).limit(limit)
|
||||
result = await db.execute(query)
|
||||
categories = result.scalars().all()
|
||||
logger.debug("Fetched %d categories", len(categories))
|
||||
return categories
|
||||
except Exception as e:
|
||||
logger.exception("Unhandled exception occurred while fetching categories.")
|
||||
raise HTTPException(status_code=500, detail="Internal Server Error")
|
||||
|
||||
|
||||
@router.post("/", response_model=CategoryResponse, status_code=status.HTTP_201_CREATED)
|
||||
@router.post("/", response_model=CategoryResponse)
|
||||
async def create_category(
|
||||
category: CategoryCreate,
|
||||
category: CategoryCreate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user) # ✅ CORREGIDO: Type hint
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Crear nueva categoría en el tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: asigna automáticamente tenant_id del usuario.
|
||||
"""
|
||||
# ✅ CORREGIDO: Asignar tenant_id del usuario actual
|
||||
db_category = Category(
|
||||
**category.model_dump(),
|
||||
tenant_id=current_user.tenant_id # ✅ Multi-tenancy automático
|
||||
)
|
||||
|
||||
db.add(db_category)
|
||||
new_category = Category(**category.model_dump())
|
||||
db.add(new_category)
|
||||
await db.commit()
|
||||
await db.refresh(db_category)
|
||||
return db_category
|
||||
|
||||
|
||||
@router.get("/{category_id}", response_model=CategoryResponse)
|
||||
async def read_category(
|
||||
category_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener una categoría específica del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite acceso a categorías del propio tenant.
|
||||
"""
|
||||
query = select(Category).where(
|
||||
Category.id == category_id,
|
||||
Category.tenant_id == current_user.tenant_id # ✅ Seguridad multi-tenant
|
||||
)
|
||||
result = await db.execute(query)
|
||||
category = result.scalar_one_or_none()
|
||||
|
||||
if not category:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Category not found"
|
||||
)
|
||||
|
||||
return category
|
||||
|
||||
await db.refresh(new_category)
|
||||
return new_category
|
||||
|
||||
@router.put("/{category_id}", response_model=CategoryResponse)
|
||||
async def update_category(
|
||||
category_id: uuid.UUID,
|
||||
category_update: CategoryUpdate,
|
||||
category: CategoryUpdate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Actualizar categoría del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite actualizar categorías del propio tenant.
|
||||
"""
|
||||
query = select(Category).where(
|
||||
Category.id == category_id,
|
||||
Category.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_category = result.scalar_one_or_none()
|
||||
|
||||
db_category = await db.get(Category, category_id)
|
||||
if not db_category:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Category not found"
|
||||
)
|
||||
|
||||
# Actualizar campos
|
||||
update_data = category_update.model_dump(exclude_unset=True)
|
||||
for field, value in update_data.items():
|
||||
setattr(db_category, field, value)
|
||||
|
||||
raise HTTPException(status_code=404, detail="Category not found")
|
||||
|
||||
for key, value in category.model_dump(exclude_unset=True).items():
|
||||
setattr(db_category, key, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_category)
|
||||
return db_category
|
||||
|
||||
|
||||
@router.delete("/{category_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
@router.delete("/{category_id}", status_code=204)
|
||||
async def delete_category(
|
||||
category_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Desactivar categoría del tenant (soft delete).
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite desactivar categorías del propio tenant.
|
||||
"""
|
||||
query = select(Category).where(
|
||||
Category.id == category_id,
|
||||
Category.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_category = result.scalar_one_or_none()
|
||||
|
||||
db_category = await db.get(Category, category_id)
|
||||
if not db_category:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Category not found"
|
||||
)
|
||||
|
||||
# Soft delete
|
||||
db_category.is_active = False
|
||||
raise HTTPException(status_code=404, detail="Category not found")
|
||||
|
||||
await db.delete(db_category)
|
||||
await db.commit()
|
||||
return None
|
||||
@@ -1,299 +0,0 @@
|
||||
"""
|
||||
Client Profile Endpoints - ServiceManagerWeb
|
||||
Endpoints para gestión del perfil empresarial de clientes
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, or_
|
||||
from typing import Optional
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.api.deps import get_current_user, get_current_tenant
|
||||
from app.api.schemas.client_profile import (
|
||||
ClientProfileCreate,
|
||||
ClientProfileUpdate,
|
||||
ClientProfileResponse,
|
||||
ClientProfileSummary
|
||||
)
|
||||
from app.models.user import User
|
||||
from app.models.tenant import Tenant
|
||||
from app.models.client_profile import ClientProfile
|
||||
import uuid
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.get("/", response_model=ClientProfileResponse)
|
||||
async def get_current_client_profile(
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Obtener el perfil empresarial del tenant actual.
|
||||
|
||||
**Permisos**: CLIENT_ADMIN, CLIENT_USER
|
||||
"""
|
||||
# Solo clientes pueden acceder
|
||||
if current_user.role not in ['CLIENT_ADMIN', 'CLIENT_USER']:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Solo los clientes pueden acceder al perfil empresarial"
|
||||
)
|
||||
|
||||
# Buscar perfil existente
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == current_tenant.id)
|
||||
)
|
||||
profile = result.scalar_one_or_none()
|
||||
|
||||
if not profile:
|
||||
# Si no existe, crear uno vacío
|
||||
profile = ClientProfile(tenant_id=current_tenant.id)
|
||||
db.add(profile)
|
||||
await db.commit()
|
||||
await db.refresh(profile)
|
||||
|
||||
return profile
|
||||
|
||||
|
||||
@router.post("/", response_model=ClientProfileResponse)
|
||||
async def create_or_update_client_profile(
|
||||
profile_data: ClientProfileCreate,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Crear o actualizar el perfil empresarial del tenant actual.
|
||||
|
||||
**Permisos**: CLIENT_ADMIN
|
||||
"""
|
||||
# Solo CLIENT_ADMIN puede modificar el perfil
|
||||
if current_user.role != 'CLIENT_ADMIN':
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Solo los administradores de cliente pueden modificar el perfil empresarial"
|
||||
)
|
||||
|
||||
# Buscar perfil existente
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == current_tenant.id)
|
||||
)
|
||||
existing_profile = result.scalar_one_or_none()
|
||||
|
||||
if existing_profile:
|
||||
# Actualizar perfil existente
|
||||
update_data = profile_data.dict(exclude_unset=True)
|
||||
for field, value in update_data.items():
|
||||
setattr(existing_profile, field, value)
|
||||
|
||||
profile = existing_profile
|
||||
else:
|
||||
# Crear nuevo perfil
|
||||
profile = ClientProfile(
|
||||
tenant_id=current_tenant.id,
|
||||
**profile_data.dict()
|
||||
)
|
||||
db.add(profile)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(profile)
|
||||
|
||||
return profile
|
||||
|
||||
|
||||
@router.patch("/", response_model=ClientProfileResponse)
|
||||
async def update_client_profile(
|
||||
profile_data: ClientProfileUpdate,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Actualizar parcialmente el perfil empresarial del tenant actual.
|
||||
|
||||
**Permisos**: CLIENT_ADMIN
|
||||
"""
|
||||
# Solo CLIENT_ADMIN puede modificar el perfil
|
||||
if current_user.role != 'CLIENT_ADMIN':
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Solo los administradores de cliente pueden modificar el perfil empresarial"
|
||||
)
|
||||
|
||||
# Buscar perfil existente
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == current_tenant.id)
|
||||
)
|
||||
profile = result.scalar_one_or_none()
|
||||
|
||||
if not profile:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Perfil empresarial no encontrado"
|
||||
)
|
||||
|
||||
# Actualizar solo campos proporcionados
|
||||
update_data = profile_data.dict(exclude_unset=True)
|
||||
for field, value in update_data.items():
|
||||
setattr(profile, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(profile)
|
||||
|
||||
return profile
|
||||
|
||||
|
||||
@router.delete("/")
|
||||
async def delete_client_profile(
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Eliminar el perfil empresarial del tenant actual.
|
||||
|
||||
**Permisos**: CLIENT_ADMIN
|
||||
"""
|
||||
# Solo CLIENT_ADMIN puede eliminar el perfil
|
||||
if current_user.role != 'CLIENT_ADMIN':
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Solo los administradores de cliente pueden eliminar el perfil empresarial"
|
||||
)
|
||||
|
||||
# Buscar perfil existente
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == current_tenant.id)
|
||||
)
|
||||
profile = result.scalar_one_or_none()
|
||||
|
||||
if not profile:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Perfil empresarial no encontrado"
|
||||
)
|
||||
|
||||
await db.delete(profile)
|
||||
await db.commit()
|
||||
|
||||
return {"message": "Perfil empresarial eliminado exitosamente"}
|
||||
|
||||
|
||||
# === ENDPOINTS ADMINISTRATIVOS (Solo para ADMIN y SUPPORT_MANAGER) ===
|
||||
|
||||
@router.get("/admin/list", response_model=list[ClientProfileSummary])
|
||||
async def list_all_client_profiles(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
search: Optional[str] = None,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Listar todos los perfiles empresariales (solo para administradores).
|
||||
|
||||
**Permisos**: ADMIN, SUPPORT_MANAGER
|
||||
"""
|
||||
# Solo personal interno puede ver todos los perfiles
|
||||
if current_user.role not in ['ADMIN', 'SUPPORT_MANAGER']:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Acceso denegado"
|
||||
)
|
||||
|
||||
query = select(ClientProfile)
|
||||
|
||||
# Filtro de búsqueda
|
||||
if search:
|
||||
search_filter = or_(
|
||||
ClientProfile.business_name.ilike(f"%{search}%"),
|
||||
ClientProfile.commercial_name.ilike(f"%{search}%"),
|
||||
ClientProfile.rfc.ilike(f"%{search}%"),
|
||||
ClientProfile.client_code.ilike(f"%{search}%")
|
||||
)
|
||||
query = query.where(search_filter)
|
||||
|
||||
# Paginación
|
||||
query = query.offset(skip).limit(limit)
|
||||
query = query.order_by(ClientProfile.created_at.desc())
|
||||
|
||||
result = await db.execute(query)
|
||||
profiles = result.scalars().all()
|
||||
|
||||
return profiles
|
||||
|
||||
|
||||
@router.get("/admin/{tenant_id}", response_model=ClientProfileResponse)
|
||||
async def get_client_profile_by_tenant(
|
||||
tenant_id: uuid.UUID,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Obtener perfil empresarial de un tenant específico (solo para administradores).
|
||||
|
||||
**Permisos**: ADMIN, SUPPORT_MANAGER
|
||||
"""
|
||||
# Solo personal interno puede ver perfiles de otros tenants
|
||||
if current_user.role not in ['ADMIN', 'SUPPORT_MANAGER']:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Acceso denegado"
|
||||
)
|
||||
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == tenant_id)
|
||||
)
|
||||
profile = result.scalar_one_or_none()
|
||||
|
||||
if not profile:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Perfil empresarial no encontrado"
|
||||
)
|
||||
|
||||
return profile
|
||||
|
||||
|
||||
@router.patch("/admin/{tenant_id}", response_model=ClientProfileResponse)
|
||||
async def update_client_profile_by_admin(
|
||||
tenant_id: uuid.UUID,
|
||||
profile_data: ClientProfileUpdate,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Actualizar perfil empresarial de un tenant específico (solo para administradores).
|
||||
|
||||
**Permisos**: ADMIN, SUPPORT_MANAGER
|
||||
"""
|
||||
# Solo personal interno puede modificar perfiles de otros tenants
|
||||
if current_user.role not in ['ADMIN', 'SUPPORT_MANAGER']:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Acceso denegado"
|
||||
)
|
||||
|
||||
result = await db.execute(
|
||||
select(ClientProfile).where(ClientProfile.tenant_id == tenant_id)
|
||||
)
|
||||
profile = result.scalar_one_or_none()
|
||||
|
||||
if not profile:
|
||||
# Crear perfil si no existe
|
||||
profile = ClientProfile(tenant_id=tenant_id, **profile_data.dict(exclude_unset=True))
|
||||
db.add(profile)
|
||||
else:
|
||||
# Actualizar perfil existente
|
||||
update_data = profile_data.dict(exclude_unset=True)
|
||||
for field, value in update_data.items():
|
||||
setattr(profile, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(profile)
|
||||
|
||||
return profile
|
||||
61
backend/app/api/v1/endpoints/clients.py
Normal file
61
backend/app/api/v1/endpoints/clients.py
Normal file
@@ -0,0 +1,61 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import text # <--- IMPORTANTE: Necesario para consultas SQL
|
||||
from app.core.database import get_db
|
||||
|
||||
# IMPORTANTE: Renombramos para evitar conflictos
|
||||
from app.models.client import Client as ClientModel
|
||||
from app.schemas.client import ClientCreate, ClientUpdate, Client as ClientSchema
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# GET: Obtener todos los clientes
|
||||
@router.get("/clients", response_model=list[ClientSchema])
|
||||
async def get_clients(db: AsyncSession = Depends(get_db)):
|
||||
# Corrección: Usamos text() y mappings().all()
|
||||
query = text("SELECT * FROM clients")
|
||||
result = await db.execute(query)
|
||||
return result.mappings().all()
|
||||
|
||||
# POST: Crear cliente
|
||||
@router.post("/clients", response_model=ClientSchema)
|
||||
async def create_client(client: ClientCreate, db: AsyncSession = Depends(get_db)):
|
||||
# Usamos ClientModel para guardar en BD
|
||||
new_client = ClientModel(**client.dict())
|
||||
db.add(new_client)
|
||||
await db.commit()
|
||||
await db.refresh(new_client)
|
||||
return new_client
|
||||
|
||||
# GET ONE: Obtener un cliente por ID
|
||||
@router.get("/clients/{client_id}", response_model=ClientSchema)
|
||||
async def read_client(client_id: int, db: AsyncSession = Depends(get_db)):
|
||||
db_client = await db.get(ClientModel, client_id)
|
||||
if not db_client:
|
||||
raise HTTPException(status_code=404, detail="Client not found")
|
||||
return db_client
|
||||
|
||||
# PUT: Actualizar cliente
|
||||
@router.put("/clients/{client_id}", response_model=ClientSchema)
|
||||
async def update_client(client_id: int, client: ClientUpdate, db: AsyncSession = Depends(get_db)):
|
||||
db_client = await db.get(ClientModel, client_id)
|
||||
if not db_client:
|
||||
raise HTTPException(status_code=404, detail="Client not found")
|
||||
|
||||
for key, value in client.dict(exclude_unset=True).items():
|
||||
setattr(db_client, key, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_client)
|
||||
return db_client
|
||||
|
||||
# DELETE: Borrar cliente
|
||||
@router.delete("/clients/{client_id}")
|
||||
async def delete_client(client_id: int, db: AsyncSession = Depends(get_db)):
|
||||
db_client = await db.get(ClientModel, client_id)
|
||||
if not db_client:
|
||||
raise HTTPException(status_code=404, detail="Client not found")
|
||||
|
||||
await db.delete(db_client)
|
||||
await db.commit()
|
||||
return {"message": "Client deleted successfully"}
|
||||
@@ -3,179 +3,51 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
from typing import List, Optional
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.models.system import System
|
||||
from app.models.user import User
|
||||
from app.api import deps
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# ===================================
|
||||
# PYDANTIC SCHEMAS
|
||||
# ===================================
|
||||
|
||||
class SystemCreate(BaseModel):
|
||||
"""Schema para crear sistema - NO incluye tenant_id (se asigna automáticamente)"""
|
||||
class SystemBase(BaseModel):
|
||||
name: str
|
||||
description: Optional[str] = None
|
||||
is_active: bool = True
|
||||
|
||||
class SystemUpdate(BaseModel):
|
||||
"""Schema para actualizar sistema"""
|
||||
class SystemCreate(SystemBase):
|
||||
pass
|
||||
|
||||
class SystemUpdate(SystemBase):
|
||||
name: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
is_active: Optional[bool] = None
|
||||
|
||||
class SystemResponse(BaseModel):
|
||||
"""Schema de respuesta - incluye todos los campos"""
|
||||
class SystemResponse(SystemBase):
|
||||
id: uuid.UUID
|
||||
tenant_id: uuid.UUID # ✅ AÑADIDO
|
||||
name: str
|
||||
description: Optional[str] = None
|
||||
is_active: bool
|
||||
created_at: datetime # ✅ AÑADIDO
|
||||
updated_at: datetime # ✅ AÑADIDO
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
# ===================================
|
||||
# ENDPOINTS
|
||||
# ===================================
|
||||
|
||||
@router.get("/", response_model=List[SystemResponse])
|
||||
async def read_systems(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user) # ✅ CORREGIDO: Type hint + no solo superuser
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Listar sistemas del tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: solo muestra sistemas del tenant del usuario.
|
||||
"""
|
||||
# ✅ CORREGIDO: Filtrar por tenant_id
|
||||
query = select(System).where(
|
||||
System.tenant_id == current_user.tenant_id
|
||||
).offset(skip).limit(limit)
|
||||
|
||||
query = select(System).offset(skip).limit(limit)
|
||||
result = await db.execute(query)
|
||||
return result.scalars().all()
|
||||
|
||||
|
||||
@router.post("/", response_model=SystemResponse, status_code=status.HTTP_201_CREATED)
|
||||
@router.post("/", response_model=SystemResponse)
|
||||
async def create_system(
|
||||
system: SystemCreate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user) # ✅ CORREGIDO: Type hint
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Crear nuevo sistema en el tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: asigna automáticamente tenant_id del usuario.
|
||||
"""
|
||||
# ✅ CORREGIDO: Asignar tenant_id del usuario actual
|
||||
db_system = System(
|
||||
**system.model_dump(),
|
||||
tenant_id=current_user.tenant_id # ✅ Multi-tenancy automático
|
||||
)
|
||||
|
||||
db_system = System(**system.model_dump())
|
||||
db.add(db_system)
|
||||
await db.commit()
|
||||
await db.refresh(db_system)
|
||||
return db_system
|
||||
|
||||
|
||||
@router.get("/{system_id}", response_model=SystemResponse)
|
||||
async def read_system(
|
||||
system_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener un sistema específico del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite acceso a sistemas del propio tenant.
|
||||
"""
|
||||
query = select(System).where(
|
||||
System.id == system_id,
|
||||
System.tenant_id == current_user.tenant_id # ✅ Seguridad multi-tenant
|
||||
)
|
||||
result = await db.execute(query)
|
||||
system = result.scalar_one_or_none()
|
||||
|
||||
if not system:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="System not found"
|
||||
)
|
||||
|
||||
return system
|
||||
|
||||
|
||||
@router.put("/{system_id}", response_model=SystemResponse)
|
||||
async def update_system(
|
||||
system_id: uuid.UUID,
|
||||
system_update: SystemUpdate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Actualizar sistema del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite actualizar sistemas del propio tenant.
|
||||
"""
|
||||
query = select(System).where(
|
||||
System.id == system_id,
|
||||
System.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_system = result.scalar_one_or_none()
|
||||
|
||||
if not db_system:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="System not found"
|
||||
)
|
||||
|
||||
# Actualizar campos
|
||||
update_data = system_update.model_dump(exclude_unset=True)
|
||||
for field, value in update_data.items():
|
||||
setattr(db_system, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_system)
|
||||
return db_system
|
||||
|
||||
|
||||
@router.delete("/{system_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_system(
|
||||
system_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Desactivar sistema del tenant (soft delete).
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite desactivar sistemas del propio tenant.
|
||||
"""
|
||||
query = select(System).where(
|
||||
System.id == system_id,
|
||||
System.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_system = result.scalar_one_or_none()
|
||||
|
||||
if not db_system:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="System not found"
|
||||
)
|
||||
|
||||
# Soft delete
|
||||
db_system.is_active = False
|
||||
await db.commit()
|
||||
return None
|
||||
@@ -85,9 +85,6 @@ async def update_tenant(
|
||||
raise HTTPException(status_code=404, detail="Tenant not found")
|
||||
|
||||
update_data = tenant_in.model_dump(exclude_unset=True)
|
||||
if "status" in update_data:
|
||||
tenant.is_active = update_data.pop("status") == TenantStatus.active
|
||||
|
||||
for field, value in update_data.items():
|
||||
setattr(tenant, field, value)
|
||||
|
||||
@@ -95,18 +92,3 @@ async def update_tenant(
|
||||
await db.commit()
|
||||
await db.refresh(tenant)
|
||||
return tenant
|
||||
|
||||
@router.delete("/{tenant_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_tenant(
|
||||
tenant_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""Eliminar un cliente (tenant) por ID."""
|
||||
tenant = await db.get(Tenant, tenant_id)
|
||||
if not tenant:
|
||||
raise HTTPException(status_code=404, detail="Tenant not found")
|
||||
|
||||
await db.delete(tenant)
|
||||
await db.commit()
|
||||
return {"message": "Tenant deleted successfully"}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,451 +0,0 @@
|
||||
"""
|
||||
Tickets endpoints - ServiceManagerWeb
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status, UploadFile, File
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func
|
||||
from typing import List, Optional
|
||||
from datetime import datetime
|
||||
from app.core.database import get_db
|
||||
from app.api.deps import get_current_user
|
||||
from app.models.ticket import Ticket, TicketStatus, TicketPriority
|
||||
from app.models.user import User
|
||||
from app.models.category import Category # ✅ CORREGIDO: Era TicketCategory
|
||||
from app.models.system import System
|
||||
import uuid
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# ===================================
|
||||
# SCHEMAS
|
||||
# ===================================
|
||||
|
||||
class TicketCreate(BaseModel):
|
||||
subject: str
|
||||
description: str
|
||||
category_id: Optional[str] = None
|
||||
affected_system_id: Optional[str] = None # ✅ CORREGIDO: Era system_id
|
||||
priority: str = "MEDIUM"
|
||||
|
||||
class TicketUpdate(BaseModel):
|
||||
subject: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
status: Optional[str] = None
|
||||
priority: Optional[str] = None
|
||||
assigned_to: Optional[str] = None
|
||||
|
||||
class TicketResponse(BaseModel):
|
||||
id: str
|
||||
ticket_number: str
|
||||
subject: str
|
||||
description: str
|
||||
status: str
|
||||
priority: str
|
||||
category_id: Optional[str] = None
|
||||
affected_system_id: Optional[str] = None # ✅ CORREGIDO: Era system_id
|
||||
created_by: str
|
||||
assigned_to: Optional[str] = None
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
class TicketCloseRequest(BaseModel):
|
||||
resolution: Optional[str] = None
|
||||
|
||||
|
||||
# ===================================
|
||||
# TICKET ENDPOINTS
|
||||
# ===================================
|
||||
|
||||
@router.post("/", response_model=TicketResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def create_ticket(
|
||||
ticket: TicketCreate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Crear un nuevo ticket
|
||||
"""
|
||||
try:
|
||||
# Generar número de ticket único
|
||||
result = await db.execute(
|
||||
select(func.count(Ticket.id)).where(Ticket.tenant_id == current_user.tenant_id)
|
||||
)
|
||||
count = result.scalar() or 0
|
||||
ticket_number = f"TK-{count + 1:06d}"
|
||||
|
||||
# Convertir IDs de string a UUID si son proporcionados
|
||||
category_uuid = uuid.UUID(ticket.category_id) if ticket.category_id else None
|
||||
system_uuid = uuid.UUID(ticket.affected_system_id) if ticket.affected_system_id else None # ✅ CORREGIDO
|
||||
|
||||
# ✅ CORREGIDO: Validar en la tabla correcta con el nombre correcto del modelo
|
||||
if category_uuid:
|
||||
category = await db.get(Category, category_uuid) # ✅ Category, no TicketCategory
|
||||
if not category:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"La categoría con ID {ticket.category_id} no existe."
|
||||
)
|
||||
|
||||
# Validar si el system_id existe en la tabla affected_systems
|
||||
if system_uuid:
|
||||
system = await db.get(System, system_uuid)
|
||||
if not system:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"El sistema con ID {ticket.affected_system_id} no existe."
|
||||
)
|
||||
|
||||
db_ticket = Ticket(
|
||||
id=uuid.uuid4(),
|
||||
tenant_id=current_user.tenant_id,
|
||||
ticket_number=ticket_number,
|
||||
subject=ticket.subject,
|
||||
description=ticket.description,
|
||||
category_id=category_uuid,
|
||||
affected_system_id=system_uuid, # ✅ CORREGIDO: Nombre correcto del campo
|
||||
priority=TicketPriority[ticket.priority.upper()],
|
||||
created_by=current_user.id,
|
||||
status=TicketStatus.NEW,
|
||||
created_at=datetime.utcnow(),
|
||||
updated_at=datetime.utcnow()
|
||||
)
|
||||
|
||||
db.add(db_ticket)
|
||||
await db.commit()
|
||||
await db.refresh(db_ticket)
|
||||
|
||||
# ✅ CORREGIDO: Usar affected_system_id en respuesta
|
||||
return {
|
||||
"id": str(db_ticket.id),
|
||||
"ticket_number": db_ticket.ticket_number,
|
||||
"subject": db_ticket.subject,
|
||||
"description": db_ticket.description,
|
||||
"status": db_ticket.status.value,
|
||||
"priority": db_ticket.priority.value,
|
||||
"category_id": str(db_ticket.category_id) if db_ticket.category_id else None,
|
||||
"affected_system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None, # ✅ CORREGIDO
|
||||
"created_by": str(db_ticket.created_by),
|
||||
"assigned_to": str(db_ticket.assigned_to) if db_ticket.assigned_to else None,
|
||||
"created_at": db_ticket.created_at,
|
||||
"updated_at": db_ticket.updated_at
|
||||
}
|
||||
|
||||
except ValueError as e:
|
||||
await db.rollback()
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Invalid UUID format: {str(e)}"
|
||||
)
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Error creating ticket: {str(e)}"
|
||||
)
|
||||
|
||||
|
||||
@router.get("/", response_model=List[TicketResponse])
|
||||
async def get_tickets(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
status_filter: Optional[str] = None,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener tickets del usuario actual
|
||||
"""
|
||||
query = select(Ticket).where(
|
||||
Ticket.tenant_id == current_user.tenant_id,
|
||||
Ticket.created_by == current_user.id
|
||||
)
|
||||
|
||||
if status_filter:
|
||||
try:
|
||||
status_enum = TicketStatus[status_filter.upper()]
|
||||
query = query.where(Ticket.status == status_enum)
|
||||
except KeyError:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Invalid status: {status_filter}"
|
||||
)
|
||||
|
||||
query = query.order_by(Ticket.created_at.desc()).offset(skip).limit(limit)
|
||||
|
||||
result = await db.execute(query)
|
||||
tickets = result.scalars().all()
|
||||
|
||||
# ✅ CORREGIDO: Usar affected_system_id
|
||||
return [
|
||||
{
|
||||
"id": str(t.id),
|
||||
"ticket_number": t.ticket_number,
|
||||
"subject": t.subject,
|
||||
"description": t.description,
|
||||
"status": t.status.value,
|
||||
"priority": t.priority.value,
|
||||
"category_id": str(t.category_id) if t.category_id else None,
|
||||
"affected_system_id": str(t.affected_system_id) if t.affected_system_id else None, # ✅ CORREGIDO
|
||||
"created_by": str(t.created_by),
|
||||
"assigned_to": str(t.assigned_to) if t.assigned_to else None,
|
||||
"created_at": t.created_at,
|
||||
"updated_at": t.updated_at
|
||||
}
|
||||
for t in tickets
|
||||
]
|
||||
|
||||
|
||||
@router.get("/{ticket_id}", response_model=TicketResponse)
|
||||
async def get_ticket(
|
||||
ticket_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener un ticket específico
|
||||
"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
except ValueError:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Invalid ticket ID format"
|
||||
)
|
||||
|
||||
query = select(Ticket).where(
|
||||
Ticket.id == ticket_uuid,
|
||||
Ticket.tenant_id == current_user.tenant_id,
|
||||
Ticket.created_by == current_user.id
|
||||
)
|
||||
|
||||
result = await db.execute(query)
|
||||
ticket = result.scalars().first()
|
||||
|
||||
if not ticket:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"Ticket {ticket_id} not found"
|
||||
)
|
||||
|
||||
# ✅ CORREGIDO: Usar affected_system_id
|
||||
return {
|
||||
"id": str(ticket.id),
|
||||
"ticket_number": ticket.ticket_number,
|
||||
"subject": ticket.subject,
|
||||
"description": ticket.description,
|
||||
"status": ticket.status.value,
|
||||
"priority": ticket.priority.value,
|
||||
"category_id": str(ticket.category_id) if ticket.category_id else None,
|
||||
"affected_system_id": str(ticket.affected_system_id) if ticket.affected_system_id else None, # ✅ CORREGIDO
|
||||
"created_by": str(ticket.created_by),
|
||||
"assigned_to": str(ticket.assigned_to) if ticket.assigned_to else None,
|
||||
"created_at": ticket.created_at,
|
||||
"updated_at": ticket.updated_at
|
||||
}
|
||||
|
||||
|
||||
@router.patch("/{ticket_id}", response_model=TicketResponse)
|
||||
async def update_ticket(
|
||||
ticket_id: str,
|
||||
ticket_update: TicketUpdate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Actualizar un ticket
|
||||
"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
except ValueError:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Invalid ticket ID format"
|
||||
)
|
||||
|
||||
query = select(Ticket).where(
|
||||
Ticket.id == ticket_uuid,
|
||||
Ticket.tenant_id == current_user.tenant_id,
|
||||
Ticket.created_by == current_user.id
|
||||
)
|
||||
|
||||
result = await db.execute(query)
|
||||
db_ticket = result.scalars().first()
|
||||
|
||||
if not db_ticket:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"Ticket {ticket_id} not found"
|
||||
)
|
||||
|
||||
try:
|
||||
update_data = ticket_update.dict(exclude_unset=True)
|
||||
|
||||
for field, value in update_data.items():
|
||||
if field == "status" and value:
|
||||
setattr(db_ticket, field, TicketStatus[value.upper()])
|
||||
elif field == "priority" and value:
|
||||
setattr(db_ticket, field, TicketPriority[value.upper()])
|
||||
elif field == "assigned_to" and value:
|
||||
setattr(db_ticket, field, uuid.UUID(value))
|
||||
else:
|
||||
setattr(db_ticket, field, value)
|
||||
|
||||
db_ticket.updated_at = datetime.utcnow()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_ticket)
|
||||
|
||||
# ✅ CORREGIDO: Usar affected_system_id
|
||||
return {
|
||||
"id": str(db_ticket.id),
|
||||
"ticket_number": db_ticket.ticket_number,
|
||||
"subject": db_ticket.subject,
|
||||
"description": db_ticket.description,
|
||||
"status": db_ticket.status.value,
|
||||
"priority": db_ticket.priority.value,
|
||||
"category_id": str(db_ticket.category_id) if db_ticket.category_id else None,
|
||||
"affected_system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None, # ✅ CORREGIDO
|
||||
"created_by": str(db_ticket.created_by),
|
||||
"assigned_to": str(db_ticket.assigned_to) if db_ticket.assigned_to else None,
|
||||
"created_at": db_ticket.created_at,
|
||||
"updated_at": db_ticket.updated_at
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Error updating ticket: {str(e)}"
|
||||
)
|
||||
|
||||
|
||||
@router.patch("/{ticket_id}/close", response_model=TicketResponse)
|
||||
async def close_ticket(
|
||||
ticket_id: str,
|
||||
close_request: TicketCloseRequest,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Cerrar un ticket
|
||||
"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
except ValueError:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Invalid ticket ID format"
|
||||
)
|
||||
|
||||
query = select(Ticket).where(
|
||||
Ticket.id == ticket_uuid,
|
||||
Ticket.tenant_id == current_user.tenant_id,
|
||||
Ticket.created_by == current_user.id
|
||||
)
|
||||
|
||||
result = await db.execute(query)
|
||||
db_ticket = result.scalars().first()
|
||||
|
||||
if not db_ticket:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"Ticket {ticket_id} not found"
|
||||
)
|
||||
|
||||
try:
|
||||
db_ticket.status = TicketStatus.CLOSED
|
||||
db_ticket.updated_at = datetime.utcnow()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_ticket)
|
||||
|
||||
# ✅ CORREGIDO: Usar affected_system_id
|
||||
return {
|
||||
"id": str(db_ticket.id),
|
||||
"ticket_number": db_ticket.ticket_number,
|
||||
"subject": db_ticket.subject,
|
||||
"description": db_ticket.description,
|
||||
"status": db_ticket.status.value,
|
||||
"priority": db_ticket.priority.value,
|
||||
"category_id": str(db_ticket.category_id) if db_ticket.category_id else None,
|
||||
"affected_system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None, # ✅ CORREGIDO
|
||||
"created_by": str(db_ticket.created_by),
|
||||
"assigned_to": str(db_ticket.assigned_to) if db_ticket.assigned_to else None,
|
||||
"created_at": db_ticket.created_at,
|
||||
"updated_at": db_ticket.updated_at
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Error closing ticket: {str(e)}"
|
||||
)
|
||||
|
||||
|
||||
# ===================================
|
||||
# COMMENT ENDPOINTS (placeholder)
|
||||
# ===================================
|
||||
|
||||
@router.get("/{ticket_id}/comments")
|
||||
async def get_ticket_comments(
|
||||
ticket_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener comentarios de un ticket
|
||||
"""
|
||||
return []
|
||||
|
||||
|
||||
@router.post("/{ticket_id}/comments", status_code=status.HTTP_201_CREATED)
|
||||
async def create_comment(
|
||||
ticket_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Agregar un comentario a un ticket
|
||||
"""
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_501_NOT_IMPLEMENTED,
|
||||
detail="Comments not yet implemented"
|
||||
)
|
||||
|
||||
|
||||
# ===================================
|
||||
# ATTACHMENT ENDPOINTS (placeholder)
|
||||
# ===================================
|
||||
|
||||
@router.get("/{ticket_id}/attachments")
|
||||
async def get_ticket_attachments(
|
||||
ticket_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener adjuntos de un ticket
|
||||
"""
|
||||
return []
|
||||
|
||||
|
||||
@router.post("/{ticket_id}/attachments", status_code=status.HTTP_201_CREATED)
|
||||
async def upload_attachment(
|
||||
ticket_id: str,
|
||||
file: UploadFile = File(...),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""
|
||||
Subir un archivo adjunto a un ticket
|
||||
"""
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_501_NOT_IMPLEMENTED,
|
||||
detail="File uploads not yet implemented"
|
||||
)
|
||||
@@ -3,425 +3,66 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from pydantic import BaseModel, ConfigDict, EmailStr
|
||||
from typing import List, Optional
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.security import security
|
||||
from app.models.user import User, UserRole
|
||||
from app.services.audit_service import AuditService
|
||||
from app.api import deps
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# ===================================
|
||||
# PYDANTIC SCHEMAS
|
||||
# ===================================
|
||||
|
||||
class UserCreate(BaseModel):
|
||||
"""Schema para crear usuario - NO incluye tenant_id (se asigna automáticamente)"""
|
||||
class UserBase(BaseModel):
|
||||
email: EmailStr
|
||||
first_name: str
|
||||
last_name: str
|
||||
role: UserRole
|
||||
is_active: bool = True
|
||||
tenant_id: Optional[uuid.UUID] = None
|
||||
|
||||
class UserCreate(UserBase):
|
||||
password: str
|
||||
language: str = "es"
|
||||
timezone: str = "UTC"
|
||||
notifications_email: bool = True
|
||||
|
||||
|
||||
class UserUpdate(BaseModel):
|
||||
"""Schema para actualizar usuario"""
|
||||
email: Optional[EmailStr] = None
|
||||
first_name: Optional[str] = None
|
||||
last_name: Optional[str] = None
|
||||
role: Optional[UserRole] = None
|
||||
is_active: Optional[bool] = None
|
||||
password: Optional[str] = None
|
||||
language: Optional[str] = None
|
||||
timezone: Optional[str] = None
|
||||
notifications_email: Optional[bool] = None
|
||||
password: Optional[str] = None # Optional password update
|
||||
|
||||
class UserResponse(BaseModel):
|
||||
"""Schema de respuesta - incluye todos los campos públicos"""
|
||||
class UserResponse(UserBase):
|
||||
id: uuid.UUID
|
||||
tenant_id: uuid.UUID
|
||||
email: EmailStr
|
||||
first_name: str
|
||||
last_name: str
|
||||
avatar_url: Optional[str] = None
|
||||
role: UserRole
|
||||
is_active: bool
|
||||
email_verified: bool
|
||||
last_login: Optional[datetime] = None
|
||||
language: str
|
||||
timezone: str
|
||||
notifications_email: bool
|
||||
totp_enabled: bool
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
# ===================================
|
||||
# ENDPOINTS
|
||||
# ===================================
|
||||
|
||||
@router.get("/", response_model=List[UserResponse])
|
||||
async def read_users(
|
||||
skip: int = 0,
|
||||
limit: int = 100,
|
||||
role: Optional[UserRole] = None,
|
||||
is_active: Optional[bool] = None,
|
||||
limit: int = 100,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Listar usuarios del tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: solo muestra usuarios del tenant del usuario.
|
||||
|
||||
Filtros opcionales:
|
||||
- role: filtrar por rol
|
||||
- is_active: filtrar por estado activo
|
||||
"""
|
||||
# ✅ CORREGIDO: Filtrar por tenant_id
|
||||
query = select(User).where(User.tenant_id == current_user.tenant_id)
|
||||
|
||||
# Aplicar filtros opcionales
|
||||
if role:
|
||||
query = query.where(User.role == role)
|
||||
if is_active is not None:
|
||||
query = query.where(User.is_active == is_active)
|
||||
|
||||
query = query.offset(skip).limit(limit).order_by(User.created_at.desc())
|
||||
|
||||
query = select(User).offset(skip).limit(limit)
|
||||
result = await db.execute(query)
|
||||
return result.scalars().all()
|
||||
|
||||
|
||||
@router.post("/", response_model=UserResponse, status_code=status.HTTP_201_CREATED)
|
||||
@router.post("/", response_model=UserResponse)
|
||||
async def create_user(
|
||||
user: UserCreate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
current_user = Depends(deps.get_current_active_superuser)
|
||||
):
|
||||
"""
|
||||
Crear nuevo usuario en el tenant del usuario actual.
|
||||
|
||||
✅ Implementa multi-tenancy: asigna automáticamente tenant_id del usuario.
|
||||
|
||||
Restricciones:
|
||||
- Solo ADMIN, SUPPORT_MANAGER y CLIENT_ADMIN pueden crear usuarios
|
||||
- El email debe ser único dentro del tenant
|
||||
"""
|
||||
# Verificar permisos
|
||||
if not current_user.can_manage_users:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="You don't have permission to create users"
|
||||
)
|
||||
|
||||
# Verificar si el email ya existe en el tenant
|
||||
query = select(User).where(
|
||||
User.email == user.email,
|
||||
User.tenant_id == current_user.tenant_id
|
||||
)
|
||||
query = select(User).where(User.email == user.email)
|
||||
result = await db.execute(query)
|
||||
if result.scalar_one_or_none():
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Email already registered in this tenant"
|
||||
)
|
||||
|
||||
# Preparar datos del usuario
|
||||
raise HTTPException(status_code=400, detail="Email already registered")
|
||||
|
||||
user_data = user.model_dump(exclude={"password"})
|
||||
password_hash = security.hash_password(user.password)
|
||||
|
||||
# ✅ CORREGIDO: Asignar tenant_id del usuario actual
|
||||
db_user = User(
|
||||
**user_data,
|
||||
password_hash=password_hash,
|
||||
tenant_id=current_user.tenant_id # ✅ Multi-tenancy automático
|
||||
)
|
||||
password_hash = security.get_password_hash(user.password)
|
||||
|
||||
db_user = User(**user_data, password_hash=password_hash)
|
||||
db.add(db_user)
|
||||
await db.commit()
|
||||
await db.refresh(db_user)
|
||||
|
||||
# Registrar creación en auditoría
|
||||
try:
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=current_user.tenant_id,
|
||||
user_id=current_user.id,
|
||||
action="user.create",
|
||||
resource_type="user",
|
||||
resource_id=db_user.id,
|
||||
new_values=AuditService.sanitize_values({
|
||||
"email": db_user.email,
|
||||
"first_name": db_user.first_name,
|
||||
"last_name": db_user.last_name,
|
||||
"role": db_user.role.value
|
||||
})
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
# No fallar si falla el audit log
|
||||
pass
|
||||
|
||||
return db_user
|
||||
|
||||
|
||||
@router.get("/{user_id}", response_model=UserResponse)
|
||||
async def read_user(
|
||||
user_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Obtener un usuario específico del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite acceso a usuarios del propio tenant.
|
||||
"""
|
||||
query = select(User).where(
|
||||
User.id == user_id,
|
||||
User.tenant_id == current_user.tenant_id # ✅ Seguridad multi-tenant
|
||||
)
|
||||
result = await db.execute(query)
|
||||
user = result.scalar_one_or_none()
|
||||
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found"
|
||||
)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@router.put("/{user_id}", response_model=UserResponse)
|
||||
async def update_user(
|
||||
user_id: uuid.UUID,
|
||||
user_update: UserUpdate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Actualizar usuario del tenant.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite actualizar usuarios del propio tenant.
|
||||
|
||||
Restricciones:
|
||||
- Solo ADMIN, SUPPORT_MANAGER y CLIENT_ADMIN pueden actualizar usuarios
|
||||
- No se puede cambiar el tenant_id
|
||||
"""
|
||||
# Verificar permisos
|
||||
if not current_user.can_manage_users:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="You don't have permission to update users"
|
||||
)
|
||||
|
||||
# Buscar usuario
|
||||
query = select(User).where(
|
||||
User.id == user_id,
|
||||
User.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_user = result.scalar_one_or_none()
|
||||
|
||||
if not db_user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found"
|
||||
)
|
||||
|
||||
# Guardar valores anteriores para audit
|
||||
old_values = {
|
||||
"email": db_user.email,
|
||||
"first_name": db_user.first_name,
|
||||
"last_name": db_user.last_name,
|
||||
"role": db_user.role.value,
|
||||
"is_active": db_user.is_active
|
||||
}
|
||||
|
||||
# Verificar email único si se está cambiando
|
||||
update_data = user_update.model_dump(exclude_unset=True)
|
||||
if "email" in update_data and update_data["email"] != db_user.email:
|
||||
email_query = select(User).where(
|
||||
User.email == update_data["email"],
|
||||
User.tenant_id == current_user.tenant_id,
|
||||
User.id != user_id
|
||||
)
|
||||
email_result = await db.execute(email_query)
|
||||
if email_result.scalar_one_or_none():
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Email already in use by another user"
|
||||
)
|
||||
|
||||
# Actualizar campos
|
||||
for field, value in update_data.items():
|
||||
if field == "password":
|
||||
# Hash the new password
|
||||
db_user.password_hash = security.hash_password(value)
|
||||
else:
|
||||
setattr(db_user, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(db_user)
|
||||
|
||||
# Registrar actualización en auditoría
|
||||
try:
|
||||
new_values = {
|
||||
"email": db_user.email,
|
||||
"first_name": db_user.first_name,
|
||||
"last_name": db_user.last_name,
|
||||
"role": db_user.role.value,
|
||||
"is_active": db_user.is_active
|
||||
}
|
||||
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=current_user.tenant_id,
|
||||
user_id=current_user.id,
|
||||
action="user.update",
|
||||
resource_type="user",
|
||||
resource_id=db_user.id,
|
||||
old_values=AuditService.sanitize_values(old_values),
|
||||
new_values=AuditService.sanitize_values(new_values)
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
# No fallar si falla el audit log
|
||||
pass
|
||||
|
||||
return db_user
|
||||
|
||||
|
||||
@router.delete("/{user_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_user(
|
||||
user_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Desactivar usuario del tenant (soft delete).
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite desactivar usuarios del propio tenant.
|
||||
|
||||
Restricciones:
|
||||
- Solo ADMIN puede eliminar usuarios
|
||||
- No se puede eliminar a sí mismo
|
||||
- No se puede eliminar el último ADMIN del tenant
|
||||
"""
|
||||
# Verificar permisos - solo ADMIN puede eliminar
|
||||
if current_user.role != UserRole.ADMIN:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Only admins can delete users"
|
||||
)
|
||||
|
||||
# No se puede eliminar a sí mismo
|
||||
if user_id == current_user.id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="You cannot delete yourself"
|
||||
)
|
||||
|
||||
# Buscar usuario
|
||||
query = select(User).where(
|
||||
User.id == user_id,
|
||||
User.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_user = result.scalar_one_or_none()
|
||||
|
||||
if not db_user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found"
|
||||
)
|
||||
|
||||
# Verificar que no sea el último admin del tenant
|
||||
if db_user.role == UserRole.ADMIN:
|
||||
admin_query = select(User).where(
|
||||
User.tenant_id == current_user.tenant_id,
|
||||
User.role == UserRole.ADMIN,
|
||||
User.is_active == True,
|
||||
User.id != user_id
|
||||
)
|
||||
admin_result = await db.execute(admin_query)
|
||||
active_admins = admin_result.scalars().all()
|
||||
|
||||
if len(active_admins) == 0:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Cannot delete the last active admin of the tenant"
|
||||
)
|
||||
|
||||
# Soft delete
|
||||
db_user.is_active = False
|
||||
await db.commit()
|
||||
|
||||
# Registrar eliminación en auditoría
|
||||
try:
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=current_user.tenant_id,
|
||||
user_id=current_user.id,
|
||||
action="user.delete",
|
||||
resource_type="user",
|
||||
resource_id=db_user.id,
|
||||
old_values={
|
||||
"email": db_user.email,
|
||||
"role": db_user.role.value,
|
||||
"was_active": True
|
||||
},
|
||||
metadata={"action_type": "soft_delete"}
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
# No fallar si falla el audit log
|
||||
pass
|
||||
|
||||
return None
|
||||
|
||||
|
||||
@router.patch("/{user_id}/activate", response_model=UserResponse)
|
||||
async def activate_user(
|
||||
user_id: uuid.UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(deps.get_current_user)
|
||||
):
|
||||
"""
|
||||
Reactivar usuario desactivado.
|
||||
|
||||
✅ Implementa multi-tenancy: solo permite reactivar usuarios del propio tenant.
|
||||
"""
|
||||
# Verificar permisos
|
||||
if not current_user.can_manage_users:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="You don't have permission to activate users"
|
||||
)
|
||||
|
||||
# Buscar usuario
|
||||
query = select(User).where(
|
||||
User.id == user_id,
|
||||
User.tenant_id == current_user.tenant_id
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_user = result.scalar_one_or_none()
|
||||
|
||||
if not db_user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found"
|
||||
)
|
||||
|
||||
db_user.is_active = True
|
||||
await db.commit()
|
||||
await db.refresh(db_user)
|
||||
return db_user
|
||||
|
||||
@@ -5,8 +5,7 @@ Router principal para la API v1
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter
|
||||
|
||||
from app.api.v1.endpoints import auth, health, tenants, users, systems, categories, tickets, client_profile, audit
|
||||
from app.api.v1.endpoints import auth, health, tenants, users, systems, categories, clients, tickets
|
||||
|
||||
api_router = APIRouter()
|
||||
|
||||
@@ -47,23 +46,14 @@ api_router.include_router(
|
||||
tags=["categories"]
|
||||
)
|
||||
|
||||
# Tickets routes
|
||||
api_router.include_router(
|
||||
clients.router,
|
||||
prefix="/clients",
|
||||
tags=["clients"]
|
||||
)
|
||||
|
||||
api_router.include_router(
|
||||
tickets.router,
|
||||
prefix="/tickets",
|
||||
tags=["tickets"]
|
||||
)
|
||||
|
||||
# Client Profile routes
|
||||
api_router.include_router(
|
||||
client_profile.router,
|
||||
prefix="/client-profile",
|
||||
tags=["client-profile"]
|
||||
)
|
||||
|
||||
# Audit routes
|
||||
api_router.include_router(
|
||||
audit.router,
|
||||
prefix="/audit",
|
||||
tags=["audit"]
|
||||
)
|
||||
@@ -23,99 +23,113 @@ class Settings(BaseSettings):
|
||||
# ===================================
|
||||
# GENERAL
|
||||
# ===================================
|
||||
ENVIRONMENT: str = Field(default="development")
|
||||
DEBUG: bool = Field(default=False)
|
||||
SECRET_KEY: str = Field(...)
|
||||
API_VERSION: str = Field(default="v1")
|
||||
APP_VERSION: str = Field(default="1.6.0")
|
||||
ENVIRONMENT: str = Field(default="development", env="ENVIRONMENT")
|
||||
DEBUG: bool = Field(default=False, env="DEBUG")
|
||||
SECRET_KEY: str = Field(..., env="SECRET_KEY")
|
||||
API_VERSION: str = Field(default="v1", env="API_VERSION")
|
||||
|
||||
# ===================================
|
||||
# DATABASE
|
||||
# ===================================
|
||||
DATABASE_URL: str = Field(...)
|
||||
DATABASE_URL: str = Field(..., env="DATABASE_URL")
|
||||
|
||||
# ===================================
|
||||
# REDIS
|
||||
# ===================================
|
||||
REDIS_URL: str = Field(...)
|
||||
REDIS_URL: str = Field(..., env="REDIS_URL")
|
||||
|
||||
# ===================================
|
||||
# JWT AUTHENTICATION
|
||||
# ===================================
|
||||
JWT_SECRET_KEY: str = Field(...)
|
||||
JWT_ALGORITHM: str = Field(default="HS256")
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES: int = Field(default=60)
|
||||
REFRESH_TOKEN_EXPIRE_DAYS: int = Field(default=7)
|
||||
JWT_SECRET_KEY: str = Field(..., env="JWT_SECRET_KEY")
|
||||
JWT_ALGORITHM: str = Field(default="HS256", env="JWT_ALGORITHM")
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES: int = Field(default=60, env="ACCESS_TOKEN_EXPIRE_MINUTES")
|
||||
REFRESH_TOKEN_EXPIRE_DAYS: int = Field(default=7, env="REFRESH_TOKEN_EXPIRE_DAYS")
|
||||
|
||||
# ===================================
|
||||
# CORS
|
||||
# ===================================
|
||||
CORS_ORIGINS: str = Field(
|
||||
default="http://localhost:3000,http://localhost:3001"
|
||||
default="http://localhost:3000,http://localhost:3001",
|
||||
env="CORS_ORIGINS"
|
||||
)
|
||||
|
||||
# ===================================
|
||||
# EMAIL
|
||||
# ===================================
|
||||
SMTP_HOST: str = Field(default="localhost")
|
||||
SMTP_PORT: int = Field(default=587)
|
||||
SMTP_USER: Optional[str] = Field(default=None)
|
||||
SMTP_PASSWORD: Optional[str] = Field(default=None)
|
||||
SMTP_USE_TLS: bool = Field(default=True)
|
||||
SMTP_USE_SSL: bool = Field(default=False)
|
||||
SMTP_HOST: str = Field(default="localhost", env="SMTP_HOST")
|
||||
SMTP_PORT: int = Field(default=587, env="SMTP_PORT")
|
||||
SMTP_USER: Optional[str] = Field(default=None, env="SMTP_USER")
|
||||
SMTP_PASSWORD: Optional[str] = Field(default=None, env="SMTP_PASSWORD")
|
||||
SMTP_USE_TLS: bool = Field(default=True, env="SMTP_USE_TLS")
|
||||
SMTP_USE_SSL: bool = Field(default=False, env="SMTP_USE_SSL")
|
||||
|
||||
DEFAULT_FROM_EMAIL: str = Field(default="noreply@servicemanager.local")
|
||||
DEFAULT_FROM_NAME: str = Field(default="ServiceManager")
|
||||
DEFAULT_FROM_EMAIL: str = Field(default="noreply@servicemanager.local", env="DEFAULT_FROM_EMAIL")
|
||||
DEFAULT_FROM_NAME: str = Field(default="ServiceManager", env="DEFAULT_FROM_NAME")
|
||||
|
||||
# ===================================
|
||||
# FILE UPLOADS
|
||||
# ===================================
|
||||
MAX_UPLOAD_SIZE_MB: int = Field(default=10)
|
||||
ALLOWED_FILE_EXTENSIONS_STR: str = Field(
|
||||
default="pdf,jpg,jpeg,png,doc,docx,xls,xlsx,txt",
|
||||
alias="ALLOWED_FILE_EXTENSIONS"
|
||||
MAX_UPLOAD_SIZE_MB: int = Field(default=10, env="MAX_UPLOAD_SIZE_MB")
|
||||
ALLOWED_FILE_EXTENSIONS: List[str] = Field(
|
||||
default=["pdf", "jpg", "jpeg", "png", "doc", "docx", "xls", "xlsx", "txt"],
|
||||
env="ALLOWED_FILE_EXTENSIONS"
|
||||
)
|
||||
UPLOAD_PATH: str = Field(default="/app/uploads")
|
||||
UPLOAD_PATH: str = Field(default="/app/uploads", env="UPLOAD_PATH")
|
||||
|
||||
@property
|
||||
def ALLOWED_FILE_EXTENSIONS(self) -> List[str]:
|
||||
"""Parse the comma-separated file extensions."""
|
||||
return [ext.strip().lower() for ext in self.ALLOWED_FILE_EXTENSIONS_STR.split(",")]
|
||||
@field_validator("ALLOWED_FILE_EXTENSIONS", mode='before')
|
||||
@classmethod
|
||||
def validate_file_extensions(cls, v):
|
||||
if isinstance(v, str):
|
||||
return [ext.strip().lower() for ext in v.split(",")]
|
||||
return [ext.lower() for ext in v]
|
||||
|
||||
# ===================================
|
||||
# SECURITY
|
||||
# ===================================
|
||||
RATE_LIMIT_ENABLED: bool = Field(default=True)
|
||||
PASSWORD_MIN_LENGTH: int = Field(default=8)
|
||||
RATE_LIMIT_ENABLED: bool = Field(default=True, env="RATE_LIMIT_ENABLED")
|
||||
PASSWORD_MIN_LENGTH: int = Field(default=8, env="PASSWORD_MIN_LENGTH")
|
||||
|
||||
# Argon2 settings
|
||||
ARGON2_TIME_COST: int = Field(default=3)
|
||||
ARGON2_MEMORY_COST: int = Field(default=65536)
|
||||
ARGON2_PARALLELISM: int = Field(default=4)
|
||||
ARGON2_TIME_COST: int = Field(default=3, env="ARGON2_TIME_COST")
|
||||
ARGON2_MEMORY_COST: int = Field(default=65536, env="ARGON2_MEMORY_COST")
|
||||
ARGON2_PARALLELISM: int = Field(default=4, env="ARGON2_PARALLELISM")
|
||||
|
||||
# ===================================
|
||||
# LOGGING
|
||||
# ===================================
|
||||
LOG_LEVEL: str = Field(default="INFO")
|
||||
LOG_FORMAT: str = Field(default="json")
|
||||
LOG_FILE: Optional[str] = Field(default=None)
|
||||
LOG_LEVEL: str = Field(default="INFO", env="LOG_LEVEL")
|
||||
LOG_FORMAT: str = Field(default="json", env="LOG_FORMAT")
|
||||
LOG_FILE: Optional[str] = Field(default=None, env="LOG_FILE")
|
||||
|
||||
# ===================================
|
||||
# FRONTEND URLS
|
||||
# ===================================
|
||||
CLIENT_FRONTEND_URL: str = Field(default="http://localhost:3000")
|
||||
INTERNAL_FRONTEND_URL: str = Field(default="http://localhost:3001")
|
||||
CLIENT_FRONTEND_URL: str = Field(default="http://localhost:3000", env="CLIENT_FRONTEND_URL")
|
||||
INTERNAL_FRONTEND_URL: str = Field(default="http://localhost:3001", env="INTERNAL_FRONTEND_URL")
|
||||
|
||||
# ===================================
|
||||
# HEALTH CHECKS
|
||||
# ===================================
|
||||
HEALTH_CHECK_TIMEOUT: int = Field(default=30)
|
||||
HEALTH_CHECK_TIMEOUT: int = Field(default=30, env="HEALTH_CHECK_TIMEOUT")
|
||||
|
||||
# ===================================
|
||||
# CELERY
|
||||
# ===================================
|
||||
CELERY_BROKER_URL: str = Field(...)
|
||||
CELERY_RESULT_BACKEND: str = Field(...)
|
||||
CELERY_BROKER_URL: str = Field(..., env="CELERY_BROKER_URL")
|
||||
CELERY_RESULT_BACKEND: str = Field(..., env="CELERY_RESULT_BACKEND")
|
||||
|
||||
# ===================================
|
||||
# CAMPOS ADICIONALES
|
||||
# ===================================
|
||||
POSTGRES_DB: str = Field(..., env="POSTGRES_DB")
|
||||
POSTGRES_USER: str = Field(..., env="POSTGRES_USER")
|
||||
POSTGRES_PASSWORD: str = Field(..., env="POSTGRES_PASSWORD")
|
||||
SMTP_USERNAME: Optional[str] = Field(default=None, env="SMTP_USERNAME")
|
||||
MAX_UPLOAD_SIZE: int = Field(default=10485760, env="MAX_UPLOAD_SIZE")
|
||||
UPLOAD_DIR: str = Field(default="./uploads", env="UPLOAD_DIR")
|
||||
RATE_LIMIT_REQUESTS: int = Field(default=100, env="RATE_LIMIT_REQUESTS")
|
||||
RATE_LIMIT_WINDOW: int = Field(default=60, env="RATE_LIMIT_WINDOW")
|
||||
|
||||
def is_production(self) -> bool:
|
||||
"""Check if environment is production."""
|
||||
@@ -137,4 +151,7 @@ def get_settings() -> Settings:
|
||||
|
||||
Using lru_cache to create a singleton pattern for settings.
|
||||
"""
|
||||
return Settings()
|
||||
return Settings()
|
||||
|
||||
# Crear una instancia global de Settings
|
||||
settings = Settings()
|
||||
@@ -10,6 +10,7 @@ from sqlalchemy import String, DateTime, func
|
||||
from typing import AsyncGenerator
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
import logging
|
||||
|
||||
from app.core.config import get_settings
|
||||
|
||||
@@ -34,6 +35,8 @@ AsyncSessionLocal = async_sessionmaker(
|
||||
autocommit=False
|
||||
)
|
||||
|
||||
logger = logging.getLogger("database")
|
||||
|
||||
|
||||
class Base(DeclarativeBase):
|
||||
"""Base class para todos los modelos SQLAlchemy."""
|
||||
@@ -57,13 +60,16 @@ async def get_db() -> AsyncGenerator[AsyncSession, None]:
|
||||
"""
|
||||
async with AsyncSessionLocal() as session:
|
||||
try:
|
||||
logger.debug("Intentando crear una nueva sesión de base de datos.")
|
||||
yield session
|
||||
await session.commit()
|
||||
except Exception:
|
||||
except Exception as e:
|
||||
logger.error("Error al crear la sesión de base de datos: %s", str(e))
|
||||
await session.rollback()
|
||||
raise
|
||||
finally:
|
||||
await session.close()
|
||||
logger.debug("Sesión de base de datos cerrada.")
|
||||
|
||||
|
||||
async def create_tables():
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
"""
|
||||
File Handler - ServiceManagerWeb
|
||||
Gestión simple de archivos adjuntos
|
||||
"""
|
||||
import os
|
||||
import uuid
|
||||
import hashlib
|
||||
from pathlib import Path
|
||||
from typing import Tuple
|
||||
from fastapi import UploadFile, HTTPException, status
|
||||
|
||||
from app.core.config import get_settings
|
||||
|
||||
settings = get_settings()
|
||||
|
||||
|
||||
class FileHandler:
|
||||
"""Handler simple para archivos adjuntos"""
|
||||
|
||||
def __init__(self):
|
||||
self.upload_path = Path(settings.UPLOAD_PATH)
|
||||
self.max_size_bytes = settings.MAX_UPLOAD_SIZE_MB * 1024 * 1024
|
||||
self.allowed_extensions = settings.ALLOWED_FILE_EXTENSIONS
|
||||
# Crear directorio si no existe
|
||||
self.upload_path.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def _validate_file(self, filename: str, file_size: int) -> None:
|
||||
"""Validar archivo"""
|
||||
extension = Path(filename).suffix.lower().lstrip('.')
|
||||
|
||||
if extension not in self.allowed_extensions:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Extensión no permitida: {extension}"
|
||||
)
|
||||
|
||||
if file_size > self.max_size_bytes:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
|
||||
detail=f"Archivo muy grande. Máximo: {settings.MAX_UPLOAD_SIZE_MB}MB"
|
||||
)
|
||||
|
||||
def _calculate_checksums(self, content: bytes) -> Tuple[str, str]:
|
||||
"""Calcular MD5 y SHA256"""
|
||||
return hashlib.md5(content).hexdigest(), hashlib.sha256(content).hexdigest()
|
||||
|
||||
async def save_upload(self, file: UploadFile, tenant_id: uuid.UUID, ticket_id: uuid.UUID) -> dict:
|
||||
"""Guardar archivo y retornar metadata"""
|
||||
if not file.filename:
|
||||
raise HTTPException(status_code=400, detail="Filename requerido")
|
||||
|
||||
content = await file.read()
|
||||
file_size = len(content)
|
||||
|
||||
self._validate_file(file.filename, file_size)
|
||||
|
||||
md5_hash, sha256_hash = self._calculate_checksums(content)
|
||||
|
||||
# Nombre único
|
||||
extension = Path(file.filename).suffix.lower()
|
||||
safe_filename = f"{uuid.uuid4().hex}{extension}"
|
||||
|
||||
# Estructura: uploads/tenant_id/tickets/ticket_id/
|
||||
file_directory = self.upload_path / str(tenant_id) / "tickets" / str(ticket_id)
|
||||
file_directory.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
file_path = file_directory / safe_filename
|
||||
relative_path = str(file_path.relative_to(self.upload_path))
|
||||
|
||||
# Guardar archivo
|
||||
with open(file_path, "wb") as f:
|
||||
f.write(content)
|
||||
|
||||
import mimetypes
|
||||
mime_type = mimetypes.guess_type(file.filename)[0] or "application/octet-stream"
|
||||
|
||||
return {
|
||||
"filename": safe_filename,
|
||||
"original_filename": file.filename,
|
||||
"file_path": relative_path,
|
||||
"file_size": file_size,
|
||||
"mime_type": mime_type,
|
||||
"md5_hash": md5_hash,
|
||||
"sha256_hash": sha256_hash
|
||||
}
|
||||
|
||||
def get_file_path(self, relative_path: str) -> Path:
|
||||
"""Obtener path absoluto del archivo"""
|
||||
file_path = (self.upload_path / relative_path).resolve()
|
||||
|
||||
# Verificar que no escape del directorio de uploads
|
||||
if not str(file_path).startswith(str(self.upload_path.resolve())):
|
||||
raise HTTPException(status_code=403, detail="Acceso denegado")
|
||||
|
||||
if not file_path.exists():
|
||||
raise HTTPException(status_code=404, detail="Archivo no encontrado")
|
||||
|
||||
return file_path
|
||||
|
||||
|
||||
file_handler = FileHandler()
|
||||
@@ -21,10 +21,6 @@ from app.models.system import System
|
||||
from app.models.category import Category
|
||||
from app.models.user import User
|
||||
from app.models.ticket import Ticket
|
||||
from app.models.comment import TicketComment
|
||||
from app.models.attachment import TicketAttachment
|
||||
from app.models.audit import AuditLog
|
||||
from app.models.refresh_token import RefreshToken
|
||||
|
||||
from app.core.logging import setup_logging
|
||||
from app.api.v1.router import api_router
|
||||
@@ -56,7 +52,7 @@ async def lifespan(app: FastAPI):
|
||||
app = FastAPI(
|
||||
title="ServiceManagerWeb API",
|
||||
description="Mesa de Ayuda B2B multi-tenant para Aduanasoft",
|
||||
version=settings.APP_VERSION,
|
||||
version=settings.API_VERSION,
|
||||
lifespan=lifespan,
|
||||
docs_url=f"/{settings.API_VERSION}/docs" if settings.ENVIRONMENT == "development" else None,
|
||||
redoc_url=f"/{settings.API_VERSION}/redoc" if settings.ENVIRONMENT == "development" else None,
|
||||
@@ -163,8 +159,7 @@ async def health_check():
|
||||
return {
|
||||
"status": "healthy",
|
||||
"service": "ServiceManagerWeb API",
|
||||
"version": settings.APP_VERSION,
|
||||
"api_version": settings.API_VERSION,
|
||||
"version": settings.API_VERSION,
|
||||
"environment": settings.ENVIRONMENT
|
||||
}
|
||||
|
||||
@@ -175,8 +170,7 @@ async def root():
|
||||
"""Endpoint raíz con información básica."""
|
||||
return {
|
||||
"service": "ServiceManagerWeb API",
|
||||
"version": settings.APP_VERSION,
|
||||
"api_version": settings.API_VERSION,
|
||||
"version": settings.API_VERSION,
|
||||
"docs": f"/{settings.API_VERSION}/docs",
|
||||
"environment": settings.ENVIRONMENT
|
||||
}
|
||||
@@ -204,4 +198,4 @@ if __name__ == "__main__":
|
||||
host="0.0.0.0",
|
||||
port=8000,
|
||||
reload=settings.ENVIRONMENT == "development"
|
||||
)
|
||||
)
|
||||
@@ -8,10 +8,20 @@ from fastapi import Request, HTTPException, status
|
||||
from starlette.middleware.base import BaseHTTPMiddleware
|
||||
from starlette.responses import Response
|
||||
import structlog
|
||||
from contextlib import asynccontextmanager
|
||||
from sqlalchemy.sql import text
|
||||
|
||||
logger = structlog.get_logger(__name__)
|
||||
|
||||
|
||||
# Correct the usage of async for by wrapping it in an async function
|
||||
@asynccontextmanager
|
||||
async def get_db_context():
|
||||
from app.core.database import get_db
|
||||
async for db in get_db():
|
||||
yield db
|
||||
|
||||
|
||||
class TenantMiddleware(BaseHTTPMiddleware):
|
||||
"""
|
||||
Middleware para extraer y validar información del tenant.
|
||||
@@ -24,50 +34,66 @@ class TenantMiddleware(BaseHTTPMiddleware):
|
||||
EXCLUDED_PATHS = {
|
||||
"/health",
|
||||
"/",
|
||||
"/api/v1/auth/login",
|
||||
"/v1/auth/login",
|
||||
"/docs",
|
||||
"/api/v1/docs",
|
||||
"/v1/docs",
|
||||
"/openapi.json",
|
||||
"/api/v1/openapi.json",
|
||||
"/v1/openapi.json",
|
||||
"/redoc",
|
||||
"/api/v1/redoc",
|
||||
"/v1/redoc"
|
||||
"/redoc"
|
||||
}
|
||||
|
||||
async def dispatch(self, request: Request, call_next) -> Response:
|
||||
"""Process request and add tenant information."""
|
||||
|
||||
# Skip tenant validation for excluded paths
|
||||
if request.url.path in self.EXCLUDED_PATHS or request.url.path.startswith("/docs"):
|
||||
if request.url.path in self.EXCLUDED_PATHS or any(request.url.path.startswith(path) for path in self.EXCLUDED_PATHS):
|
||||
return await call_next(request)
|
||||
|
||||
# Extract tenant from header
|
||||
tenant_id = request.headers.get("X-Tenant-ID")
|
||||
tenant_slug = request.headers.get("X-Tenant-Slug")
|
||||
|
||||
# For now, we'll be more permissive in development
|
||||
# In production, tenant should be strictly required
|
||||
# Revertir cambios para requerir encabezados de tenant
|
||||
if not tenant_id and not tenant_slug:
|
||||
logger.warning(
|
||||
"Request without tenant information",
|
||||
path=request.url.path,
|
||||
method=request.method
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Tenant information required (X-Tenant-ID or X-Tenant-Slug header)"
|
||||
)
|
||||
# For now, continue without tenant for development
|
||||
# raise HTTPException(
|
||||
# status_code=status.HTTP_400_BAD_REQUEST,
|
||||
# detail="Tenant information required (X-Tenant-ID or X-Tenant-Slug header)"
|
||||
# )
|
||||
|
||||
# Store tenant info in request state
|
||||
request.state.tenant_id = tenant_id
|
||||
request.state.tenant_slug = tenant_slug
|
||||
|
||||
# TODO: Validate tenant exists and is active
|
||||
# This would involve a database query which we'll implement later
|
||||
# Validate tenant exists and is active
|
||||
if tenant_id or tenant_slug:
|
||||
from app.core.database import get_db
|
||||
from app.models.tenant import Tenant
|
||||
|
||||
# Update the middleware to use the new context manager
|
||||
async with get_db_context() as db:
|
||||
tenant = await db.execute(
|
||||
text(
|
||||
"""
|
||||
SELECT * FROM tenants
|
||||
WHERE id = :tenant_id OR slug = :tenant_slug AND status = 'active'
|
||||
"""
|
||||
),
|
||||
{"tenant_id": tenant_id, "tenant_slug": tenant_slug}
|
||||
)
|
||||
tenant = tenant.fetchone()
|
||||
|
||||
if not tenant:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Tenant not found or inactive"
|
||||
)
|
||||
|
||||
# Store validated tenant info
|
||||
request.state.tenant = tenant
|
||||
|
||||
else:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Tenant information required (X-Tenant-ID or X-Tenant-Slug header)"
|
||||
)
|
||||
|
||||
logger.debug(
|
||||
"Tenant middleware processed",
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
"""Models package initialization."""
|
||||
|
||||
from .user import User
|
||||
from .tenant import Tenant
|
||||
from .ticket import Ticket
|
||||
from .comment import TicketComment
|
||||
from .system import System
|
||||
from .category import Category
|
||||
from .client_profile import ClientProfile
|
||||
from .attachment import TicketAttachment
|
||||
from .audit import AuditLog
|
||||
from .refresh_token import RefreshToken
|
||||
|
||||
__all__ = [
|
||||
"User",
|
||||
"Tenant",
|
||||
"Ticket",
|
||||
"TicketComment",
|
||||
"System",
|
||||
"Category",
|
||||
"ClientProfile",
|
||||
"TicketAttachment",
|
||||
"AuditLog",
|
||||
"RefreshToken"
|
||||
]
|
||||
@@ -1,62 +0,0 @@
|
||||
"""
|
||||
Attachment Model - ServiceManagerWeb
|
||||
"""
|
||||
from sqlalchemy import String, ForeignKey, Integer, DateTime, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from typing import Optional, TYPE_CHECKING
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.models.ticket import Ticket
|
||||
from app.models.comment import TicketComment
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
class TicketAttachment(Base):
|
||||
"""Modelo de archivos adjuntos en tickets"""
|
||||
__tablename__ = "ticket_attachments"
|
||||
|
||||
# Sobrescribir campos heredados de Base para que coincidan con la tabla real
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
|
||||
# Esta tabla NO tiene updated_at, así que lo excluimos del mapping
|
||||
|
||||
ticket_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tickets.id", ondelete="CASCADE"),
|
||||
nullable=False
|
||||
)
|
||||
|
||||
comment_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("ticket_comments.id", ondelete="CASCADE"),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
uploaded_by: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
nullable=False
|
||||
)
|
||||
|
||||
filename: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||
original_filename: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||
mime_type: Mapped[str] = mapped_column(String(100), nullable=False)
|
||||
file_size: Mapped[int] = mapped_column(Integer, nullable=False)
|
||||
file_path: Mapped[str] = mapped_column(String(500), nullable=False)
|
||||
|
||||
md5_hash: Mapped[Optional[str]] = mapped_column(String(32), nullable=True)
|
||||
sha256_hash: Mapped[Optional[str]] = mapped_column(String(64), nullable=True)
|
||||
|
||||
ticket: Mapped["Ticket"] = relationship("Ticket", back_populates="attachments")
|
||||
comment: Mapped[Optional["TicketComment"]] = relationship("TicketComment", back_populates="attachments")
|
||||
uploaded_by_user: Mapped["User"] = relationship("User")
|
||||
|
||||
# Excluir updated_at del mapping ya que la tabla no lo tiene
|
||||
__mapper_args__ = {
|
||||
"exclude_properties": ["updated_at"]
|
||||
}
|
||||
@@ -1,148 +0,0 @@
|
||||
"""
|
||||
Audit Log Model - ServiceManagerWeb
|
||||
|
||||
Modelo para bitácora de auditoría y compliance.
|
||||
Registra todas las acciones importantes del sistema.
|
||||
"""
|
||||
|
||||
from sqlalchemy import String, Text, DateTime, ForeignKey, Index
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID, INET, JSONB
|
||||
from typing import Optional, Dict, Any, TYPE_CHECKING
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.models.tenant import Tenant
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
class AuditLog(Base):
|
||||
"""
|
||||
Bitácora de auditoría para tracking completo de acciones.
|
||||
|
||||
Registra:
|
||||
- Qui├®n hizo la acci├│n (user_id)
|
||||
- Qu├® hizo (action)
|
||||
- Sobre qu├® recurso (resource_type + resource_id)
|
||||
- Cuándo lo hizo (created_at)
|
||||
- Desde d├│nde (ip_address, user_agent)
|
||||
- Qu├® cambi├│ (old_values, new_values)
|
||||
"""
|
||||
|
||||
__tablename__ = "audit_logs"
|
||||
|
||||
# Multi-tenancy
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tenants.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Usuario que ejecut├│ la acci├│n (NULL = acci├│n del sistema)
|
||||
user_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Acci├│n realizada (ej: "user.login", "ticket.create", "ticket.assign")
|
||||
action: Mapped[str] = mapped_column(
|
||||
String(100),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Tipo de recurso afectado (user, ticket, comment, category, etc.)
|
||||
resource_type: Mapped[str] = mapped_column(
|
||||
String(50),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# ID del recurso afectado
|
||||
resource_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Contexto de la request
|
||||
ip_address: Mapped[Optional[str]] = mapped_column(INET, nullable=True)
|
||||
user_agent: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
|
||||
|
||||
# Correlation ID para rastrear requests relacionadas
|
||||
correlation_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
nullable=True,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Valores antes del cambio (JSON)
|
||||
old_values: Mapped[Optional[Dict[str, Any]]] = mapped_column(
|
||||
JSONB,
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Valores despu├®s del cambio (JSON)
|
||||
new_values: Mapped[Optional[Dict[str, Any]]] = mapped_column(
|
||||
JSONB,
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Metadata adicional (cualquier info relevante)
|
||||
# Nota: 'metadata' está reservado en SQLAlchemy, usamos 'extra_metadata'
|
||||
extra_metadata: Mapped[Optional[Dict[str, Any]]] = mapped_column(
|
||||
'metadata', # Nombre real de la columna en BD
|
||||
JSONB,
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Timestamp
|
||||
created_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
default=datetime.utcnow,
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Relaciones
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant", foreign_keys=[tenant_id])
|
||||
user: Mapped[Optional["User"]] = relationship("User", foreign_keys=[user_id])
|
||||
|
||||
# Índices compuestos para queries comunes
|
||||
__table_args__ = (
|
||||
Index('idx_audit_logs_tenant_action', 'tenant_id', 'action'),
|
||||
Index('idx_audit_logs_resource', 'resource_type', 'resource_id'),
|
||||
Index('idx_audit_logs_user_created', 'user_id', 'created_at'),
|
||||
)
|
||||
|
||||
# Configuraci├│n del mapper: excluir updated_at porque audit logs son inmutables
|
||||
__mapper_args__ = {
|
||||
"exclude_properties": ["updated_at"]
|
||||
}
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<AuditLog(action='{self.action}', resource='{self.resource_type}:{self.resource_id}')>"
|
||||
|
||||
@property
|
||||
def action_display(self) -> str:
|
||||
"""Formato amigable de la acci├│n."""
|
||||
parts = self.action.split('.')
|
||||
if len(parts) == 2:
|
||||
resource, verb = parts
|
||||
verb_map = {
|
||||
'create': 'cre├│',
|
||||
'update': 'actualiz├│',
|
||||
'delete': 'elimin├│',
|
||||
'login': 'inici├│ sesi├│n',
|
||||
'logout': 'cerr├│ sesi├│n',
|
||||
'assign': 'asign├│',
|
||||
'close': 'cerr├│',
|
||||
'reopen': 'reabri├│'
|
||||
}
|
||||
return f"{verb_map.get(verb, verb)} {resource}"
|
||||
return self.action
|
||||
@@ -1,50 +1,32 @@
|
||||
"""
|
||||
Category Model - ServiceManagerWeb
|
||||
Categorías de tickets por tenant
|
||||
"""
|
||||
from sqlalchemy import String, Text, Boolean, Integer, ForeignKey, UniqueConstraint
|
||||
from sqlalchemy import String, Text, Boolean, ForeignKey, DateTime
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from sqlalchemy.sql import func
|
||||
from typing import List, Optional
|
||||
import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
class Category(Base):
|
||||
"""Modelo de categorías de tickets (ticket_categories en BD)"""
|
||||
__tablename__ = "ticket_categories" # ✅ CORREGIDO: nombre correcto de tabla
|
||||
__tablename__ = "ticket_categories"
|
||||
|
||||
# Campos básicos
|
||||
name: Mapped[str] = mapped_column(String(100), nullable=False)
|
||||
description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
|
||||
is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
|
||||
description: Mapped[Optional[str]] = mapped_column(Text)
|
||||
is_active: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
|
||||
# ✅ CORREGIDO: tenant_id es obligatorio para multi-tenancy
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tenants.id", ondelete="CASCADE"),
|
||||
nullable=False # ✅ Obligatorio
|
||||
)
|
||||
|
||||
# ✅ AÑADIDOS: Campos de SLA según schema.sql
|
||||
color: Mapped[Optional[str]] = mapped_column(String(7), nullable=True)
|
||||
sla_response_hours: Mapped[int] = mapped_column(Integer, default=24, nullable=False)
|
||||
sla_resolution_hours: Mapped[int] = mapped_column(Integer, default=72, nullable=False)
|
||||
auto_assign_to: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
nullable=True
|
||||
)
|
||||
# Optional: Tenant specific categories?
|
||||
tenant_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("tenants.id", ondelete="CASCADE"), nullable=True)
|
||||
|
||||
# Timestamp columns
|
||||
created_at: Mapped[Optional[DateTime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
|
||||
updated_at: Mapped[Optional[DateTime]] = mapped_column(DateTime(timezone=True), onupdate=func.now())
|
||||
|
||||
# Relationships
|
||||
tickets: Mapped[List["Ticket"]] = relationship("Ticket", back_populates="category")
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant")
|
||||
auto_assign_user: Mapped[Optional["User"]] = relationship("User", foreign_keys=[auto_assign_to])
|
||||
|
||||
# ✅ AÑADIDO: Constraint único por tenant (no puede haber categorías duplicadas en el mismo tenant)
|
||||
__table_args__ = (
|
||||
UniqueConstraint('tenant_id', 'name', name='uq_ticket_categories_tenant_name'),
|
||||
)
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant") # Assuming Tenant model is imported
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<Category(id={self.id}, name='{self.name}', tenant_id={self.tenant_id})>"
|
||||
return f"<Category(id={self.id}, name='{self.name}')>"
|
||||
|
||||
29
backend/app/models/client.py
Normal file
29
backend/app/models/client.py
Normal file
@@ -0,0 +1,29 @@
|
||||
from sqlalchemy import Column, Integer, String
|
||||
from app.core.database import Base
|
||||
|
||||
class Client(Base):
|
||||
__tablename__ = "clients"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
clave = Column(String, nullable=False)
|
||||
tipo_cliente = Column(String, nullable=False)
|
||||
nombre = Column(String, nullable=False)
|
||||
pais = Column(String, nullable=False)
|
||||
estado = Column(String, nullable=False)
|
||||
ciudad = Column(String, nullable=False)
|
||||
direccion = Column(String, nullable=False)
|
||||
numero_ext = Column(String, nullable=True)
|
||||
cp = Column(String, nullable=True)
|
||||
colonia = Column(String, nullable=True)
|
||||
lada = Column(String, nullable=True)
|
||||
telefono1 = Column(String, nullable=True)
|
||||
telefono2 = Column(String, nullable=True)
|
||||
tel_directo = Column(String, nullable=True)
|
||||
ext = Column(String, nullable=True)
|
||||
fax = Column(String, nullable=True)
|
||||
horario = Column(String, nullable=True)
|
||||
pagina = Column(String, nullable=True)
|
||||
correo = Column(String, nullable=True)
|
||||
medio_publicidad = Column(String, nullable=True)
|
||||
nacionalidad = Column(String, nullable=True)
|
||||
logo = Column(String, nullable=True)
|
||||
@@ -1,123 +0,0 @@
|
||||
"""
|
||||
Client Profile Model - ServiceManagerWeb
|
||||
|
||||
Modelo para perfil empresarial de clientes
|
||||
Almacena información detallada de la empresa cliente
|
||||
"""
|
||||
|
||||
from sqlalchemy import String, Boolean, DateTime, ForeignKey, Text, Numeric
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from typing import Optional, TYPE_CHECKING
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.models.tenant import Tenant
|
||||
|
||||
|
||||
class ClientProfile(Base):
|
||||
"""Modelo de Perfil de Cliente Empresarial."""
|
||||
|
||||
__tablename__ = "client_profiles"
|
||||
|
||||
# Relación con tenant (uno a uno)
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tenants.id", ondelete="CASCADE"),
|
||||
unique=True,
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# === INFORMACIÓN GENERAL ===
|
||||
business_name: Mapped[Optional[str]] = mapped_column(String(255)) # Razón social
|
||||
commercial_name: Mapped[Optional[str]] = mapped_column(String(255)) # Nombre comercial
|
||||
client_code: Mapped[Optional[str]] = mapped_column(String(50)) # Clave de cliente
|
||||
client_type: Mapped[Optional[str]] = mapped_column(String(50)) # Tipo de cliente
|
||||
rfc: Mapped[Optional[str]] = mapped_column(String(13)) # RFC México
|
||||
tax_id: Mapped[Optional[str]] = mapped_column(String(50)) # ID fiscal general
|
||||
|
||||
# === UBICACIÓN ===
|
||||
country: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
state: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
city: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
address: Mapped[Optional[str]] = mapped_column(Text)
|
||||
external_number: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
internal_number: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
postal_code: Mapped[Optional[str]] = mapped_column(String(10))
|
||||
neighborhood: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
|
||||
# === CONTACTO ===
|
||||
main_phone: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
secondary_phone: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
direct_phone: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
phone_extension: Mapped[Optional[str]] = mapped_column(String(10))
|
||||
fax: Mapped[Optional[str]] = mapped_column(String(20))
|
||||
|
||||
# === INFORMACIÓN ADICIONAL ===
|
||||
business_hours: Mapped[Optional[str]] = mapped_column(String(255))
|
||||
website: Mapped[Optional[str]] = mapped_column(String(255))
|
||||
main_email: Mapped[Optional[str]] = mapped_column(String(320))
|
||||
billing_email: Mapped[Optional[str]] = mapped_column(String(320))
|
||||
|
||||
# === MARKETING ===
|
||||
advertising_medium: Mapped[Optional[str]] = mapped_column(String(255))
|
||||
nationality: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
|
||||
# === CONFIGURACIÓN EMPRESARIAL ===
|
||||
logo_url: Mapped[Optional[str]] = mapped_column(String(500))
|
||||
company_representative: Mapped[Optional[str]] = mapped_column(String(255)) # Encargado/Representante
|
||||
legal_representative: Mapped[Optional[str]] = mapped_column(String(255))
|
||||
|
||||
# === FINANZAS/FACTURACIÓN ===
|
||||
credit_limit: Mapped[Optional[float]] = mapped_column(Numeric(15, 2))
|
||||
payment_terms: Mapped[Optional[str]] = mapped_column(String(100))
|
||||
preferred_currency: Mapped[str] = mapped_column(String(3), default="MXN")
|
||||
|
||||
# === METADATOS ===
|
||||
send_to_billing: Mapped[bool] = mapped_column(Boolean, default=False)
|
||||
is_active_client: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
is_prospect: Mapped[bool] = mapped_column(Boolean, default=False)
|
||||
notes: Mapped[Optional[str]] = mapped_column(Text)
|
||||
|
||||
# === RELACIONES ===
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant", back_populates="client_profile")
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<ClientProfile(tenant_id={self.tenant_id}, business_name='{self.business_name}')>"
|
||||
|
||||
@property
|
||||
def full_address(self) -> str:
|
||||
"""Dirección completa formateada."""
|
||||
address_parts = []
|
||||
|
||||
if self.address:
|
||||
address_parts.append(self.address)
|
||||
|
||||
if self.external_number:
|
||||
if self.internal_number:
|
||||
address_parts.append(f"#{self.external_number}-{self.internal_number}")
|
||||
else:
|
||||
address_parts.append(f"#{self.external_number}")
|
||||
|
||||
if self.neighborhood:
|
||||
address_parts.append(f"Col. {self.neighborhood}")
|
||||
|
||||
if self.city and self.state:
|
||||
address_parts.append(f"{self.city}, {self.state}")
|
||||
|
||||
if self.postal_code:
|
||||
address_parts.append(f"C.P. {self.postal_code}")
|
||||
|
||||
if self.country:
|
||||
address_parts.append(self.country)
|
||||
|
||||
return ", ".join(address_parts)
|
||||
|
||||
@property
|
||||
def display_name(self) -> str:
|
||||
"""Nombre para mostrar (comercial o razón social)."""
|
||||
return self.commercial_name or self.business_name or "Sin nombre"
|
||||
@@ -1,74 +0,0 @@
|
||||
"""
|
||||
Comment Model - ServiceManagerWeb
|
||||
|
||||
Modelo para comentarios en tickets
|
||||
"""
|
||||
|
||||
from sqlalchemy import Column, String, Text, Boolean, ForeignKey, DateTime
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from datetime import datetime
|
||||
import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
|
||||
class TicketComment(Base):
|
||||
"""Comentarios en tickets."""
|
||||
|
||||
__tablename__ = "ticket_comments"
|
||||
|
||||
# Columnas
|
||||
id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
primary_key=True,
|
||||
default=uuid.uuid4
|
||||
)
|
||||
|
||||
ticket_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tickets.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
author_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
content: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
|
||||
is_internal: Mapped[bool] = mapped_column(
|
||||
Boolean,
|
||||
default=False,
|
||||
nullable=False
|
||||
)
|
||||
|
||||
created_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
default=datetime.utcnow,
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
default=datetime.utcnow,
|
||||
onupdate=datetime.utcnow,
|
||||
nullable=False
|
||||
)
|
||||
|
||||
# Relationships
|
||||
ticket: Mapped["Ticket"] = relationship("Ticket", back_populates="comments")
|
||||
author: Mapped["User"] = relationship("User")
|
||||
attachments: Mapped[list["TicketAttachment"]] = relationship(
|
||||
"TicketAttachment",
|
||||
back_populates="comment",
|
||||
cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<TicketComment {self.id} by {self.author_id}>"
|
||||
@@ -1,171 +0,0 @@
|
||||
"""
|
||||
Refresh Token Model - ServiceManagerWeb
|
||||
|
||||
Modelo para persistencia de refresh tokens con revocaci├│n y tracking.
|
||||
"""
|
||||
|
||||
from sqlalchemy import String, Boolean, DateTime, ForeignKey, Index, Integer
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from typing import Optional, TYPE_CHECKING
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
class RefreshToken(Base):
|
||||
"""
|
||||
Refresh Token persistente para gesti├│n de sesiones.
|
||||
|
||||
Almacena refresh tokens con informaci├│n de dispositivo y permite
|
||||
revocaci├│n para mejorar la seguridad.
|
||||
|
||||
Características:
|
||||
- Token hasheado (no se guarda en texto plano)
|
||||
- Device fingerprinting
|
||||
- Revocaci├│n individual con tracking
|
||||
- Auto-expiraci├│n
|
||||
- Tracking de IP y uso
|
||||
"""
|
||||
|
||||
__tablename__ = "refresh_tokens"
|
||||
|
||||
# User relationship
|
||||
user_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Token JWT (almacenado directamente - firmado y verificable)
|
||||
# VARCHAR(500) para acomodar JWTs con payload extenso
|
||||
token: Mapped[str] = mapped_column(
|
||||
String(500),
|
||||
nullable=False,
|
||||
unique=True
|
||||
)
|
||||
|
||||
# Device information
|
||||
device_id: Mapped[Optional[str]] = mapped_column(
|
||||
String(100),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
device_name: Mapped[Optional[str]] = mapped_column(
|
||||
String(200),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
user_agent: Mapped[Optional[str]] = mapped_column(
|
||||
String(500),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# IP address del cliente (varchar(45) para IPv6)
|
||||
ip_address: Mapped[Optional[str]] = mapped_column(
|
||||
String(45),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Expiraci├│n del token
|
||||
expires_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
nullable=False,
|
||||
index=True
|
||||
)
|
||||
|
||||
# Estado de revocaci├│n
|
||||
revoked: Mapped[bool] = mapped_column(
|
||||
Boolean,
|
||||
default=False,
|
||||
nullable=False
|
||||
)
|
||||
|
||||
revoked_at: Mapped[Optional[datetime]] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
revoked_by: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# Tracking de uso
|
||||
last_used_at: Mapped[Optional[datetime]] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
nullable=True
|
||||
)
|
||||
|
||||
usage_count: Mapped[int] = mapped_column(
|
||||
Integer,
|
||||
default=0,
|
||||
nullable=False
|
||||
)
|
||||
|
||||
# Timestamps
|
||||
created_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
default=datetime.utcnow,
|
||||
nullable=False,
|
||||
server_default="NOW()"
|
||||
)
|
||||
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True),
|
||||
default=datetime.utcnow,
|
||||
onupdate=datetime.utcnow,
|
||||
nullable=False,
|
||||
server_default="NOW()"
|
||||
)
|
||||
|
||||
# Relaci├│n con usuario
|
||||
user: Mapped["User"] = relationship("User", foreign_keys=[user_id], back_populates="refresh_tokens")
|
||||
revoker: Mapped[Optional["User"]] = relationship("User", foreign_keys=[revoked_by])
|
||||
|
||||
# Índices compuestos
|
||||
__table_args__ = (
|
||||
Index('idx_refresh_tokens_user_expires', 'user_id', 'expires_at'),
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<RefreshToken(user_id='{self.user_id}', revoked={self.revoked}, expires={self.expires_at})>"
|
||||
|
||||
@property
|
||||
def is_valid(self) -> bool:
|
||||
"""
|
||||
Verificar si el token es válido.
|
||||
|
||||
Un token es válido si:
|
||||
- No está revocado
|
||||
- No ha expirado
|
||||
"""
|
||||
return not self.revoked and self.expires_at > datetime.utcnow()
|
||||
|
||||
@property
|
||||
def is_expired(self) -> bool:
|
||||
"""Verificar si el token ha expirado."""
|
||||
return datetime.utcnow() >= self.expires_at
|
||||
|
||||
def revoke(self, revoked_by: Optional[uuid.UUID] = None) -> None:
|
||||
"""
|
||||
Marcar el token como revocado.
|
||||
|
||||
Args:
|
||||
revoked_by: ID del usuario que revoc├│ el token
|
||||
"""
|
||||
self.revoked = True
|
||||
self.revoked_at = datetime.utcnow()
|
||||
if revoked_by:
|
||||
self.revoked_by = revoked_by
|
||||
|
||||
def track_usage(self) -> None:
|
||||
"""Registrar uso del token."""
|
||||
self.last_used_at = datetime.utcnow()
|
||||
self.usage_count += 1
|
||||
@@ -1,43 +1,25 @@
|
||||
|
||||
"""
|
||||
System Model - ServiceManagerWeb
|
||||
Sistemas afectados por tenant
|
||||
"""
|
||||
from sqlalchemy import String, Text, Boolean, ForeignKey, UniqueConstraint
|
||||
from sqlalchemy import String, Text, Boolean
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
from typing import List, Optional
|
||||
import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
class System(Base):
|
||||
"""Modelo de sistemas afectados (affected_systems en BD)"""
|
||||
__tablename__ = "affected_systems" # ✅ CORREGIDO: nombre correcto de tabla
|
||||
__tablename__ = "systems"
|
||||
|
||||
# Campos básicos
|
||||
name: Mapped[str] = mapped_column(String(100), nullable=False)
|
||||
description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
|
||||
is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
|
||||
|
||||
# ✅ AÑADIDO: tenant_id obligatorio para multi-tenancy (faltaba completamente)
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tenants.id", ondelete="CASCADE"),
|
||||
nullable=False
|
||||
)
|
||||
description: Mapped[Optional[str]] = mapped_column(Text)
|
||||
is_active: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
|
||||
# Relationships
|
||||
# ✅ ACTUALIZADO: nombre de relación a affected_system
|
||||
tickets: Mapped[List["Ticket"]] = relationship(
|
||||
"Ticket",
|
||||
back_populates="affected_system" # ✅ Nombre actualizado
|
||||
)
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant")
|
||||
|
||||
# ✅ AÑADIDO: Constraint único por tenant (no puede haber sistemas duplicados en el mismo tenant)
|
||||
__table_args__ = (
|
||||
UniqueConstraint('tenant_id', 'name', name='uq_affected_systems_tenant_name'),
|
||||
)
|
||||
# If we want tickets to link to systems, we will add relationship in Ticket later or now.
|
||||
# We will assume Ticket links to System.
|
||||
tickets: Mapped[List["Ticket"]] = relationship("Ticket", back_populates="system")
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<System(id={self.id}, name='{self.name}', tenant_id={self.tenant_id})>"
|
||||
return f"<System(id={self.id}, name='{self.name}')>"
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
"""
|
||||
Tenant Model - ServiceManagerWeb
|
||||
|
||||
Modelo para organizaciones cliente (multi-tenancy)
|
||||
"""
|
||||
|
||||
from sqlalchemy import String, Integer, Text, Boolean, ARRAY
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID, ENUM
|
||||
@@ -11,14 +13,17 @@ import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
|
||||
|
||||
class TenantStatus(str, enum.Enum):
|
||||
"""Estados de un tenant."""
|
||||
ACTIVE = "active"
|
||||
SUSPENDED = "suspended"
|
||||
INACTIVE = "inactive"
|
||||
|
||||
|
||||
class Tenant(Base):
|
||||
"""Modelo de Tenant (Organización cliente)."""
|
||||
|
||||
__tablename__ = "tenants"
|
||||
|
||||
# Información básica
|
||||
@@ -46,15 +51,18 @@ class Tenant(Base):
|
||||
|
||||
# Estado
|
||||
status: Mapped[TenantStatus] = mapped_column(
|
||||
String(20),
|
||||
String(20),
|
||||
default=TenantStatus.ACTIVE
|
||||
)
|
||||
|
||||
# Relaciones
|
||||
users: Mapped[List["User"]] = relationship("User", back_populates="tenant")
|
||||
tickets: Mapped[List["Ticket"]] = relationship("Ticket", back_populates="tenant")
|
||||
categories: Mapped[List["Category"]] = relationship("Category", back_populates="tenant") # ✅ CORREGIDO: Era "TicketCategory"
|
||||
client_profile: Mapped[Optional["ClientProfile"]] = relationship("ClientProfile", back_populates="tenant", uselist=False)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<Tenant(id={self.id}, name='{self.name}', slug='{self.slug}')>"
|
||||
|
||||
@property
|
||||
def is_active(self) -> bool:
|
||||
"""Check if tenant is active."""
|
||||
return self.status == TenantStatus.ACTIVE
|
||||
@@ -1,112 +1,58 @@
|
||||
"""
|
||||
Ticket Model - ServiceManagerWeb
|
||||
Tickets de soporte - Core del negocio
|
||||
"""
|
||||
from sqlalchemy import String, ForeignKey, Text, Integer, CheckConstraint, UniqueConstraint
|
||||
from sqlalchemy import String, ForeignKey, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID, ENUM
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
import enum
|
||||
import uuid
|
||||
|
||||
from app.core.database import Base
|
||||
from app.models.system import System
|
||||
from app.models.category import Category
|
||||
|
||||
class TicketStatus(str, enum.Enum):
|
||||
"""Estados posibles de un ticket"""
|
||||
NEW = "NEW"
|
||||
TRIAGE = "TRIAGE"
|
||||
IN_PROGRESS = "IN_PROGRESS"
|
||||
WAITING_CUSTOMER = "WAITING_CUSTOMER" # ✅ CORREGIDO: nombre según schema.sql
|
||||
WAITING_FOR_CLIENT = "WAITING_FOR_CLIENT"
|
||||
RESOLVED = "RESOLVED"
|
||||
CLOSED = "CLOSED"
|
||||
REOPENED = "REOPENED"
|
||||
|
||||
class TicketPriority(str, enum.Enum):
|
||||
"""Prioridades posibles de un ticket"""
|
||||
LOW = "LOW"
|
||||
MEDIUM = "MEDIUM"
|
||||
HIGH = "HIGH"
|
||||
URGENT = "URGENT"
|
||||
|
||||
class Ticket(Base):
|
||||
"""Modelo de tickets de soporte"""
|
||||
__tablename__ = "tickets"
|
||||
|
||||
# Multi-tenancy
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("tenants.id", ondelete="CASCADE"),
|
||||
nullable=False
|
||||
)
|
||||
# Note: id, created_at, updated_at are inherited from Base
|
||||
|
||||
tenant_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("tenants.id", ondelete="CASCADE"), nullable=False)
|
||||
|
||||
# Campos básicos
|
||||
ticket_number: Mapped[str] = mapped_column(String(20), nullable=False)
|
||||
subject: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||
description: Mapped[str] = mapped_column(Text, nullable=False)
|
||||
|
||||
# Estado y Prioridad
|
||||
status: Mapped[TicketStatus] = mapped_column(
|
||||
ENUM(TicketStatus, name="ticket_status_enum", create_type=False),
|
||||
default=TicketStatus.NEW,
|
||||
nullable=False
|
||||
)
|
||||
priority: Mapped[TicketPriority] = mapped_column(
|
||||
ENUM(TicketPriority, name="ticket_priority_enum", create_type=False),
|
||||
default=TicketPriority.MEDIUM,
|
||||
nullable=False
|
||||
)
|
||||
status: Mapped[TicketStatus] = mapped_column(ENUM(TicketStatus, name="ticket_status_enum", create_type=False), default=TicketStatus.NEW)
|
||||
priority: Mapped[TicketPriority] = mapped_column(ENUM(TicketPriority, name="ticket_priority_enum", create_type=False), default=TicketPriority.MEDIUM)
|
||||
|
||||
# ✅ CORREGIDO: Foreign Keys apuntan a tablas correctas
|
||||
created_by: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
nullable=False
|
||||
)
|
||||
assigned_to: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("users.id"),
|
||||
nullable=True
|
||||
)
|
||||
# Foreign Keys
|
||||
created_by: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
||||
assigned_to: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
||||
|
||||
# ✅ CORREGIDO: Renombrado de system_id a affected_system_id
|
||||
affected_system_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("affected_systems.id"), # ✅ Tabla correcta
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# ✅ CORREGIDO: Foreign key a tabla correcta
|
||||
category_id: Mapped[Optional[uuid.UUID]] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("ticket_categories.id"), # ✅ Tabla correcta
|
||||
nullable=True
|
||||
)
|
||||
|
||||
# ✅ AÑADIDOS: Campos de SLA según schema.sql
|
||||
sla_response_due: Mapped[Optional[datetime]] = mapped_column(nullable=True)
|
||||
sla_resolution_due: Mapped[Optional[datetime]] = mapped_column(nullable=True)
|
||||
first_response_at: Mapped[Optional[datetime]] = mapped_column(nullable=True)
|
||||
resolved_at: Mapped[Optional[datetime]] = mapped_column(nullable=True)
|
||||
|
||||
# ✅ AÑADIDOS: Campos de CSAT (Customer Satisfaction) según schema.sql
|
||||
rating: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
|
||||
rating_comment: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
|
||||
rated_at: Mapped[Optional[datetime]] = mapped_column(nullable=True)
|
||||
affected_system_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("systems.id"), nullable=True)
|
||||
category_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("ticket_categories.id"), nullable=True)
|
||||
|
||||
# Relationships
|
||||
tenant: Mapped["Tenant"] = relationship("Tenant", back_populates="tickets")
|
||||
|
||||
# ✅ ACTUALIZADO: Nombre de relación y optional
|
||||
affected_system: Mapped[Optional["System"]] = relationship(
|
||||
"System",
|
||||
back_populates="tickets"
|
||||
)
|
||||
|
||||
category: Mapped[Optional["Category"]] = relationship(
|
||||
"Category",
|
||||
back_populates="tickets"
|
||||
)
|
||||
system: Mapped["System"] = relationship("System", back_populates="tickets")
|
||||
category: Mapped["Category"] = relationship("Category", back_populates="tickets")
|
||||
|
||||
created_by_user: Mapped["User"] = relationship(
|
||||
"User",
|
||||
@@ -119,24 +65,3 @@ class Ticket(Base):
|
||||
foreign_keys=[assigned_to],
|
||||
back_populates="assigned_tickets"
|
||||
)
|
||||
|
||||
comments: Mapped[list["TicketComment"]] = relationship(
|
||||
"TicketComment",
|
||||
back_populates="ticket",
|
||||
cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
attachments: Mapped[list["TicketAttachment"]] = relationship(
|
||||
"TicketAttachment",
|
||||
back_populates="ticket",
|
||||
cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
# ✅ AÑADIDOS: Constraints según schema.sql
|
||||
__table_args__ = (
|
||||
UniqueConstraint('tenant_id', 'ticket_number', name='uq_tickets_tenant_number'),
|
||||
CheckConstraint('rating >= 1 AND rating <= 5', name='check_rating_range'),
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<Ticket(id={self.id}, number='{self.ticket_number}', status={self.status})>"
|
||||
@@ -13,6 +13,7 @@ import uuid
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.database import Base
|
||||
from app.models.ticket import Ticket
|
||||
|
||||
|
||||
class UserRole(str, enum.Enum):
|
||||
@@ -48,7 +49,7 @@ class User(Base):
|
||||
|
||||
# Autenticación
|
||||
password_hash: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||
role: Mapped[UserRole] = mapped_column(ENUM(UserRole, name="user_role_enum"), nullable=False)
|
||||
role: Mapped[UserRole] = mapped_column(ENUM(UserRole), nullable=False)
|
||||
|
||||
# 2FA (opcional para staff interno)
|
||||
totp_secret: Mapped[Optional[str]] = mapped_column(String(32))
|
||||
@@ -78,12 +79,6 @@ class User(Base):
|
||||
back_populates="assigned_to_user",
|
||||
foreign_keys="Ticket.assigned_to"
|
||||
)
|
||||
refresh_tokens: Mapped[List["RefreshToken"]] = relationship(
|
||||
"RefreshToken",
|
||||
back_populates="user",
|
||||
foreign_keys="RefreshToken.user_id",
|
||||
cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
# Unique constraint por tenant
|
||||
__table_args__ = (
|
||||
@@ -138,4 +133,4 @@ class User(Base):
|
||||
def requires_2fa(self) -> bool:
|
||||
"""Check if 2FA is required for this user."""
|
||||
# 2FA opcional para staff interno, no requerido para clientes
|
||||
return self.is_staff
|
||||
return self.is_staff
|
||||
37
backend/app/schemas/client.py
Normal file
37
backend/app/schemas/client.py
Normal file
@@ -0,0 +1,37 @@
|
||||
from pydantic import BaseModel
|
||||
|
||||
class ClientBase(BaseModel):
|
||||
clave: str
|
||||
tipo_cliente: str
|
||||
nombre: str
|
||||
pais: str
|
||||
estado: str
|
||||
ciudad: str
|
||||
direccion: str
|
||||
numero_ext: str | None = None
|
||||
cp: str | None = None
|
||||
colonia: str | None = None
|
||||
lada: str | None = None
|
||||
telefono1: str | None = None
|
||||
telefono2: str | None = None
|
||||
tel_directo: str | None = None
|
||||
ext: str | None = None
|
||||
fax: str | None = None
|
||||
horario: str | None = None
|
||||
pagina: str | None = None
|
||||
correo: str | None = None
|
||||
medio_publicidad: str | None = None
|
||||
nacionalidad: str | None = None
|
||||
logo: str | None = None
|
||||
|
||||
class ClientCreate(ClientBase):
|
||||
pass
|
||||
|
||||
class ClientUpdate(ClientBase):
|
||||
pass
|
||||
|
||||
class Client(ClientBase):
|
||||
id: int
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
@@ -1,311 +0,0 @@
|
||||
"""
|
||||
Audit Service - ServiceManagerWeb
|
||||
|
||||
Funciones helper para facilitar el registro de auditoría.
|
||||
Simplifica el proceso de logging en toda la aplicaci├│n.
|
||||
"""
|
||||
|
||||
from typing import Optional, Dict, Any
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from fastapi import Request
|
||||
import uuid
|
||||
import structlog
|
||||
|
||||
from app.models.audit import AuditLog
|
||||
from app.models.user import User
|
||||
|
||||
logger = structlog.get_logger(__name__)
|
||||
|
||||
|
||||
class AuditService:
|
||||
"""
|
||||
Servicio centralizado para registro de auditoría.
|
||||
|
||||
Uso básico:
|
||||
await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=tenant.id,
|
||||
user_id=current_user.id,
|
||||
action="ticket.create",
|
||||
resource_type="ticket",
|
||||
resource_id=new_ticket.id,
|
||||
new_values={"subject": "...", "status": "NEW"}
|
||||
)
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
async def log(
|
||||
db: AsyncSession,
|
||||
tenant_id: uuid.UUID,
|
||||
action: str,
|
||||
resource_type: str,
|
||||
resource_id: Optional[uuid.UUID] = None,
|
||||
user_id: Optional[uuid.UUID] = None,
|
||||
old_values: Optional[Dict[str, Any]] = None,
|
||||
new_values: Optional[Dict[str, Any]] = None,
|
||||
metadata: Optional[Dict[str, Any]] = None,
|
||||
request: Optional[Request] = None
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra una acción en la bitácora de auditoría.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
tenant_id: ID del tenant
|
||||
action: Acci├│n realizada (formato: "recurso.verbo")
|
||||
Ejemplos: "user.login", "ticket.create", "ticket.assign"
|
||||
resource_type: Tipo de recurso ("user", "ticket", "comment", etc.)
|
||||
resource_id: ID del recurso afectado (opcional)
|
||||
user_id: ID del usuario que ejecut├│ la acci├│n (opcional = sistema)
|
||||
old_values: Valores antes del cambio (opcional)
|
||||
new_values: Valores despu├®s del cambio (opcional)
|
||||
metadata: Informaci├│n adicional (opcional)
|
||||
request: Request de FastAPI para extraer IP y user agent (opcional)
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
# Extraer información del request si está disponible
|
||||
ip_address = None
|
||||
user_agent = None
|
||||
correlation_id = None
|
||||
|
||||
if request:
|
||||
# IP del cliente
|
||||
if request.client:
|
||||
ip_address = request.client.host
|
||||
|
||||
# User agent
|
||||
user_agent = request.headers.get("user-agent")
|
||||
|
||||
# Correlation ID (si existe en el request state)
|
||||
correlation_id = getattr(request.state, "correlation_id", None)
|
||||
|
||||
# Crear registro de auditoría
|
||||
audit_log = AuditLog(
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
action=action,
|
||||
resource_type=resource_type,
|
||||
resource_id=resource_id,
|
||||
ip_address=ip_address,
|
||||
user_agent=user_agent,
|
||||
correlation_id=correlation_id,
|
||||
old_values=old_values,
|
||||
new_values=new_values,
|
||||
extra_metadata=metadata # Mapeo metadata -> extra_metadata
|
||||
)
|
||||
|
||||
db.add(audit_log)
|
||||
await db.flush() # No commit, se hará con la transacción principal
|
||||
|
||||
# Log estructurado para debugging
|
||||
logger.info(
|
||||
"Audit log created",
|
||||
action=action,
|
||||
resource_type=resource_type,
|
||||
resource_id=str(resource_id) if resource_id else None,
|
||||
user_id=str(user_id) if user_id else "system",
|
||||
tenant_id=str(tenant_id)
|
||||
)
|
||||
|
||||
return audit_log
|
||||
|
||||
@staticmethod
|
||||
async def log_login(
|
||||
db: AsyncSession,
|
||||
user: User,
|
||||
request: Request,
|
||||
success: bool = True
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra un intento de login.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
user: Usuario que intent├│ loguearse
|
||||
request: Request de FastAPI
|
||||
success: Si el login fue exitoso
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
return await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=user.tenant_id,
|
||||
user_id=user.id if success else None,
|
||||
action="user.login" if success else "user.login_failed",
|
||||
resource_type="user",
|
||||
resource_id=user.id,
|
||||
metadata={
|
||||
"success": success,
|
||||
"email": user.email
|
||||
},
|
||||
request=request
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
async def log_logout(
|
||||
db: AsyncSession,
|
||||
user: User,
|
||||
request: Request
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra un logout.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
user: Usuario que cerr├│ sesi├│n
|
||||
request: Request de FastAPI
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
return await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=user.tenant_id,
|
||||
user_id=user.id,
|
||||
action="user.logout",
|
||||
resource_type="user",
|
||||
resource_id=user.id,
|
||||
request=request
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
async def log_create(
|
||||
db: AsyncSession,
|
||||
tenant_id: uuid.UUID,
|
||||
user_id: uuid.UUID,
|
||||
resource_type: str,
|
||||
resource_id: uuid.UUID,
|
||||
new_values: Dict[str, Any],
|
||||
request: Optional[Request] = None
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra la creaci├│n de un recurso.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
tenant_id: ID del tenant
|
||||
user_id: ID del usuario que cre├│ el recurso
|
||||
resource_type: Tipo de recurso ("ticket", "user", etc.)
|
||||
resource_id: ID del recurso creado
|
||||
new_values: Valores del nuevo recurso
|
||||
request: Request de FastAPI (opcional)
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
return await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
action=f"{resource_type}.create",
|
||||
resource_type=resource_type,
|
||||
resource_id=resource_id,
|
||||
new_values=new_values,
|
||||
request=request
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
async def log_update(
|
||||
db: AsyncSession,
|
||||
tenant_id: uuid.UUID,
|
||||
user_id: uuid.UUID,
|
||||
resource_type: str,
|
||||
resource_id: uuid.UUID,
|
||||
old_values: Dict[str, Any],
|
||||
new_values: Dict[str, Any],
|
||||
request: Optional[Request] = None
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra la actualizaci├│n de un recurso.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
tenant_id: ID del tenant
|
||||
user_id: ID del usuario que actualiz├│
|
||||
resource_type: Tipo de recurso
|
||||
resource_id: ID del recurso
|
||||
old_values: Valores anteriores
|
||||
new_values: Valores nuevos
|
||||
request: Request de FastAPI (opcional)
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
return await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
action=f"{resource_type}.update",
|
||||
resource_type=resource_type,
|
||||
resource_id=resource_id,
|
||||
old_values=old_values,
|
||||
new_values=new_values,
|
||||
request=request
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
async def log_delete(
|
||||
db: AsyncSession,
|
||||
tenant_id: uuid.UUID,
|
||||
user_id: uuid.UUID,
|
||||
resource_type: str,
|
||||
resource_id: uuid.UUID,
|
||||
old_values: Dict[str, Any],
|
||||
request: Optional[Request] = None
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Registra la eliminaci├│n de un recurso.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
tenant_id: ID del tenant
|
||||
user_id: ID del usuario que elimin├│
|
||||
resource_type: Tipo de recurso
|
||||
resource_id: ID del recurso eliminado
|
||||
old_values: Valores del recurso antes de eliminar
|
||||
request: Request de FastAPI (opcional)
|
||||
|
||||
Returns:
|
||||
AuditLog creado
|
||||
"""
|
||||
return await AuditService.log(
|
||||
db=db,
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
action=f"{resource_type}.delete",
|
||||
resource_type=resource_type,
|
||||
resource_id=resource_id,
|
||||
old_values=old_values,
|
||||
request=request
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def sanitize_values(values: Dict[str, Any]) -> Dict[str, Any]:
|
||||
"""
|
||||
Sanitiza valores sensibles antes de guardarlos en audit log.
|
||||
|
||||
Remueve campos como passwords, tokens, etc.
|
||||
|
||||
Args:
|
||||
values: Diccionario de valores
|
||||
|
||||
Returns:
|
||||
Diccionario sanitizado
|
||||
"""
|
||||
sensitive_fields = {
|
||||
'password',
|
||||
'password_hash',
|
||||
'totp_secret',
|
||||
'backup_codes',
|
||||
'token',
|
||||
'access_token',
|
||||
'refresh_token'
|
||||
}
|
||||
|
||||
return {
|
||||
key: '***REDACTED***' if key in sensitive_fields else value
|
||||
for key, value in values.items()
|
||||
}
|
||||
@@ -1,270 +0,0 @@
|
||||
"""
|
||||
Token Service - ServiceManagerWeb
|
||||
|
||||
Servicio para gesti├│n de refresh tokens persistentes.
|
||||
"""
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, delete
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Optional
|
||||
import uuid
|
||||
import structlog
|
||||
|
||||
from app.models.refresh_token import RefreshToken
|
||||
from app.models.user import User
|
||||
from app.core.config import get_settings
|
||||
|
||||
logger = structlog.get_logger(__name__)
|
||||
settings = get_settings()
|
||||
|
||||
|
||||
class TokenService:
|
||||
"""
|
||||
Servicio para gesti├│n de refresh tokens.
|
||||
|
||||
Proporciona m├®todos para crear, validar, revocar y limpiar
|
||||
refresh tokens persistentes.
|
||||
|
||||
NOTA: Los tokens se almacenan directamente en BD (no hash)
|
||||
ya que los JWTs son firmados y verificables.
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
async def create_refresh_token(
|
||||
db: AsyncSession,
|
||||
user: User,
|
||||
refresh_token: str,
|
||||
device_id: Optional[str] = None,
|
||||
device_name: Optional[str] = None,
|
||||
user_agent: Optional[str] = None,
|
||||
ip_address: Optional[str] = None
|
||||
) -> RefreshToken:
|
||||
"""
|
||||
Crear y persistir un refresh token.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
user: Usuario propietario del token
|
||||
refresh_token: Token JWT generado (se almacena directamente)
|
||||
device_id: ID ├║nico del dispositivo (UUID generado por cliente)
|
||||
device_name: Nombre del dispositivo (ej: "Chrome en Windows")
|
||||
user_agent: User agent completo del navegador
|
||||
ip_address: IP del cliente
|
||||
|
||||
Returns:
|
||||
RefreshToken creado
|
||||
"""
|
||||
# Calcular expiraci├│n
|
||||
expires_at = datetime.utcnow() + timedelta(
|
||||
days=settings.REFRESH_TOKEN_EXPIRE_DAYS
|
||||
)
|
||||
|
||||
# Crear registro - almacena JWT directamente (columna UNIQUE)
|
||||
db_token = RefreshToken(
|
||||
user_id=user.id,
|
||||
token=refresh_token, # JWT almacenado directamente
|
||||
device_id=device_id,
|
||||
device_name=device_name,
|
||||
user_agent=user_agent,
|
||||
ip_address=ip_address,
|
||||
expires_at=expires_at,
|
||||
revoked=False,
|
||||
usage_count=0
|
||||
)
|
||||
|
||||
db.add(db_token)
|
||||
await db.flush()
|
||||
|
||||
logger.info(
|
||||
"Refresh token created",
|
||||
user_id=str(user.id),
|
||||
token_id=str(db_token.id),
|
||||
device_name=device_name,
|
||||
expires_at=expires_at.isoformat()
|
||||
)
|
||||
|
||||
return db_token
|
||||
|
||||
@staticmethod
|
||||
async def verify_refresh_token(
|
||||
db: AsyncSession,
|
||||
refresh_token: str
|
||||
) -> Optional[RefreshToken]:
|
||||
"""
|
||||
Verificar que el refresh token exista y sea válido.
|
||||
|
||||
Busca el JWT directamente en la BD y verifica su estado.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
refresh_token: Token JWT a verificar
|
||||
|
||||
Returns:
|
||||
RefreshToken si es válido, None si no existe o está revocado/expirado
|
||||
"""
|
||||
# Buscar token directamente en BD (sin hash)
|
||||
query = select(RefreshToken).where(
|
||||
RefreshToken.token == refresh_token
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_token = result.scalar_one_or_none()
|
||||
|
||||
if not db_token:
|
||||
logger.warning("Refresh token not found in database")
|
||||
return None
|
||||
|
||||
# Verificar si es válido (usa property is_valid del modelo)
|
||||
if not db_token.is_valid:
|
||||
logger.warning(
|
||||
"Invalid refresh token",
|
||||
token_id=str(db_token.id),
|
||||
revoked=db_token.revoked,
|
||||
expired=db_token.is_expired
|
||||
)
|
||||
return None
|
||||
|
||||
# Actualizar estadísticas de uso
|
||||
db_token.track_usage()
|
||||
await db.flush()
|
||||
|
||||
logger.info(
|
||||
"Refresh token verified and usage tracked",
|
||||
token_id=str(db_token.id),
|
||||
usage_count=db_token.usage_count
|
||||
)
|
||||
return db_token
|
||||
|
||||
@staticmethod
|
||||
async def revoke_token(
|
||||
db: AsyncSession,
|
||||
refresh_token: str,
|
||||
revoked_by_user_id: Optional[uuid.UUID] = None
|
||||
) -> bool:
|
||||
"""
|
||||
Revocar un refresh token específico.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
refresh_token: Token JWT a revocar
|
||||
revoked_by_user_id: ID del usuario que revoca (para auditoría)
|
||||
|
||||
Returns:
|
||||
True si se revoc├│, False si no se encontr├│
|
||||
"""
|
||||
# Buscar token directamente (sin hash)
|
||||
query = select(RefreshToken).where(
|
||||
RefreshToken.token == refresh_token
|
||||
)
|
||||
result = await db.execute(query)
|
||||
db_token = result.scalar_one_or_none()
|
||||
|
||||
if not db_token:
|
||||
logger.warning("Refresh token not found for revocation")
|
||||
return False
|
||||
|
||||
# Revocar usando m├®todo del modelo
|
||||
db_token.revoke(revoked_by=revoked_by_user_id)
|
||||
await db.flush()
|
||||
|
||||
logger.info(
|
||||
"Refresh token revoked",
|
||||
token_id=str(db_token.id),
|
||||
revoked_by=str(revoked_by_user_id) if revoked_by_user_id else None
|
||||
)
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
async def revoke_all_user_tokens(
|
||||
db: AsyncSession,
|
||||
user_id: uuid.UUID,
|
||||
revoked_by_user_id: Optional[uuid.UUID] = None
|
||||
) -> int:
|
||||
"""
|
||||
Revocar todos los tokens activos de un usuario.
|
||||
|
||||
Útil para logout en todos los dispositivos.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
user_id: ID del usuario
|
||||
revoked_by_user_id: ID del usuario que ejecuta la revocación (para auditoría)
|
||||
|
||||
Returns:
|
||||
N├║mero de tokens revocados
|
||||
"""
|
||||
# Buscar todos los tokens activos del usuario
|
||||
query = select(RefreshToken).where(
|
||||
RefreshToken.user_id == user_id,
|
||||
RefreshToken.revoked == False
|
||||
)
|
||||
result = await db.execute(query)
|
||||
tokens = result.scalars().all()
|
||||
|
||||
count = 0
|
||||
for token in tokens:
|
||||
token.revoke(revoked_by=revoked_by_user_id)
|
||||
count += 1
|
||||
|
||||
await db.flush()
|
||||
|
||||
logger.info(
|
||||
"All user tokens revoked",
|
||||
user_id=str(user_id),
|
||||
count=count,
|
||||
revoked_by=str(revoked_by_user_id) if revoked_by_user_id else None
|
||||
)
|
||||
return count
|
||||
|
||||
@staticmethod
|
||||
async def cleanup_expired_tokens(
|
||||
db: AsyncSession
|
||||
) -> int:
|
||||
"""
|
||||
Eliminar tokens expirados de la base de datos.
|
||||
|
||||
Tarea de mantenimiento para limpiar tokens antiguos.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
|
||||
Returns:
|
||||
N├║mero de tokens eliminados
|
||||
"""
|
||||
# Eliminar tokens expirados hace más de 7 días
|
||||
cutoff_date = datetime.utcnow() - timedelta(days=7)
|
||||
|
||||
query = delete(RefreshToken).where(
|
||||
RefreshToken.expires_at < cutoff_date
|
||||
)
|
||||
result = await db.execute(query)
|
||||
await db.flush()
|
||||
|
||||
deleted_count = result.rowcount
|
||||
|
||||
logger.info("Expired tokens cleaned up", count=deleted_count)
|
||||
return deleted_count
|
||||
|
||||
@staticmethod
|
||||
async def get_user_tokens(
|
||||
db: AsyncSession,
|
||||
user_id: uuid.UUID
|
||||
) -> list[RefreshToken]:
|
||||
"""
|
||||
Obtener todos los tokens activos de un usuario.
|
||||
|
||||
Args:
|
||||
db: Sesi├│n de base de datos
|
||||
user_id: ID del usuario
|
||||
|
||||
Returns:
|
||||
Lista de RefreshTokens activos
|
||||
"""
|
||||
query = select(RefreshToken).where(
|
||||
RefreshToken.user_id == user_id,
|
||||
RefreshToken.revoked == False,
|
||||
RefreshToken.expires_at > datetime.utcnow()
|
||||
).order_by(RefreshToken.created_at.desc())
|
||||
|
||||
result = await db.execute(query)
|
||||
return list(result.scalars().all())
|
||||
@@ -1,67 +0,0 @@
|
||||
"""
|
||||
Script para crear/actualizar usuario de prueba con contraseña conocida
|
||||
"""
|
||||
import asyncio
|
||||
from sqlalchemy import select, update
|
||||
from app.core.database import AsyncSessionLocal
|
||||
from app.core.security import security
|
||||
from app.models.user import User, UserRole
|
||||
from app.models.tenant import Tenant
|
||||
import uuid
|
||||
|
||||
async def create_test_user():
|
||||
async with AsyncSessionLocal() as db:
|
||||
# Buscar tenant
|
||||
tenant_query = select(Tenant).where(Tenant.slug.like('%aduanasoft%')).limit(1)
|
||||
result = await db.execute(tenant_query)
|
||||
tenant = result.scalar_one_or_none()
|
||||
|
||||
if not tenant:
|
||||
print("❌ No se encontró tenant")
|
||||
return
|
||||
|
||||
print(f"✅ Tenant encontrado: {tenant.name} ({tenant.slug})")
|
||||
|
||||
# Buscar o crear usuario admin
|
||||
user_query = select(User).where(
|
||||
User.email == "admin@aduanasoft.com",
|
||||
User.tenant_id == tenant.id
|
||||
)
|
||||
result = await db.execute(user_query)
|
||||
user = result.scalar_one_or_none()
|
||||
|
||||
# Hash de la contraseña "admin123"
|
||||
password_hash = security.hash_password("admin123")
|
||||
|
||||
if user:
|
||||
# Actualizar contraseña
|
||||
user.password_hash = password_hash
|
||||
user.is_active = True
|
||||
user.email_verified = True
|
||||
await db.commit()
|
||||
print(f"✅ Usuario actualizado: {user.email}")
|
||||
else:
|
||||
# Crear usuario nuevo
|
||||
user = User(
|
||||
id=uuid.uuid4(),
|
||||
tenant_id=tenant.id,
|
||||
email="admin@aduanasoft.com",
|
||||
first_name="Admin",
|
||||
last_name="Sistema",
|
||||
password_hash=password_hash,
|
||||
role=UserRole.ADMIN,
|
||||
is_active=True,
|
||||
email_verified=True
|
||||
)
|
||||
db.add(user)
|
||||
await db.commit()
|
||||
print(f"✅ Usuario creado: {user.email}")
|
||||
|
||||
print(f"\n📋 Credenciales de prueba:")
|
||||
print(f" Email: admin@aduanasoft.com")
|
||||
print(f" Password: admin123")
|
||||
print(f" Tenant: {tenant.slug}")
|
||||
print(f" Role: ADMIN")
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(create_test_user())
|
||||
40
backend/fix_password_script.py
Normal file
40
backend/fix_password_script.py
Normal file
@@ -0,0 +1,40 @@
|
||||
import sys
|
||||
import os
|
||||
import json
|
||||
|
||||
# Asegurar que el directorio raíz esté en PYTHONPATH
|
||||
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from app.core.security import SecurityUtils
|
||||
from app.core.config import settings
|
||||
from app.models.user import User
|
||||
from app.models.tenant import Tenant
|
||||
from app.core.database import AsyncSessionLocal
|
||||
from sqlalchemy.future import select
|
||||
import asyncio
|
||||
|
||||
# Generar un token predeterminado para el usuario admin
|
||||
def generate_default_token():
|
||||
async def async_task():
|
||||
async with AsyncSessionLocal() as db:
|
||||
result = await db.execute(select(User).filter(User.email == "admin@aduanasoft.com"))
|
||||
user = result.scalar_one_or_none()
|
||||
if user:
|
||||
print(f"User found: {user.email}")
|
||||
token = SecurityUtils.create_access_token({"sub": str(user.id), "email": user.email})
|
||||
print(f"Generated token: {token}")
|
||||
|
||||
# Validate the token
|
||||
payload = SecurityUtils.verify_token(token)
|
||||
if payload:
|
||||
print("Token is valid. Payload:")
|
||||
print(json.dumps(payload, indent=4))
|
||||
else:
|
||||
print("Token validation failed.")
|
||||
else:
|
||||
print("User not found. Token not generated.")
|
||||
|
||||
asyncio.run(async_task())
|
||||
|
||||
generate_default_token()
|
||||
print("Token generation process completed.")
|
||||
@@ -1,68 +0,0 @@
|
||||
from logging.config import fileConfig
|
||||
import os
|
||||
from sqlalchemy import create_engine, pool
|
||||
from sqlalchemy.engine import engine_from_config
|
||||
from alembic import context
|
||||
|
||||
# Import Base and all models
|
||||
from app.core.database import Base
|
||||
from app.models import tenant # Import all models explicitly
|
||||
|
||||
# Alembic Config object
|
||||
config = context.config
|
||||
|
||||
# Logging configuration
|
||||
if config.config_file_name:
|
||||
fileConfig(config.config_file_name)
|
||||
|
||||
# Get DATABASE_URL and convert to synchronous
|
||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
||||
if not DATABASE_URL:
|
||||
raise RuntimeError("DATABASE_URL environment variable is not set")
|
||||
|
||||
SYNC_DATABASE_URL = DATABASE_URL.replace("+asyncpg", "")
|
||||
|
||||
# Metadata for autogenerate
|
||||
target_metadata = Base.metadata
|
||||
|
||||
|
||||
def run_migrations_offline():
|
||||
"""
|
||||
Run migrations in 'offline' mode.
|
||||
"""
|
||||
context.configure(
|
||||
url=SYNC_DATABASE_URL,
|
||||
target_metadata=target_metadata,
|
||||
literal_binds=True,
|
||||
dialect_opts={"paramstyle": "named"},
|
||||
)
|
||||
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
def run_migrations_online():
|
||||
"""
|
||||
Run migrations in 'online' mode.
|
||||
"""
|
||||
# Fetch the URL from Alembic configuration
|
||||
alembic_config = config.get_section(config.config_ini_section)
|
||||
alembic_config["sqlalchemy.url"] = SYNC_DATABASE_URL
|
||||
|
||||
connectable = engine_from_config(
|
||||
alembic_config,
|
||||
prefix="sqlalchemy.",
|
||||
poolclass=pool.NullPool,
|
||||
)
|
||||
|
||||
with connectable.connect() as connection:
|
||||
context.configure(connection=connection, target_metadata=target_metadata)
|
||||
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
if context.is_offline_mode():
|
||||
run_migrations_offline()
|
||||
else:
|
||||
run_migrations_online()
|
||||
@@ -1,24 +0,0 @@
|
||||
"""${message}
|
||||
|
||||
Revision ID: ${up_revision}
|
||||
Revises: ${down_revision | comma,n}
|
||||
Create Date: ${create_date}
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
${imports if imports else ""}
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = ${repr(up_revision)}
|
||||
down_revision = ${repr(down_revision)}
|
||||
branch_labels = ${repr(branch_labels)}
|
||||
depends_on = ${repr(depends_on)}
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
${upgrades if upgrades else "pass"}
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
${downgrades if downgrades else "pass"}
|
||||
@@ -1,102 +0,0 @@
|
||||
"""Add client_profiles table
|
||||
|
||||
Revision ID: 13362e8c493a
|
||||
Revises: 48c43e9204c3
|
||||
Create Date: 2026-02-05 20:11:52.534918
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '13362e8c493a'
|
||||
down_revision = '48c43e9204c3'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
# Create client_profiles table
|
||||
op.create_table('client_profiles',
|
||||
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False, default=sa.text('gen_random_uuid()')),
|
||||
sa.Column('tenant_id', postgresql.UUID(as_uuid=True), nullable=False),
|
||||
|
||||
# === INFORMACIÓN GENERAL ===
|
||||
sa.Column('business_name', sa.String(length=255), nullable=True),
|
||||
sa.Column('commercial_name', sa.String(length=255), nullable=True),
|
||||
sa.Column('client_code', sa.String(length=50), nullable=True),
|
||||
sa.Column('client_type', sa.String(length=50), nullable=True),
|
||||
sa.Column('rfc', sa.String(length=13), nullable=True),
|
||||
sa.Column('tax_id', sa.String(length=50), nullable=True),
|
||||
|
||||
# === UBICACIÓN ===
|
||||
sa.Column('country', sa.String(length=100), nullable=True),
|
||||
sa.Column('state', sa.String(length=100), nullable=True),
|
||||
sa.Column('city', sa.String(length=100), nullable=True),
|
||||
sa.Column('address', sa.Text(), nullable=True),
|
||||
sa.Column('external_number', sa.String(length=20), nullable=True),
|
||||
sa.Column('internal_number', sa.String(length=20), nullable=True),
|
||||
sa.Column('postal_code', sa.String(length=10), nullable=True),
|
||||
sa.Column('neighborhood', sa.String(length=100), nullable=True),
|
||||
|
||||
# === CONTACTO ===
|
||||
sa.Column('main_phone', sa.String(length=20), nullable=True),
|
||||
sa.Column('secondary_phone', sa.String(length=20), nullable=True),
|
||||
sa.Column('direct_phone', sa.String(length=20), nullable=True),
|
||||
sa.Column('phone_extension', sa.String(length=10), nullable=True),
|
||||
sa.Column('fax', sa.String(length=20), nullable=True),
|
||||
|
||||
# === INFORMACIÓN ADICIONAL ===
|
||||
sa.Column('business_hours', sa.String(length=255), nullable=True),
|
||||
sa.Column('website', sa.String(length=255), nullable=True),
|
||||
sa.Column('main_email', sa.String(length=320), nullable=True),
|
||||
sa.Column('billing_email', sa.String(length=320), nullable=True),
|
||||
|
||||
# === MARKETING ===
|
||||
sa.Column('advertising_medium', sa.String(length=255), nullable=True),
|
||||
sa.Column('nationality', sa.String(length=100), nullable=True),
|
||||
|
||||
# === CONFIGURACIÓN EMPRESARIAL ===
|
||||
sa.Column('logo_url', sa.String(length=500), nullable=True),
|
||||
sa.Column('company_representative', sa.String(length=255), nullable=True),
|
||||
sa.Column('legal_representative', sa.String(length=255), nullable=True),
|
||||
|
||||
# === FINANZAS/FACTURACIÓN ===
|
||||
sa.Column('credit_limit', sa.Numeric(precision=15, scale=2), nullable=True),
|
||||
sa.Column('payment_terms', sa.String(length=100), nullable=True),
|
||||
sa.Column('preferred_currency', sa.String(length=3), nullable=False, default='MXN'),
|
||||
|
||||
# === METADATOS ===
|
||||
sa.Column('send_to_billing', sa.Boolean(), nullable=False, default=False),
|
||||
sa.Column('is_active_client', sa.Boolean(), nullable=False, default=True),
|
||||
sa.Column('is_prospect', sa.Boolean(), nullable=False, default=False),
|
||||
sa.Column('notes', sa.Text(), nullable=True),
|
||||
|
||||
# === TIMESTAMPS ===
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False, default=sa.func.now()),
|
||||
sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False, default=sa.func.now(), onupdate=sa.func.now()),
|
||||
|
||||
# Constraints
|
||||
sa.PrimaryKeyConstraint('id'),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], ondelete='CASCADE'),
|
||||
sa.UniqueConstraint('tenant_id') # Relación uno a uno con tenant
|
||||
)
|
||||
|
||||
# Crear índices para optimizar consultas
|
||||
op.create_index('idx_client_profiles_tenant_id', 'client_profiles', ['tenant_id'])
|
||||
op.create_index('idx_client_profiles_rfc', 'client_profiles', ['rfc'])
|
||||
op.create_index('idx_client_profiles_business_name', 'client_profiles', ['business_name'])
|
||||
op.create_index('idx_client_profiles_client_code', 'client_profiles', ['client_code'])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
# Drop índices
|
||||
op.drop_index('idx_client_profiles_client_code', table_name='client_profiles')
|
||||
op.drop_index('idx_client_profiles_business_name', table_name='client_profiles')
|
||||
op.drop_index('idx_client_profiles_rfc', table_name='client_profiles')
|
||||
op.drop_index('idx_client_profiles_tenant_id', table_name='client_profiles')
|
||||
|
||||
# Drop tabla
|
||||
op.drop_table('client_profiles')
|
||||
@@ -1,464 +0,0 @@
|
||||
"""Create all tables
|
||||
|
||||
Revision ID: 35742cfbb850
|
||||
Revises:
|
||||
Create Date: 2026-02-05 19:37:58.771067
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '35742cfbb850'
|
||||
down_revision = None
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_index('idx_audit_logs_action', table_name='audit_logs')
|
||||
op.drop_index('idx_audit_logs_correlation_id', table_name='audit_logs')
|
||||
op.drop_index('idx_audit_logs_created_at', table_name='audit_logs')
|
||||
op.drop_index('idx_audit_logs_resource', table_name='audit_logs')
|
||||
op.drop_index('idx_audit_logs_tenant_id', table_name='audit_logs')
|
||||
op.drop_index('idx_audit_logs_user_id', table_name='audit_logs')
|
||||
op.drop_table('audit_logs')
|
||||
op.drop_index('idx_tickets_assigned_to', table_name='tickets')
|
||||
op.drop_index('idx_tickets_category', table_name='tickets')
|
||||
op.drop_index('idx_tickets_created_at', table_name='tickets')
|
||||
op.drop_index('idx_tickets_created_by', table_name='tickets')
|
||||
op.drop_index('idx_tickets_number', table_name='tickets')
|
||||
op.drop_index('idx_tickets_priority', table_name='tickets')
|
||||
op.drop_index('idx_tickets_sla_resolution', table_name='tickets')
|
||||
op.drop_index('idx_tickets_sla_response', table_name='tickets')
|
||||
op.drop_index('idx_tickets_status', table_name='tickets')
|
||||
op.drop_index('idx_tickets_tenant_id', table_name='tickets')
|
||||
op.drop_table('tickets')
|
||||
op.drop_index('idx_refresh_tokens_expires', table_name='refresh_tokens')
|
||||
op.drop_index('idx_refresh_tokens_hash', table_name='refresh_tokens')
|
||||
op.drop_index('idx_refresh_tokens_user_id', table_name='refresh_tokens')
|
||||
op.drop_table('refresh_tokens')
|
||||
op.drop_index('idx_notification_logs_created_at', table_name='notification_logs')
|
||||
op.drop_index('idx_notification_logs_recipient', table_name='notification_logs')
|
||||
op.drop_index('idx_notification_logs_status', table_name='notification_logs')
|
||||
op.drop_index('idx_notification_logs_tenant_id', table_name='notification_logs')
|
||||
op.drop_index('idx_notification_logs_ticket_id', table_name='notification_logs')
|
||||
op.drop_table('notification_logs')
|
||||
op.drop_table('affected_systems')
|
||||
op.drop_index('idx_ticket_comments_author_id', table_name='ticket_comments')
|
||||
op.drop_index('idx_ticket_comments_created_at', table_name='ticket_comments')
|
||||
op.drop_index('idx_ticket_comments_ticket_id', table_name='ticket_comments')
|
||||
op.drop_table('ticket_comments')
|
||||
op.drop_index('idx_clients_name', table_name='clients')
|
||||
op.drop_index('idx_clients_properties', table_name='clients', postgresql_using='gin')
|
||||
op.drop_index('idx_clients_tax_id', table_name='clients')
|
||||
op.drop_index('idx_clients_tenant_id', table_name='clients')
|
||||
op.drop_table('clients')
|
||||
op.drop_table('categories')
|
||||
op.drop_index('idx_users_active', table_name='users')
|
||||
op.drop_index('idx_users_email', table_name='users')
|
||||
op.drop_index('idx_users_role', table_name='users')
|
||||
op.drop_index('idx_users_tenant_email', table_name='users')
|
||||
op.drop_index('idx_users_tenant_id', table_name='users')
|
||||
op.drop_table('users')
|
||||
op.drop_table('systems')
|
||||
op.drop_table('ticket_categories')
|
||||
op.drop_index('idx_ticket_status_history_changed_by', table_name='ticket_status_history')
|
||||
op.drop_index('idx_ticket_status_history_created_at', table_name='ticket_status_history')
|
||||
op.drop_index('idx_ticket_status_history_ticket_id', table_name='ticket_status_history')
|
||||
op.drop_table('ticket_status_history')
|
||||
op.drop_index('idx_ticket_attachments_comment_id', table_name='ticket_attachments')
|
||||
op.drop_index('idx_ticket_attachments_ticket_id', table_name='ticket_attachments')
|
||||
op.drop_index('idx_ticket_attachments_uploaded_by', table_name='ticket_attachments')
|
||||
op.drop_table('ticket_attachments')
|
||||
op.drop_index('idx_email_templates_tenant_id', table_name='email_templates')
|
||||
op.drop_index('idx_email_templates_type', table_name='email_templates')
|
||||
op.drop_table('email_templates')
|
||||
op.alter_column('tenants', 'timezone',
|
||||
existing_type=sa.VARCHAR(length=50),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text("'UTC'::character varying"))
|
||||
op.alter_column('tenants', 'locale',
|
||||
existing_type=sa.VARCHAR(length=10),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text("'es-ES'::character varying"))
|
||||
op.alter_column('tenants', 'max_users',
|
||||
existing_type=sa.INTEGER(),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text('50'))
|
||||
op.alter_column('tenants', 'max_storage_mb',
|
||||
existing_type=sa.INTEGER(),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text('1024'))
|
||||
op.alter_column('tenants', 'allowed_file_types',
|
||||
existing_type=postgresql.ARRAY(sa.TEXT()),
|
||||
type_=sa.ARRAY(sa.String()),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text("ARRAY['pdf'::text, 'jpg'::text, 'jpeg'::text, 'png'::text, 'doc'::text, 'docx'::text, 'xls'::text, 'xlsx'::text, 'txt'::text]"))
|
||||
op.alter_column('tenants', 'status',
|
||||
existing_type=sa.VARCHAR(length=20),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text("'active'::character varying"))
|
||||
op.alter_column('tenants', 'created_at',
|
||||
existing_type=postgresql.TIMESTAMP(timezone=True),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text('now()'))
|
||||
op.alter_column('tenants', 'updated_at',
|
||||
existing_type=postgresql.TIMESTAMP(timezone=True),
|
||||
nullable=False,
|
||||
existing_server_default=sa.text('now()'))
|
||||
op.drop_index('idx_tenants_domain', table_name='tenants')
|
||||
op.drop_index('idx_tenants_slug', table_name='tenants')
|
||||
op.drop_index('idx_tenants_status', table_name='tenants')
|
||||
op.drop_table_comment(
|
||||
'tenants',
|
||||
existing_comment='Organizaciones cliente en el sistema multi-tenant',
|
||||
schema=None
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table_comment(
|
||||
'tenants',
|
||||
'Organizaciones cliente en el sistema multi-tenant',
|
||||
existing_comment=None,
|
||||
schema=None
|
||||
)
|
||||
op.create_index('idx_tenants_status', 'tenants', ['status'], unique=False)
|
||||
op.create_index('idx_tenants_slug', 'tenants', ['slug'], unique=False)
|
||||
op.create_index('idx_tenants_domain', 'tenants', ['domain'], unique=False)
|
||||
op.alter_column('tenants', 'updated_at',
|
||||
existing_type=postgresql.TIMESTAMP(timezone=True),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text('now()'))
|
||||
op.alter_column('tenants', 'created_at',
|
||||
existing_type=postgresql.TIMESTAMP(timezone=True),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text('now()'))
|
||||
op.alter_column('tenants', 'status',
|
||||
existing_type=sa.VARCHAR(length=20),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text("'active'::character varying"))
|
||||
op.alter_column('tenants', 'allowed_file_types',
|
||||
existing_type=sa.ARRAY(sa.String()),
|
||||
type_=postgresql.ARRAY(sa.TEXT()),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text("ARRAY['pdf'::text, 'jpg'::text, 'jpeg'::text, 'png'::text, 'doc'::text, 'docx'::text, 'xls'::text, 'xlsx'::text, 'txt'::text]"))
|
||||
op.alter_column('tenants', 'max_storage_mb',
|
||||
existing_type=sa.INTEGER(),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text('1024'))
|
||||
op.alter_column('tenants', 'max_users',
|
||||
existing_type=sa.INTEGER(),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text('50'))
|
||||
op.alter_column('tenants', 'locale',
|
||||
existing_type=sa.VARCHAR(length=10),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text("'es-ES'::character varying"))
|
||||
op.alter_column('tenants', 'timezone',
|
||||
existing_type=sa.VARCHAR(length=50),
|
||||
nullable=True,
|
||||
existing_server_default=sa.text("'UTC'::character varying"))
|
||||
op.create_table('email_templates',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('subject_template', sa.TEXT(), autoincrement=False, nullable=False),
|
||||
sa.Column('body_template', sa.TEXT(), autoincrement=False, nullable=False),
|
||||
sa.Column('template_type', sa.VARCHAR(length=50), autoincrement=False, nullable=False),
|
||||
sa.Column('available_variables', postgresql.JSONB(astext_type=sa.Text()), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='email_templates_tenant_id_fkey'),
|
||||
sa.PrimaryKeyConstraint('id', name='email_templates_pkey')
|
||||
)
|
||||
op.create_index('idx_email_templates_type', 'email_templates', ['template_type'], unique=False)
|
||||
op.create_index('idx_email_templates_tenant_id', 'email_templates', ['tenant_id'], unique=False)
|
||||
op.create_table('ticket_attachments',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('ticket_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('comment_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('uploaded_by', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('filename', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
|
||||
sa.Column('original_filename', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
|
||||
sa.Column('mime_type', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('file_size', sa.INTEGER(), autoincrement=False, nullable=False),
|
||||
sa.Column('file_path', sa.VARCHAR(length=500), autoincrement=False, nullable=False),
|
||||
sa.Column('md5_hash', sa.VARCHAR(length=32), autoincrement=False, nullable=True),
|
||||
sa.Column('sha256_hash', sa.VARCHAR(length=64), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['comment_id'], ['ticket_comments.id'], name='ticket_attachments_comment_id_fkey', ondelete='CASCADE'),
|
||||
sa.ForeignKeyConstraint(['ticket_id'], ['tickets.id'], name='ticket_attachments_ticket_id_fkey', ondelete='CASCADE'),
|
||||
sa.ForeignKeyConstraint(['uploaded_by'], ['users.id'], name='ticket_attachments_uploaded_by_fkey'),
|
||||
sa.PrimaryKeyConstraint('id', name='ticket_attachments_pkey'),
|
||||
comment='Archivos adjuntos en tickets'
|
||||
)
|
||||
op.create_index('idx_ticket_attachments_uploaded_by', 'ticket_attachments', ['uploaded_by'], unique=False)
|
||||
op.create_index('idx_ticket_attachments_ticket_id', 'ticket_attachments', ['ticket_id'], unique=False)
|
||||
op.create_index('idx_ticket_attachments_comment_id', 'ticket_attachments', ['comment_id'], unique=False)
|
||||
op.create_table('ticket_status_history',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('ticket_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('changed_by', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('old_status', postgresql.ENUM('NEW', 'TRIAGE', 'IN_PROGRESS', 'WAITING_CUSTOMER', 'RESOLVED', 'CLOSED', 'REOPENED', name='ticket_status_enum'), autoincrement=False, nullable=True),
|
||||
sa.Column('new_status', postgresql.ENUM('NEW', 'TRIAGE', 'IN_PROGRESS', 'WAITING_CUSTOMER', 'RESOLVED', 'CLOSED', 'REOPENED', name='ticket_status_enum'), autoincrement=False, nullable=False),
|
||||
sa.Column('old_assigned_to', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('new_assigned_to', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('comment', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['changed_by'], ['users.id'], name='ticket_status_history_changed_by_fkey'),
|
||||
sa.ForeignKeyConstraint(['new_assigned_to'], ['users.id'], name='ticket_status_history_new_assigned_to_fkey'),
|
||||
sa.ForeignKeyConstraint(['old_assigned_to'], ['users.id'], name='ticket_status_history_old_assigned_to_fkey'),
|
||||
sa.ForeignKeyConstraint(['ticket_id'], ['tickets.id'], name='ticket_status_history_ticket_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='ticket_status_history_pkey')
|
||||
)
|
||||
op.create_index('idx_ticket_status_history_ticket_id', 'ticket_status_history', ['ticket_id'], unique=False)
|
||||
op.create_index('idx_ticket_status_history_created_at', 'ticket_status_history', ['created_at'], unique=False)
|
||||
op.create_index('idx_ticket_status_history_changed_by', 'ticket_status_history', ['changed_by'], unique=False)
|
||||
op.create_table('ticket_categories',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('color', sa.VARCHAR(length=7), autoincrement=False, nullable=True),
|
||||
sa.Column('sla_response_hours', sa.INTEGER(), server_default=sa.text('24'), autoincrement=False, nullable=True),
|
||||
sa.Column('sla_resolution_hours', sa.INTEGER(), server_default=sa.text('72'), autoincrement=False, nullable=True),
|
||||
sa.Column('auto_assign_to', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['auto_assign_to'], ['users.id'], name='ticket_categories_auto_assign_to_fkey'),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='ticket_categories_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='ticket_categories_pkey'),
|
||||
sa.UniqueConstraint('tenant_id', 'name', name='ticket_categories_tenant_id_name_key'),
|
||||
postgresql_ignore_search_path=False
|
||||
)
|
||||
op.create_table('systems',
|
||||
sa.Column('name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), autoincrement=False, nullable=False),
|
||||
sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=False),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=False),
|
||||
sa.PrimaryKeyConstraint('id', name='systems_pkey')
|
||||
)
|
||||
op.create_table('users',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('email', sa.VARCHAR(length=320), autoincrement=False, nullable=False),
|
||||
sa.Column('first_name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('last_name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('avatar_url', sa.VARCHAR(length=500), autoincrement=False, nullable=True),
|
||||
sa.Column('password_hash', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
|
||||
sa.Column('role', postgresql.ENUM('ADMIN', 'SUPPORT_MANAGER', 'AGENT', 'AUDITOR', 'CLIENT_ADMIN', 'CLIENT_USER', name='user_role_enum'), autoincrement=False, nullable=False),
|
||||
sa.Column('totp_secret', sa.VARCHAR(length=32), autoincrement=False, nullable=True),
|
||||
sa.Column('totp_enabled', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=True),
|
||||
sa.Column('backup_codes', postgresql.ARRAY(sa.TEXT()), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('email_verified', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=True),
|
||||
sa.Column('last_login', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('last_activity', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('language', sa.VARCHAR(length=10), server_default=sa.text("'es'::character varying"), autoincrement=False, nullable=True),
|
||||
sa.Column('timezone', sa.VARCHAR(length=50), server_default=sa.text("'UTC'::character varying"), autoincrement=False, nullable=True),
|
||||
sa.Column('notifications_email', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='users_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='users_pkey'),
|
||||
sa.UniqueConstraint('tenant_id', 'email', name='users_tenant_id_email_key'),
|
||||
comment='Usuarios del sistema (internos y clientes)',
|
||||
postgresql_ignore_search_path=False
|
||||
)
|
||||
op.create_index('idx_users_tenant_id', 'users', ['tenant_id'], unique=False)
|
||||
op.create_index('idx_users_tenant_email', 'users', ['tenant_id', 'email'], unique=False)
|
||||
op.create_index('idx_users_role', 'users', ['role'], unique=False)
|
||||
op.create_index('idx_users_email', 'users', ['email'], unique=False)
|
||||
op.create_index('idx_users_active', 'users', ['is_active'], unique=False)
|
||||
op.create_table('categories',
|
||||
sa.Column('name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=False),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=False),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='categories_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='categories_pkey')
|
||||
)
|
||||
op.create_table('clients',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('code', sa.VARCHAR(length=50), autoincrement=False, nullable=True),
|
||||
sa.Column('name', sa.VARCHAR(length=200), autoincrement=False, nullable=False),
|
||||
sa.Column('tax_id', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
|
||||
sa.Column('client_type', sa.VARCHAR(length=50), autoincrement=False, nullable=True),
|
||||
sa.Column('account_manager', sa.VARCHAR(length=100), autoincrement=False, nullable=True),
|
||||
sa.Column('address_street', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('address_ext_num', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
|
||||
sa.Column('neighborhood', sa.VARCHAR(length=100), autoincrement=False, nullable=True),
|
||||
sa.Column('zip_code', sa.VARCHAR(length=10), autoincrement=False, nullable=True),
|
||||
sa.Column('city', sa.VARCHAR(length=100), autoincrement=False, nullable=True),
|
||||
sa.Column('state', sa.VARCHAR(length=100), autoincrement=False, nullable=True),
|
||||
sa.Column('country', sa.VARCHAR(length=100), server_default=sa.text("'Mexico'::character varying"), autoincrement=False, nullable=True),
|
||||
sa.Column('phone_primary', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
|
||||
sa.Column('phone_secondary', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
|
||||
sa.Column('fax', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
|
||||
sa.Column('email', sa.VARCHAR(length=320), autoincrement=False, nullable=True),
|
||||
sa.Column('website', sa.VARCHAR(length=255), autoincrement=False, nullable=True),
|
||||
sa.Column('status', postgresql.ENUM('prospect', 'active', 'suspended', 'cancelled', name='client_status_enum'), server_default=sa.text("'prospect'::client_status_enum"), autoincrement=False, nullable=True),
|
||||
sa.Column('logo_url', sa.VARCHAR(length=500), autoincrement=False, nullable=True),
|
||||
sa.Column('properties', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='clients_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='clients_pkey'),
|
||||
sa.UniqueConstraint('tenant_id', 'code', name='clients_tenant_id_code_key'),
|
||||
sa.UniqueConstraint('tenant_id', 'tax_id', name='clients_tenant_id_tax_id_key')
|
||||
)
|
||||
op.create_index('idx_clients_tenant_id', 'clients', ['tenant_id'], unique=False)
|
||||
op.create_index('idx_clients_tax_id', 'clients', ['tax_id'], unique=False)
|
||||
op.create_index('idx_clients_properties', 'clients', ['properties'], unique=False, postgresql_using='gin')
|
||||
op.create_index('idx_clients_name', 'clients', ['name'], unique=False)
|
||||
op.create_table('ticket_comments',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('ticket_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('author_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('content', sa.TEXT(), autoincrement=False, nullable=False),
|
||||
sa.Column('is_internal', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['author_id'], ['users.id'], name='ticket_comments_author_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['ticket_id'], ['tickets.id'], name='ticket_comments_ticket_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='ticket_comments_pkey'),
|
||||
comment='Comentarios en tickets'
|
||||
)
|
||||
op.create_index('idx_ticket_comments_ticket_id', 'ticket_comments', ['ticket_id'], unique=False)
|
||||
op.create_index('idx_ticket_comments_created_at', 'ticket_comments', ['created_at'], unique=False)
|
||||
op.create_index('idx_ticket_comments_author_id', 'ticket_comments', ['author_id'], unique=False)
|
||||
op.create_table('affected_systems',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('name', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('is_active', sa.BOOLEAN(), server_default=sa.text('true'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='affected_systems_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='affected_systems_pkey'),
|
||||
sa.UniqueConstraint('tenant_id', 'name', name='affected_systems_tenant_id_name_key'),
|
||||
postgresql_ignore_search_path=False
|
||||
)
|
||||
op.create_table('notification_logs',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('recipient_email', sa.VARCHAR(length=320), autoincrement=False, nullable=False),
|
||||
sa.Column('subject', sa.VARCHAR(length=500), autoincrement=False, nullable=False),
|
||||
sa.Column('template_type', sa.VARCHAR(length=50), autoincrement=False, nullable=True),
|
||||
sa.Column('ticket_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('status', sa.VARCHAR(length=20), server_default=sa.text("'pending'::character varying"), autoincrement=False, nullable=True),
|
||||
sa.Column('error_message', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('provider', sa.VARCHAR(length=50), autoincrement=False, nullable=True),
|
||||
sa.Column('external_id', sa.VARCHAR(length=255), autoincrement=False, nullable=True),
|
||||
sa.Column('sent_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.CheckConstraint("status::text = ANY (ARRAY['pending'::character varying, 'sent'::character varying, 'failed'::character varying, 'bounced'::character varying]::text[])", name='notification_logs_status_check'),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='notification_logs_tenant_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['ticket_id'], ['tickets.id'], name='notification_logs_ticket_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='notification_logs_user_id_fkey'),
|
||||
sa.PrimaryKeyConstraint('id', name='notification_logs_pkey')
|
||||
)
|
||||
op.create_index('idx_notification_logs_ticket_id', 'notification_logs', ['ticket_id'], unique=False)
|
||||
op.create_index('idx_notification_logs_tenant_id', 'notification_logs', ['tenant_id'], unique=False)
|
||||
op.create_index('idx_notification_logs_status', 'notification_logs', ['status'], unique=False)
|
||||
op.create_index('idx_notification_logs_recipient', 'notification_logs', ['recipient_email'], unique=False)
|
||||
op.create_index('idx_notification_logs_created_at', 'notification_logs', ['created_at'], unique=False)
|
||||
op.create_table('refresh_tokens',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('token_hash', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
|
||||
sa.Column('device_info', sa.VARCHAR(length=500), autoincrement=False, nullable=True),
|
||||
sa.Column('ip_address', postgresql.INET(), autoincrement=False, nullable=True),
|
||||
sa.Column('expires_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=False),
|
||||
sa.Column('revoked', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='refresh_tokens_user_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='refresh_tokens_pkey')
|
||||
)
|
||||
op.create_index('idx_refresh_tokens_user_id', 'refresh_tokens', ['user_id'], unique=False)
|
||||
op.create_index('idx_refresh_tokens_hash', 'refresh_tokens', ['token_hash'], unique=False)
|
||||
op.create_index('idx_refresh_tokens_expires', 'refresh_tokens', ['expires_at'], unique=False)
|
||||
op.create_table('tickets',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('ticket_number', sa.VARCHAR(length=20), autoincrement=False, nullable=False),
|
||||
sa.Column('subject', sa.VARCHAR(length=255), autoincrement=False, nullable=False),
|
||||
sa.Column('description', sa.TEXT(), autoincrement=False, nullable=False),
|
||||
sa.Column('category_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('priority', postgresql.ENUM('LOW', 'MEDIUM', 'HIGH', 'URGENT', name='ticket_priority_enum'), server_default=sa.text("'MEDIUM'::ticket_priority_enum"), autoincrement=False, nullable=True),
|
||||
sa.Column('affected_system_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('created_by', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('assigned_to', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('status', postgresql.ENUM('NEW', 'TRIAGE', 'IN_PROGRESS', 'WAITING_CUSTOMER', 'RESOLVED', 'CLOSED', 'REOPENED', name='ticket_status_enum'), server_default=sa.text("'NEW'::ticket_status_enum"), autoincrement=False, nullable=True),
|
||||
sa.Column('sla_response_due', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('sla_resolution_due', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('first_response_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('resolved_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('rating', sa.INTEGER(), autoincrement=False, nullable=True),
|
||||
sa.Column('rating_comment', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('rated_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.CheckConstraint('rating >= 1 AND rating <= 5', name='tickets_rating_check'),
|
||||
sa.ForeignKeyConstraint(['affected_system_id'], ['affected_systems.id'], name='tickets_affected_system_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['assigned_to'], ['users.id'], name='tickets_assigned_to_fkey'),
|
||||
sa.ForeignKeyConstraint(['category_id'], ['ticket_categories.id'], name='tickets_category_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['created_by'], ['users.id'], name='tickets_created_by_fkey'),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='tickets_tenant_id_fkey', ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id', name='tickets_pkey'),
|
||||
sa.UniqueConstraint('tenant_id', 'ticket_number', name='tickets_tenant_id_ticket_number_key'),
|
||||
comment='Tickets de soporte - core del negocio'
|
||||
)
|
||||
op.create_index('idx_tickets_tenant_id', 'tickets', ['tenant_id'], unique=False)
|
||||
op.create_index('idx_tickets_status', 'tickets', ['status'], unique=False)
|
||||
op.create_index('idx_tickets_sla_response', 'tickets', ['sla_response_due'], unique=False)
|
||||
op.create_index('idx_tickets_sla_resolution', 'tickets', ['sla_resolution_due'], unique=False)
|
||||
op.create_index('idx_tickets_priority', 'tickets', ['priority'], unique=False)
|
||||
op.create_index('idx_tickets_number', 'tickets', ['ticket_number'], unique=False)
|
||||
op.create_index('idx_tickets_created_by', 'tickets', ['created_by'], unique=False)
|
||||
op.create_index('idx_tickets_created_at', 'tickets', ['created_at'], unique=False)
|
||||
op.create_index('idx_tickets_category', 'tickets', ['category_id'], unique=False)
|
||||
op.create_index('idx_tickets_assigned_to', 'tickets', ['assigned_to'], unique=False)
|
||||
op.create_table('audit_logs',
|
||||
sa.Column('id', sa.UUID(), server_default=sa.text('gen_random_uuid()'), autoincrement=False, nullable=False),
|
||||
sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
|
||||
sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('action', sa.VARCHAR(length=100), autoincrement=False, nullable=False),
|
||||
sa.Column('resource_type', sa.VARCHAR(length=50), autoincrement=False, nullable=False),
|
||||
sa.Column('resource_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('ip_address', postgresql.INET(), autoincrement=False, nullable=True),
|
||||
sa.Column('user_agent', sa.TEXT(), autoincrement=False, nullable=True),
|
||||
sa.Column('correlation_id', sa.UUID(), autoincrement=False, nullable=True),
|
||||
sa.Column('old_values', postgresql.JSONB(astext_type=sa.Text()), autoincrement=False, nullable=True),
|
||||
sa.Column('new_values', postgresql.JSONB(astext_type=sa.Text()), autoincrement=False, nullable=True),
|
||||
sa.Column('metadata', postgresql.JSONB(astext_type=sa.Text()), autoincrement=False, nullable=True),
|
||||
sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True),
|
||||
sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], name='audit_logs_tenant_id_fkey'),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='audit_logs_user_id_fkey'),
|
||||
sa.PrimaryKeyConstraint('id', name='audit_logs_pkey'),
|
||||
comment='Bitácora de acciones para auditoría y compliance'
|
||||
)
|
||||
op.create_index('idx_audit_logs_user_id', 'audit_logs', ['user_id'], unique=False)
|
||||
op.create_index('idx_audit_logs_tenant_id', 'audit_logs', ['tenant_id'], unique=False)
|
||||
op.create_index('idx_audit_logs_resource', 'audit_logs', ['resource_type', 'resource_id'], unique=False)
|
||||
op.create_index('idx_audit_logs_created_at', 'audit_logs', ['created_at'], unique=False)
|
||||
op.create_index('idx_audit_logs_correlation_id', 'audit_logs', ['correlation_id'], unique=False)
|
||||
op.create_index('idx_audit_logs_action', 'audit_logs', ['action'], unique=False)
|
||||
# ### end Alembic commands ###
|
||||
@@ -1,24 +0,0 @@
|
||||
"""Test migration setup
|
||||
|
||||
Revision ID: 48c43e9204c3
|
||||
Revises: 35742cfbb850
|
||||
Create Date: 2026-02-05 19:39:07.431453
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '48c43e9204c3'
|
||||
down_revision = '35742cfbb850'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
pass
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
pass
|
||||
@@ -1,81 +0,0 @@
|
||||
"""add_audit_logs_table
|
||||
|
||||
Revision ID: a1b2c3d4e5f6
|
||||
Revises: 13362e8c493a
|
||||
Create Date: 2026-02-12 10:00:00.000000
|
||||
|
||||
Registra el modelo AuditLog en Alembic.
|
||||
La tabla audit_logs ya existe en schema.sql, esta migraci├│n solo
|
||||
la registra en el control de versiones de Alembic.
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = 'a1b2c3d4e5f6'
|
||||
down_revision = '13362e8c493a'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
"""
|
||||
Verificar que audit_logs existe y registrarla en Alembic.
|
||||
|
||||
La tabla fue creada por schema.sql, esta migraci├│n solo verifica
|
||||
que exista y está disponible para usar.
|
||||
"""
|
||||
from sqlalchemy import inspect
|
||||
|
||||
bind = op.get_bind()
|
||||
inspector = inspect(bind)
|
||||
tables = inspector.get_table_names()
|
||||
|
||||
if 'audit_logs' in tables:
|
||||
print(" Tabla audit_logs encontrada (creada por schema.sql)")
|
||||
print(" Modelo AuditLog registrado en Alembic")
|
||||
|
||||
# Verificar que tenga los índices necesarios
|
||||
existing_indexes = [idx['name'] for idx in inspector.get_indexes('audit_logs')]
|
||||
missing_indexes = []
|
||||
|
||||
required_indexes = [
|
||||
'idx_audit_logs_tenant_id',
|
||||
'idx_audit_logs_user_id',
|
||||
'idx_audit_logs_action',
|
||||
'idx_audit_logs_correlation_id',
|
||||
'idx_audit_logs_created_at'
|
||||
]
|
||||
|
||||
for idx in required_indexes:
|
||||
if idx not in existing_indexes:
|
||||
missing_indexes.append(idx)
|
||||
|
||||
if missing_indexes:
|
||||
print(f"ÔÜá´©Å ├ìndices faltantes: {', '.join(missing_indexes)}")
|
||||
print(" (Esto es normal si usaste schema.sql completo)")
|
||||
else:
|
||||
print("Ô£à Todos los ├¡ndices necesarios est├ín presentes")
|
||||
|
||||
else:
|
||||
print("ÔÜá´©Å La tabla audit_logs NO existe")
|
||||
print(" Ejecuta: docker-compose exec -T postgres psql -U postgres -d servicemanager < db/schema.sql")
|
||||
print(" O crea la tabla manualmente desde schema.sql")
|
||||
|
||||
# No crear la tabla aquí - debe venir de schema.sql para mantener consistencia
|
||||
raise Exception(
|
||||
"La tabla audit_logs no existe. "
|
||||
"Por favor ejecuta el schema.sql completo primero."
|
||||
)
|
||||
|
||||
|
||||
def downgrade():
|
||||
"""
|
||||
No eliminar la tabla - fue creada por schema.sql.
|
||||
|
||||
Solo des-registrar de Alembic.
|
||||
"""
|
||||
print("Ôä╣´©Å Tabla audit_logs NO ser├í eliminada (creada por schema.sql)")
|
||||
print(" Modelo AuditLog des-registrado de Alembic")
|
||||
|
||||
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "servicemanager-backend"
|
||||
version = "1.6.0"
|
||||
version = "0.1.0"
|
||||
description = "ServiceManagerWeb Backend - Mesa de Ayuda B2B"
|
||||
authors = [
|
||||
{name = "Aduanasoft", email = "dev@aduanasoft.com"}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
[tool:pytest]
|
||||
testpaths = tests
|
||||
python_files = test_*.py
|
||||
python_functions = test_*
|
||||
python_classes = Test*
|
||||
asyncio_mode = auto
|
||||
addopts =
|
||||
-v
|
||||
--tb=short
|
||||
--strict-markers
|
||||
--disable-warnings
|
||||
--color=yes
|
||||
--durations=10
|
||||
markers =
|
||||
slow: marks tests as slow (deselect with '-m "not slow"')
|
||||
integration: marks tests as integration tests
|
||||
unit: marks tests as unit tests
|
||||
auth: marks tests related to authentication
|
||||
db: marks tests that require database
|
||||
filterwarnings =
|
||||
ignore::DeprecationWarning
|
||||
ignore::PendingDeprecationWarning
|
||||
@@ -15,7 +15,6 @@ pydantic-settings==2.1.0
|
||||
sqlalchemy==2.0.23
|
||||
alembic==1.13.0
|
||||
asyncpg==0.29.0 # PostgreSQL async driver
|
||||
psycopg2-binary==2.9.9 # PostgreSQL sync driver (for migrations)
|
||||
|
||||
# ===================================
|
||||
# AUTHENTICATION & SECURITY
|
||||
@@ -42,7 +41,7 @@ jinja2==3.1.2 # Email templates
|
||||
# FILE HANDLING
|
||||
# ===================================
|
||||
python-magic==0.4.27 # MIME type detection
|
||||
pillow==10.1.0 # Image processing
|
||||
# pillow==10.1.0 # Image processing
|
||||
|
||||
# ===================================
|
||||
# HTTP & REQUESTS
|
||||
@@ -69,7 +68,6 @@ prometheus-client==0.19.0
|
||||
pytest==7.4.3
|
||||
pytest-asyncio==0.21.1
|
||||
pytest-cov==4.1.0
|
||||
aiosqlite==0.19.0
|
||||
httpx==0.25.2 # For testing
|
||||
faker==20.1.0 # Test data generation
|
||||
|
||||
|
||||
18
backend/test_db_connection.py
Normal file
18
backend/test_db_connection.py
Normal file
@@ -0,0 +1,18 @@
|
||||
import os
|
||||
import asyncio
|
||||
import asyncpg
|
||||
|
||||
def get_database_url():
|
||||
# Replace 'postgresql+asyncpg' with 'postgresql' for asyncpg compatibility
|
||||
return os.getenv("DATABASE_URL", "postgresql://servicemanager:servicemanager123@servicemanager-db:5432/servicemanager").replace("postgresql+asyncpg", "postgresql")
|
||||
|
||||
async def test_connection():
|
||||
try:
|
||||
conn = await asyncpg.connect(get_database_url())
|
||||
print("Connection to the database was successful!")
|
||||
await conn.close()
|
||||
except Exception as e:
|
||||
print(f"Failed to connect to the database: {e}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(test_connection())
|
||||
@@ -1,28 +0,0 @@
|
||||
"""
|
||||
Test Configuration - ServiceManagerWeb
|
||||
|
||||
Configuración básica para testing con pytest
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_user_data():
|
||||
"""Sample user data for testing."""
|
||||
return {
|
||||
"email": "test@example.com",
|
||||
"first_name": "Test",
|
||||
"last_name": "User",
|
||||
"password": "TestPassword123!"
|
||||
}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_tenant_data():
|
||||
"""Sample tenant data for testing."""
|
||||
return {
|
||||
"name": "Test Tenant",
|
||||
"slug": "test-tenant",
|
||||
"description": "Test tenant for testing"
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
# Test Environment Variables
|
||||
ENVIRONMENT=test
|
||||
DEBUG=true
|
||||
SECRET_KEY=test-secret-key-for-testing-123456789
|
||||
JWT_SECRET_KEY=test-jwt-secret-key-for-testing-987654321
|
||||
DATABASE_URL=postgresql+asyncpg://servicemanager:servicemanager123@postgres:5432/servicemanager
|
||||
REDIS_URL=redis://redis:6379/0
|
||||
@@ -1,58 +0,0 @@
|
||||
"""
|
||||
Very basic tests - ServiceManagerWeb
|
||||
|
||||
Tests simplísimos para verificar que pytest funciona
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
def test_basic_math():
|
||||
"""Test basic functionality."""
|
||||
assert 1 + 1 == 2
|
||||
assert 2 * 3 == 6
|
||||
assert 10 // 3 == 3
|
||||
|
||||
|
||||
def test_string_operations():
|
||||
"""Test string operations."""
|
||||
text = "ServiceManager"
|
||||
assert text.lower() == "servicemanager"
|
||||
assert len(text) == 14
|
||||
assert "Manager" in text
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_async_operation():
|
||||
"""Test async functionality works."""
|
||||
import asyncio
|
||||
await asyncio.sleep(0.001) # Very short sleep
|
||||
assert True
|
||||
|
||||
|
||||
def test_list_operations():
|
||||
"""Test list operations."""
|
||||
items = ["tickets", "users", "tenants"]
|
||||
assert len(items) == 3
|
||||
assert "tickets" in items
|
||||
assert items[0] == "tickets"
|
||||
|
||||
|
||||
def test_dict_operations():
|
||||
"""Test dictionary operations."""
|
||||
data = {
|
||||
"name": "Test User",
|
||||
"email": "test@example.com",
|
||||
"active": True
|
||||
}
|
||||
assert data["name"] == "Test User"
|
||||
assert data.get("email") is not None
|
||||
assert data["active"] is True
|
||||
|
||||
|
||||
# Mark for later when configuration is fixed
|
||||
@pytest.mark.skip(reason="Configuration issue with ALLOWED_FILE_EXTENSIONS")
|
||||
def test_security_imports():
|
||||
"""Test security imports - skip for now due to config issue."""
|
||||
from app.core.security import security
|
||||
assert security is not None
|
||||
71
backend/tests/test_clients.py
Normal file
71
backend/tests/test_clients.py
Normal file
@@ -0,0 +1,71 @@
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from app.main import app
|
||||
|
||||
client = TestClient(app)
|
||||
|
||||
@pytest.fixture
|
||||
def sample_client_data():
|
||||
return {
|
||||
"clave": "12345",
|
||||
"tipo_cliente": "Regular",
|
||||
"nombre": "Cliente Prueba",
|
||||
"pais": "México",
|
||||
"estado": "Chihuahua",
|
||||
"ciudad": "Cd. Juárez",
|
||||
"direccion": "Calle Falsa 123",
|
||||
"numero_ext": "12",
|
||||
"cp": "32000",
|
||||
"colonia": "Centro",
|
||||
"lada": "656",
|
||||
"telefono1": "1234567890",
|
||||
"telefono2": "0987654321",
|
||||
"tel_directo": "1231231234",
|
||||
"ext": "101",
|
||||
"fax": "1231231235",
|
||||
"horario": "9:00 - 18:00",
|
||||
"pagina": "www.clienteprueba.com",
|
||||
"correo": "cliente@prueba.com",
|
||||
"medio_publicidad": "Internet",
|
||||
"nacionalidad": "Mexicana",
|
||||
"logo": "logo.png"
|
||||
}
|
||||
|
||||
def test_create_client(sample_client_data):
|
||||
response = client.post("/api/v1/clients", json=sample_client_data)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["clave"] == sample_client_data["clave"]
|
||||
|
||||
def test_read_client(sample_client_data):
|
||||
# Create a client first
|
||||
create_response = client.post("/api/v1/clients", json=sample_client_data)
|
||||
client_id = create_response.json()["id"]
|
||||
|
||||
# Read the client
|
||||
response = client.get(f"/api/v1/clients/{client_id}")
|
||||
assert response.status_code == 200
|
||||
assert response.json()["id"] == client_id
|
||||
|
||||
def test_update_client(sample_client_data):
|
||||
# Create a client first
|
||||
create_response = client.post("/api/v1/clients", json=sample_client_data)
|
||||
client_id = create_response.json()["id"]
|
||||
|
||||
# Update the client
|
||||
updated_data = {"nombre": "Cliente Actualizado"}
|
||||
response = client.put(f"/api/v1/clients/{client_id}", json=updated_data)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["nombre"] == "Cliente Actualizado"
|
||||
|
||||
def test_delete_client(sample_client_data):
|
||||
# Create a client first
|
||||
create_response = client.post("/api/v1/clients", json=sample_client_data)
|
||||
client_id = create_response.json()["id"]
|
||||
|
||||
# Delete the client
|
||||
response = client.delete(f"/api/v1/clients/{client_id}")
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify deletion
|
||||
response = client.get(f"/api/v1/clients/{client_id}")
|
||||
assert response.status_code == 404
|
||||
@@ -1,50 +0,0 @@
|
||||
"""
|
||||
Tests for Health Check endpoints - ServiceManagerWeb
|
||||
|
||||
Tests básicos para verificar que la configuración de testing funciona
|
||||
"""
|
||||
|
||||
import pytest
|
||||
import asyncio
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_health_check_async():
|
||||
"""Test that async operations work in testing."""
|
||||
# Simple async test to verify setup
|
||||
await asyncio.sleep(0.01)
|
||||
assert True
|
||||
|
||||
|
||||
def test_basic_math():
|
||||
"""Test basic functionality."""
|
||||
assert 1 + 1 == 2
|
||||
|
||||
|
||||
# Test básico de importación de módulos principales
|
||||
def test_imports():
|
||||
"""Test that core modules can be imported without errors."""
|
||||
try:
|
||||
from app.core.config import get_settings
|
||||
from app.core.security import security
|
||||
|
||||
# Test que las funciones básicas existen
|
||||
assert get_settings is not None
|
||||
assert security is not None
|
||||
assert hasattr(security, 'hash_password')
|
||||
assert hasattr(security, 'verify_password')
|
||||
|
||||
except ImportError as e:
|
||||
pytest.fail(f"Failed to import core modules: {e}")
|
||||
|
||||
|
||||
def test_security_functions():
|
||||
"""Test basic security functions."""
|
||||
from app.core.security import security
|
||||
|
||||
password = "TestPassword123!"
|
||||
hashed = security.hash_password(password)
|
||||
|
||||
assert hashed != password # Should be hashed
|
||||
assert security.verify_password(password, hashed) # Should verify
|
||||
assert not security.verify_password("wrong", hashed) # Should not verify wrong password
|
||||
27
backend/tests/test_security.py
Normal file
27
backend/tests/test_security.py
Normal file
@@ -0,0 +1,27 @@
|
||||
import pytest
|
||||
from app.core.security import SecurityUtils
|
||||
from datetime import timedelta
|
||||
|
||||
# Test password hashing and verification
|
||||
def test_password_hashing():
|
||||
plain_password = "securepassword123"
|
||||
hashed_password = SecurityUtils.hash_password(plain_password)
|
||||
|
||||
assert SecurityUtils.verify_password(plain_password, hashed_password) == True
|
||||
assert SecurityUtils.verify_password("wrongpassword", hashed_password) == False
|
||||
|
||||
# Test JWT token generation and validation
|
||||
def test_jwt_token_generation():
|
||||
payload = {"sub": "12345", "email": "test@example.com"}
|
||||
token = SecurityUtils.create_access_token(payload, expires_delta=timedelta(minutes=15))
|
||||
|
||||
decoded_payload = SecurityUtils.verify_token(token)
|
||||
assert decoded_payload is not None
|
||||
assert decoded_payload["sub"] == "12345"
|
||||
assert decoded_payload["email"] == "test@example.com"
|
||||
|
||||
# Test TOTP secret generation
|
||||
def test_totp_secret_generation():
|
||||
secret = SecurityUtils.generate_totp_secret()
|
||||
assert len(secret) > 0
|
||||
assert isinstance(secret, str)
|
||||
@@ -38,6 +38,74 @@ CREATE INDEX idx_tenants_slug ON tenants(slug);
|
||||
CREATE INDEX idx_tenants_status ON tenants(status);
|
||||
CREATE INDEX idx_tenants_domain ON tenants(domain);
|
||||
|
||||
-- ===================================
|
||||
-- DOMINIO: CLIENTS (Cartera de Clientes)
|
||||
-- ===================================
|
||||
|
||||
-- Enum para los radio buttons de estatus
|
||||
CREATE TYPE client_status_enum AS ENUM (
|
||||
'prospect',
|
||||
'active',
|
||||
'suspended',
|
||||
'cancelled'
|
||||
);
|
||||
|
||||
CREATE TABLE clients (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
tenant_id UUID NOT NULL REFERENCES tenants(id) ON DELETE CASCADE,
|
||||
|
||||
-- Identificación (Sección General)
|
||||
code VARCHAR(50), -- Clave del cliente
|
||||
name VARCHAR(200) NOT NULL, -- Nombre / Razón Social
|
||||
tax_id VARCHAR(20), -- RFC
|
||||
client_type VARCHAR(50), -- Tipo de Cliente
|
||||
account_manager VARCHAR(100), -- Encargado Cliente (Texto simple por ahora)
|
||||
|
||||
-- Dirección (Desglosada)
|
||||
address_street TEXT, -- Dirección / Calle
|
||||
address_ext_num VARCHAR(20), -- Núm. Ext
|
||||
neighborhood VARCHAR(100), -- Colonia
|
||||
zip_code VARCHAR(10), -- CP
|
||||
city VARCHAR(100), -- Ciudad
|
||||
state VARCHAR(100), -- Estado
|
||||
country VARCHAR(100) DEFAULT 'Mexico',
|
||||
|
||||
-- Contacto
|
||||
phone_primary VARCHAR(20), -- Teléfono 1
|
||||
phone_secondary VARCHAR(20),-- Teléfono 2
|
||||
fax VARCHAR(20),
|
||||
email VARCHAR(320), -- Correo
|
||||
website VARCHAR(255), -- Página Web
|
||||
|
||||
-- Configuración y Flexibilidad
|
||||
status client_status_enum DEFAULT 'prospect',
|
||||
logo_url VARCHAR(500), -- Ruta al archivo PDF/Imagen del logo
|
||||
|
||||
-- Campo JSONB para lo que sobre (Horario, Nacionalidad, Medio Publicidad, Lada, etc.)
|
||||
properties JSONB DEFAULT '{}'::jsonb,
|
||||
|
||||
-- Auditoría estándar
|
||||
is_active BOOLEAN DEFAULT TRUE,
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
|
||||
-- Restricciones: No repetir RFC ni Clave dentro del mismo Tenant
|
||||
UNIQUE(tenant_id, code),
|
||||
UNIQUE(tenant_id, tax_id)
|
||||
);
|
||||
|
||||
-- Índices para búsqueda rápida
|
||||
CREATE INDEX idx_clients_tenant_id ON clients(tenant_id);
|
||||
CREATE INDEX idx_clients_tax_id ON clients(tax_id);
|
||||
CREATE INDEX idx_clients_name ON clients(name);
|
||||
CREATE INDEX idx_clients_properties ON clients USING gin (properties);
|
||||
|
||||
-- Trigger para mantener actualizado el campo updated_at
|
||||
-- (Usa la función que ya definiste al final de tu script)
|
||||
CREATE TRIGGER update_clients_updated_at BEFORE UPDATE ON clients
|
||||
FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
|
||||
|
||||
|
||||
-- ===================================
|
||||
-- DOMINIO: AUTH (Autenticación)
|
||||
-- ===================================
|
||||
@@ -369,14 +437,10 @@ CREATE TABLE audit_logs (
|
||||
CREATE INDEX idx_audit_logs_tenant_id ON audit_logs(tenant_id);
|
||||
CREATE INDEX idx_audit_logs_user_id ON audit_logs(user_id);
|
||||
CREATE INDEX idx_audit_logs_action ON audit_logs(action);
|
||||
CREATE INDEX idx_audit_logs_resource ON audit_logs(resource_type, resource_id);
|
||||
CREATE INDEX idx_audit_logs_correlation_id ON audit_logs(correlation_id);
|
||||
CREATE INDEX idx_audit_logs_created_at ON audit_logs(created_at);
|
||||
|
||||
-- Índices compuestos para queries comunes de auditoría
|
||||
CREATE INDEX idx_audit_logs_tenant_action ON audit_logs(tenant_id, action);
|
||||
CREATE INDEX idx_audit_logs_resource ON audit_logs(resource_type, resource_id);
|
||||
CREATE INDEX idx_audit_logs_user_created ON audit_logs(user_id, created_at);
|
||||
|
||||
-- ===================================
|
||||
-- FUNCIONES Y TRIGGERS
|
||||
-- ===================================
|
||||
|
||||
@@ -55,6 +55,7 @@ services:
|
||||
dockerfile: ../docker/Dockerfile.backend
|
||||
container_name: servicemanager-backend
|
||||
restart: unless-stopped
|
||||
command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
@@ -70,8 +71,10 @@ services:
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL}
|
||||
- PYTHONPATH=/app
|
||||
volumes:
|
||||
- ./backend:/app
|
||||
- ./tests:/app/tests
|
||||
- uploads_data:/app/uploads
|
||||
- logs_data:/app/logs
|
||||
ports:
|
||||
@@ -161,7 +164,7 @@ services:
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${ENVIRONMENT:-development}
|
||||
- PUBLIC_API_URL=${API_BASE_URL:-http://localhost:8000}
|
||||
- PUBLIC_API_URL=http://backend:8000
|
||||
- PUBLIC_APP_NAME=ServiceManager Cliente
|
||||
volumes:
|
||||
- ./frontend-client:/app
|
||||
@@ -186,7 +189,7 @@ services:
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${ENVIRONMENT:-development}
|
||||
- PUBLIC_API_URL=${API_BASE_URL:-http://localhost:8000}
|
||||
- PUBLIC_API_URL=http://backend:8000
|
||||
- PUBLIC_APP_NAME=ServiceManager Admin
|
||||
volumes:
|
||||
- ./frontend-internal:/app
|
||||
|
||||
3946
frontend-client/package-lock.json
generated
3946
frontend-client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@servicemanager/client-frontend",
|
||||
"version": "1.6.0",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,25 +1,24 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
import { auth } from '$lib/stores/auth.js';
|
||||
import Icon from './Icon.svelte';
|
||||
|
||||
|
||||
export let showLogo = true;
|
||||
export let showNavigation = true;
|
||||
|
||||
|
||||
let isMenuOpen = false;
|
||||
|
||||
|
||||
onMount(() => {
|
||||
auth.init();
|
||||
});
|
||||
|
||||
|
||||
function toggleMenu() {
|
||||
isMenuOpen = !isMenuOpen;
|
||||
}
|
||||
|
||||
|
||||
function handleLogout() {
|
||||
auth.logout();
|
||||
isMenuOpen = false;
|
||||
auth.logout(); // El store maneja la redirección automática
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -44,16 +43,10 @@
|
||||
<!-- Navigation -->
|
||||
{#if showNavigation && $auth.isAuthenticated}
|
||||
<nav class="hidden md:flex space-x-8">
|
||||
<a
|
||||
href="/tickets"
|
||||
class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium"
|
||||
>
|
||||
<a href="/tickets" class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium">
|
||||
Mis Tickets
|
||||
</a>
|
||||
<a
|
||||
href="/tickets/new"
|
||||
class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium"
|
||||
>
|
||||
<a href="/tickets/new" class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium">
|
||||
Crear Ticket
|
||||
</a>
|
||||
</nav>
|
||||
@@ -66,8 +59,6 @@
|
||||
<button
|
||||
on:click={toggleMenu}
|
||||
class="flex items-center space-x-2 text-gray-700 hover:text-primary-600 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 rounded-md p-2"
|
||||
tabindex="0"
|
||||
on:keydown={e => e.key === 'Enter' && toggleMenu()}
|
||||
>
|
||||
<div class="w-8 h-8 bg-primary-100 rounded-full flex items-center justify-center">
|
||||
<span class="text-primary-600 text-sm font-medium">
|
||||
@@ -75,16 +66,13 @@
|
||||
</span>
|
||||
</div>
|
||||
<span class="hidden sm:block text-sm">
|
||||
{$auth.user?.first_name}
|
||||
{$auth.user?.last_name}
|
||||
{$auth.user?.first_name} {$auth.user?.last_name}
|
||||
</span>
|
||||
<Icon name="chevronDown" size="w-4 h-4" />
|
||||
</button>
|
||||
|
||||
{#if isMenuOpen}
|
||||
<div
|
||||
class="absolute right-0 mt-2 w-48 bg-white rounded-md shadow-lg border border-gray-200 z-50"
|
||||
>
|
||||
<div class="absolute right-0 mt-2 w-48 bg-white rounded-md shadow-lg border border-gray-200 z-50">
|
||||
<div class="py-1">
|
||||
<div class="px-4 py-2 text-xs text-gray-500 border-b border-gray-200">
|
||||
{$auth.user?.email}
|
||||
@@ -92,16 +80,13 @@
|
||||
<a
|
||||
href="/profile"
|
||||
class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
||||
on:click={() => (isMenuOpen = false)}
|
||||
on:click={() => isMenuOpen = false}
|
||||
>
|
||||
Mi Perfil
|
||||
</a>
|
||||
<button
|
||||
on:click={handleLogout}
|
||||
class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
on:keydown={e => e.key === 'Enter' && handleLogout()}
|
||||
>
|
||||
Cerrar Sesión
|
||||
</button>
|
||||
@@ -110,7 +95,10 @@
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<a href="/login" class="text-gray-700 hover:text-primary-600 text-sm font-medium">
|
||||
<a
|
||||
href="/login"
|
||||
class="text-gray-700 hover:text-primary-600 text-sm font-medium"
|
||||
>
|
||||
Iniciar Sesión
|
||||
</a>
|
||||
{/if}
|
||||
@@ -121,16 +109,10 @@
|
||||
{#if showNavigation && $auth.isAuthenticated}
|
||||
<div class="md:hidden border-t border-gray-200 py-2">
|
||||
<nav class="flex space-x-4">
|
||||
<a
|
||||
href="/tickets"
|
||||
class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium"
|
||||
>
|
||||
<a href="/tickets" class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium">
|
||||
Mis Tickets
|
||||
</a>
|
||||
<a
|
||||
href="/tickets/new"
|
||||
class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium"
|
||||
>
|
||||
<a href="/tickets/new" class="text-gray-700 hover:text-primary-600 px-3 py-2 text-sm font-medium">
|
||||
Crear Ticket
|
||||
</a>
|
||||
</nav>
|
||||
@@ -141,5 +123,8 @@
|
||||
|
||||
<!-- Backdrop for mobile menu -->
|
||||
{#if isMenuOpen}
|
||||
<div class="fixed inset-0 z-40 md:hidden" on:click={() => (isMenuOpen = false)} />
|
||||
{/if}
|
||||
<div
|
||||
class="fixed inset-0 z-40 md:hidden"
|
||||
on:click={() => isMenuOpen = false}
|
||||
></div>
|
||||
{/if}
|
||||
@@ -29,12 +29,13 @@ const initialState: AppState = {
|
||||
// API helper function
|
||||
async function apiCall(endpoint: string, options: RequestInit = {}) {
|
||||
const authState = get(auth);
|
||||
|
||||
|
||||
const response = await fetch(`/api/v1${endpoint}`, {
|
||||
...options,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${authState.token}`,
|
||||
'X-Tenant-ID': authState.tenantId, // Added tenant header
|
||||
...options.headers
|
||||
}
|
||||
});
|
||||
@@ -60,8 +61,10 @@ function createAppStore() {
|
||||
|
||||
try {
|
||||
const categories = await apiCall('/categories/');
|
||||
console.log('Loaded categories:', categories); // Debugging
|
||||
update(state => ({ ...state, categories, isLoading: false }));
|
||||
} catch (error) {
|
||||
console.error('Error loading categories:', error); // Debugging
|
||||
update(state => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { Writable } from 'svelte/store';
|
||||
import { writable } from 'svelte/store';
|
||||
import type { Writable } from 'svelte/store';
|
||||
|
||||
// Types
|
||||
export interface User {
|
||||
@@ -49,13 +49,13 @@ function createAuthStore() {
|
||||
|
||||
return {
|
||||
subscribe,
|
||||
|
||||
|
||||
// Initialize auth from localStorage
|
||||
init: () => {
|
||||
if (typeof window !== 'undefined') {
|
||||
const token = localStorage.getItem('auth_token');
|
||||
const user = localStorage.getItem('auth_user');
|
||||
|
||||
|
||||
if (token && user) {
|
||||
try {
|
||||
const parsedUser = JSON.parse(user);
|
||||
@@ -77,7 +77,7 @@ function createAuthStore() {
|
||||
// Login
|
||||
login: async (credentials: LoginRequest): Promise<void> => {
|
||||
update(state => ({ ...state, isLoading: true }));
|
||||
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/v1/auth/login', {
|
||||
method: 'POST',
|
||||
@@ -93,7 +93,7 @@ function createAuthStore() {
|
||||
}
|
||||
|
||||
const data: LoginResponse = await response.json();
|
||||
|
||||
|
||||
// Store auth data
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.setItem('auth_token', data.access_token);
|
||||
@@ -107,6 +107,7 @@ function createAuthStore() {
|
||||
isLoading: false
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Login error:', error); // Debugging the error
|
||||
update(state => ({ ...state, isLoading: false }));
|
||||
throw error;
|
||||
}
|
||||
@@ -117,8 +118,6 @@ function createAuthStore() {
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.removeItem('auth_token');
|
||||
localStorage.removeItem('auth_user');
|
||||
// Immediate redirect after cleanup
|
||||
window.location.href = '/login';
|
||||
}
|
||||
set(initialState);
|
||||
},
|
||||
|
||||
44
frontend-client/src/lib/stores/clientes.ts
Normal file
44
frontend-client/src/lib/stores/clientes.ts
Normal file
@@ -0,0 +1,44 @@
|
||||
import { writable } from 'svelte/store';
|
||||
|
||||
export const clients = writable([]);
|
||||
|
||||
export async function fetchClients() {
|
||||
const response = await fetch('/api/v1/clients');
|
||||
const data = await response.json();
|
||||
clients.set(data);
|
||||
}
|
||||
|
||||
export async function createClient(client) {
|
||||
const response = await fetch('/api/v1/clients', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(client),
|
||||
});
|
||||
if (response.ok) {
|
||||
fetchClients();
|
||||
}
|
||||
}
|
||||
|
||||
export async function updateClient(clientId, client) {
|
||||
const response = await fetch(`/api/v1/clients/${clientId}`, {
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(client),
|
||||
});
|
||||
if (response.ok) {
|
||||
fetchClients();
|
||||
}
|
||||
}
|
||||
|
||||
export async function deleteClient(clientId) {
|
||||
const response = await fetch(`/api/v1/clients/${clientId}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (response.ok) {
|
||||
fetchClients();
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,9 @@
|
||||
import { writable } from 'svelte/store';
|
||||
import { auth } from './auth.js';
|
||||
import { get } from 'svelte/store';
|
||||
import type { Writable } from 'svelte/store';
|
||||
import { get, writable } from 'svelte/store';
|
||||
import { auth } from './auth';
|
||||
|
||||
// Types
|
||||
interface FastAPIValidationError {
|
||||
loc: (string | number)[];
|
||||
msg: string;
|
||||
type: string;
|
||||
}
|
||||
|
||||
export interface Ticket {
|
||||
id: string;
|
||||
title: string;
|
||||
@@ -29,13 +24,12 @@ export interface Ticket {
|
||||
export interface TicketComment {
|
||||
id: string;
|
||||
ticket_id: string;
|
||||
author_id: string;
|
||||
author_name: string;
|
||||
author_role: string;
|
||||
user_id: string;
|
||||
user_name: string;
|
||||
user_role: string;
|
||||
content: string;
|
||||
is_internal: boolean;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
|
||||
export interface TicketAttachment {
|
||||
@@ -79,45 +73,19 @@ const initialState: TicketsState = {
|
||||
// API helper function
|
||||
async function apiCall(endpoint: string, options: RequestInit = {}) {
|
||||
const authState = get(auth);
|
||||
|
||||
if (!authState.token || !authState.user) {
|
||||
throw new Error('Not authenticated');
|
||||
}
|
||||
|
||||
|
||||
const response = await fetch(`/api/v1${endpoint}`, {
|
||||
...options,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${authState.token}`,
|
||||
'X-Tenant-ID': authState.user.tenant_id,
|
||||
...options.headers
|
||||
}
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
let errorMessage = 'Request failed';
|
||||
try {
|
||||
const error = await response.json();
|
||||
console.error('❌ API Error Response:', error);
|
||||
|
||||
// Manejar diferentes formatos de error de FastAPI
|
||||
if (error.detail) {
|
||||
if (Array.isArray(error.detail)) {
|
||||
// Errores de validación de FastAPI
|
||||
errorMessage = error.detail.map((e: FastAPIValidationError) => `${e.loc.join('.')}: ${e.msg}`).join(', ');
|
||||
} else if (typeof error.detail === 'string') {
|
||||
errorMessage = error.detail;
|
||||
} else {
|
||||
errorMessage = JSON.stringify(error.detail);
|
||||
}
|
||||
} else {
|
||||
errorMessage = JSON.stringify(error);
|
||||
}
|
||||
} catch (e) {
|
||||
errorMessage = `HTTP ${response.status}: ${response.statusText}`;
|
||||
}
|
||||
|
||||
throw new Error(errorMessage);
|
||||
const error = await response.json();
|
||||
throw new Error(error.detail || 'Request failed');
|
||||
}
|
||||
|
||||
return response.json();
|
||||
@@ -132,24 +100,24 @@ function createTicketsStore() {
|
||||
|
||||
// Load user's tickets
|
||||
loadTickets: async () => {
|
||||
update((state: TicketsState) => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
update(state => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
try {
|
||||
const tickets = await apiCall('/tickets/');
|
||||
update((state: TicketsState) => ({ ...state, tickets, isLoading: false }));
|
||||
update(state => ({ ...state, tickets, isLoading: false }));
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load tickets'
|
||||
update(state => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load tickets'
|
||||
}));
|
||||
}
|
||||
},
|
||||
|
||||
// Load specific ticket with details
|
||||
loadTicket: async (ticketId: string) => {
|
||||
update((state: TicketsState) => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
update(state => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
try {
|
||||
const [ticket, comments, attachments] = await Promise.all([
|
||||
apiCall(`/tickets/${ticketId}`),
|
||||
@@ -157,68 +125,44 @@ function createTicketsStore() {
|
||||
apiCall(`/tickets/${ticketId}/attachments`)
|
||||
]);
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
currentTicket: ticket,
|
||||
comments,
|
||||
attachments,
|
||||
isLoading: false
|
||||
update(state => ({
|
||||
...state,
|
||||
currentTicket: ticket,
|
||||
comments,
|
||||
attachments,
|
||||
isLoading: false
|
||||
}));
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load ticket'
|
||||
update(state => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load ticket'
|
||||
}));
|
||||
}
|
||||
},
|
||||
// Reload only comments silently (for polling)
|
||||
reloadComments: async (ticketId: string) => {
|
||||
try {
|
||||
const comments = await apiCall(`/tickets/${ticketId}/comments`);
|
||||
update((state: TicketsState) => ({ ...state, comments }));
|
||||
} catch (error) {
|
||||
// Silent fail - no mostrar error en polling
|
||||
console.error('Error reloading comments:', error);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
// Create new ticket
|
||||
createTicket: async (ticket: CreateTicketRequest) => {
|
||||
update((state: TicketsState) => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
update(state => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
try {
|
||||
// Mapear campos del frontend al formato del backend
|
||||
const ticketData = {
|
||||
subject: ticket.title, // ← Backend espera "subject" no "title"
|
||||
description: ticket.description,
|
||||
category_id: ticket.category_id,
|
||||
priority: ticket.priority,
|
||||
system_id: null // ← Opcional
|
||||
};
|
||||
|
||||
|
||||
console.log('Sending ticket data:', ticketData);
|
||||
|
||||
const newTicket = await apiCall('/tickets/', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(ticketData)
|
||||
body: JSON.stringify(ticket)
|
||||
});
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
tickets: [newTicket, ...state.tickets],
|
||||
isLoading: false
|
||||
update(state => ({
|
||||
...state,
|
||||
tickets: [newTicket, ...state.tickets],
|
||||
isLoading: false
|
||||
}));
|
||||
|
||||
return newTicket;
|
||||
} catch (error) {
|
||||
console.error('Create ticket error:', error);
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to create ticket'
|
||||
update(state => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to create ticket'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -232,16 +176,16 @@ function createTicketsStore() {
|
||||
body: JSON.stringify({ content })
|
||||
});
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
comments: [...state.comments, comment]
|
||||
update(state => ({
|
||||
...state,
|
||||
comments: [...state.comments, comment]
|
||||
}));
|
||||
|
||||
return comment;
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to add comment'
|
||||
update(state => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to add comment'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -254,16 +198,10 @@ function createTicketsStore() {
|
||||
formData.append('file', file);
|
||||
|
||||
const authState = get(auth);
|
||||
|
||||
if (!authState.token || !authState.user) {
|
||||
throw new Error('Not authenticated');
|
||||
}
|
||||
|
||||
const response = await fetch(`/api/v1/tickets/${ticketId}/attachments`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${authState.token}`,
|
||||
'X-Tenant-ID': authState.user.tenant_id
|
||||
'Authorization': `Bearer ${authState.token}`
|
||||
},
|
||||
body: formData
|
||||
});
|
||||
@@ -273,19 +211,18 @@ function createTicketsStore() {
|
||||
throw new Error(error.detail || 'Upload failed');
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
const attachment = result.data || result;
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
attachments: [...state.attachments, attachment]
|
||||
const attachment = await response.json();
|
||||
|
||||
update(state => ({
|
||||
...state,
|
||||
attachments: [...state.attachments, attachment]
|
||||
}));
|
||||
|
||||
return attachment;
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to upload attachment'
|
||||
update(state => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to upload attachment'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -299,17 +236,17 @@ function createTicketsStore() {
|
||||
body: JSON.stringify({ resolution })
|
||||
});
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
update(state => ({
|
||||
...state,
|
||||
currentTicket: state.currentTicket?.id === ticketId ? updatedTicket : state.currentTicket,
|
||||
tickets: state.tickets.map((t: Ticket) => t.id === ticketId ? updatedTicket : t)
|
||||
tickets: state.tickets.map(t => t.id === ticketId ? updatedTicket : t)
|
||||
}));
|
||||
|
||||
return updatedTicket;
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to close ticket'
|
||||
update(state => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to close ticket'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -317,50 +254,17 @@ function createTicketsStore() {
|
||||
|
||||
// Clear error
|
||||
clearError: () => {
|
||||
update((state: TicketsState) => ({ ...state, error: null }));
|
||||
update(state => ({ ...state, error: null }));
|
||||
},
|
||||
|
||||
// Clear current ticket
|
||||
clearCurrentTicket: () => {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
currentTicket: null,
|
||||
comments: [],
|
||||
attachments: []
|
||||
update(state => ({
|
||||
...state,
|
||||
currentTicket: null,
|
||||
comments: [],
|
||||
attachments: []
|
||||
}));
|
||||
},
|
||||
|
||||
// Download attachment
|
||||
downloadAttachment: async (ticketId: string, attachmentId: string, filename: string) => {
|
||||
const authState = get(auth);
|
||||
|
||||
if (!authState.token || !authState.user) {
|
||||
throw new Error('Not authenticated');
|
||||
}
|
||||
|
||||
const response = await fetch(`/api/v1/tickets/${ticketId}/attachments/${attachmentId}/download`, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${authState.token}`,
|
||||
'X-Tenant-ID': authState.user.tenant_id
|
||||
}
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const error = await response.json().catch(() => ({ detail: 'Download failed' }));
|
||||
throw new Error(error.detail || 'Download failed');
|
||||
}
|
||||
|
||||
// Crear blob y descargar
|
||||
const blob = await response.blob();
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = filename;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
document.body.removeChild(a);
|
||||
window.URL.revokeObjectURL(url);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,11 +23,6 @@
|
||||
<slot />
|
||||
</main>
|
||||
|
||||
<!-- Footer with version -->
|
||||
<footer class="py-4 text-center border-t border-gray-200 bg-white">
|
||||
<p class="text-xs text-gray-400">ServiceManagerWeb v1.6.0 · © 2026 Aduanasoft</p>
|
||||
</footer>
|
||||
|
||||
<!-- Toast notifications -->
|
||||
{#each $toast.toasts as toastMessage (toastMessage.id)}
|
||||
<Toast
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
import { tickets } from '$lib/stores/tickets.js';
|
||||
import { goto } from '$app/navigation';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
|
||||
|
||||
onMount(() => {
|
||||
// Redirect if not authenticated
|
||||
if (!$auth.isAuthenticated) {
|
||||
goto('/login');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Load user's tickets
|
||||
tickets.loadTickets();
|
||||
});
|
||||
@@ -26,108 +26,102 @@
|
||||
<div class="bg-gradient-to-r from-primary-500 to-primary-600 rounded-lg p-8 text-white mb-8">
|
||||
<div class="max-w-3xl">
|
||||
<h1 class="text-3xl font-bold mb-2">
|
||||
Bienvenido, {$auth.user?.first_name}
|
||||
{$auth.user?.last_name}
|
||||
Bienvenido, {$auth.user?.first_name} {$auth.user?.last_name}
|
||||
</h1>
|
||||
<p class="text-primary-100 text-lg">
|
||||
Gestiona tus tickets de soporte de manera eficiente. Crea nuevos tickets, da seguimiento a
|
||||
los existentes y mantente actualizado con el estado de tus solicitudes.
|
||||
Gestiona tus tickets de soporte de manera eficiente. Crea nuevos tickets,
|
||||
da seguimiento a los existentes y mantente actualizado con el estado de tus solicitudes.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Quick Actions -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
|
||||
<a href="/tickets/new" class="card hover:shadow-lg transition-shadow group cursor-pointer">
|
||||
<a
|
||||
href="/tickets/new"
|
||||
class="card hover:shadow-lg transition-shadow group cursor-pointer"
|
||||
>
|
||||
<div class="card-content text-center">
|
||||
<div
|
||||
class="w-12 h-12 bg-primary-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-primary-200 transition-colors"
|
||||
>
|
||||
<div class="w-12 h-12 bg-primary-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-primary-200 transition-colors">
|
||||
<Icon name="plus" size="w-6 h-6" className="text-primary-600" />
|
||||
</div>
|
||||
<h3 class="text-lg font-medium text-gray-900 mb-2">Crear Ticket</h3>
|
||||
<p class="text-gray-600 text-sm">Reporta un problema o solicita soporte técnico</p>
|
||||
<p class="text-gray-600 text-sm">
|
||||
Reporta un problema o solicita soporte técnico
|
||||
</p>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<a href="/tickets" class="card hover:shadow-lg transition-shadow group cursor-pointer">
|
||||
|
||||
<a
|
||||
href="/tickets"
|
||||
class="card hover:shadow-lg transition-shadow group cursor-pointer"
|
||||
>
|
||||
<div class="card-content text-center">
|
||||
<div
|
||||
class="w-12 h-12 bg-blue-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-blue-200 transition-colors"
|
||||
>
|
||||
<div class="w-12 h-12 bg-blue-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-blue-200 transition-colors">
|
||||
<Icon name="ticket" size="w-6 h-6" className="text-blue-600" />
|
||||
</div>
|
||||
<h3 class="text-lg font-medium text-gray-900 mb-2">Mis Tickets</h3>
|
||||
<p class="text-gray-600 text-sm">Consulta el estado de todos tus tickets</p>
|
||||
<p class="text-gray-600 text-sm">
|
||||
Consulta el estado de todos tus tickets
|
||||
</p>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<a href="/profile" class="card hover:shadow-lg transition-shadow group cursor-pointer">
|
||||
|
||||
<a
|
||||
href="/profile"
|
||||
class="card hover:shadow-lg transition-shadow group cursor-pointer"
|
||||
>
|
||||
<div class="card-content text-center">
|
||||
<div
|
||||
class="w-12 h-12 bg-green-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-green-200 transition-colors"
|
||||
>
|
||||
<div class="w-12 h-12 bg-green-100 rounded-lg flex items-center justify-center mx-auto mb-4 group-hover:bg-green-200 transition-colors">
|
||||
<Icon name="user" size="w-6 h-6" className="text-green-600" />
|
||||
</div>
|
||||
<h3 class="text-lg font-medium text-gray-900 mb-2">Mi Perfil</h3>
|
||||
<p class="text-gray-600 text-sm">Actualiza tu información personal</p>
|
||||
<p class="text-gray-600 text-sm">
|
||||
Actualiza tu información personal
|
||||
</p>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Recent Tickets -->
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h2 class="text-xl font-semibold text-gray-900">Tickets Recientes</h2>
|
||||
<p class="text-gray-600 mt-1">Últimos tickets que has creado o actualizado</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card-content">
|
||||
{#if $tickets.isLoading}
|
||||
<div class="text-center py-8">
|
||||
<div class="spinner w-8 h-8 mx-auto mb-4" />
|
||||
<div class="spinner w-8 h-8 mx-auto mb-4"></div>
|
||||
<p class="text-gray-600">Cargando tickets...</p>
|
||||
</div>
|
||||
{:else if $tickets.error}
|
||||
<div class="text-center py-8">
|
||||
<div
|
||||
class="w-12 h-12 bg-red-100 rounded-lg flex items-center justify-center mx-auto mb-4"
|
||||
>
|
||||
<div class="w-12 h-12 bg-red-100 rounded-lg flex items-center justify-center mx-auto mb-4">
|
||||
<svg class="w-6 h-6 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
</div>
|
||||
<p class="text-gray-600 mb-4">Error al cargar los tickets</p>
|
||||
<button on:click={() => tickets.loadTickets()} class="btn-primary px-4 py-2">
|
||||
<button
|
||||
on:click={() => tickets.loadTickets()}
|
||||
class="btn-primary px-4 py-2"
|
||||
>
|
||||
Reintentar
|
||||
</button>
|
||||
</div>
|
||||
{:else if $tickets.tickets.length === 0}
|
||||
<div class="text-center py-8">
|
||||
<div
|
||||
class="w-12 h-12 bg-gray-100 rounded-lg flex items-center justify-center mx-auto mb-4"
|
||||
>
|
||||
<svg
|
||||
class="w-6 h-6 text-gray-400"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M9 5H7a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"
|
||||
/>
|
||||
<div class="w-12 h-12 bg-gray-100 rounded-lg flex items-center justify-center mx-auto mb-4">
|
||||
<svg class="w-6 h-6 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
|
||||
</svg>
|
||||
</div>
|
||||
<p class="text-gray-600 mb-4">No tienes tickets creados</p>
|
||||
<a href="/tickets/new" class="btn-primary px-4 py-2"> Crear tu primer ticket </a>
|
||||
<a href="/tickets/new" class="btn-primary px-4 py-2">
|
||||
Crear tu primer ticket
|
||||
</a>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="space-y-4">
|
||||
@@ -150,23 +144,17 @@
|
||||
</div>
|
||||
<div class="ml-4">
|
||||
<span class="badge-{ticket.status.toLowerCase().replace('_', '-')}">
|
||||
{ticket.status === 'NEW'
|
||||
? 'Nuevo'
|
||||
: ticket.status === 'IN_PROGRESS'
|
||||
? 'En Progreso'
|
||||
: ticket.status === 'WAITING_FOR_CLIENT'
|
||||
? 'Esperando Cliente'
|
||||
: ticket.status === 'RESOLVED'
|
||||
? 'Resuelto'
|
||||
: ticket.status === 'CLOSED'
|
||||
? 'Cerrado'
|
||||
: 'Reabierto'}
|
||||
{ticket.status === 'NEW' ? 'Nuevo' :
|
||||
ticket.status === 'IN_PROGRESS' ? 'En Progreso' :
|
||||
ticket.status === 'WAITING_FOR_CLIENT' ? 'Esperando Cliente' :
|
||||
ticket.status === 'RESOLVED' ? 'Resuelto' :
|
||||
ticket.status === 'CLOSED' ? 'Cerrado' : 'Reabierto'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
|
||||
{#if $tickets.tickets.length > 5}
|
||||
<div class="text-center pt-4 border-t border-gray-200">
|
||||
<a href="/tickets" class="btn-secondary px-4 py-2">
|
||||
@@ -186,6 +174,5 @@
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
line-clamp: 2; /* Propiedad estándar para compatibilidad */
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
53
frontend-client/src/routes/clients/+page.svelte
Normal file
53
frontend-client/src/routes/clients/+page.svelte
Normal file
@@ -0,0 +1,53 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { clients } from '$lib/stores/clients';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
|
||||
let clientList = [];
|
||||
let isLoading = true;
|
||||
|
||||
onMount(async () => {
|
||||
try {
|
||||
clientList = await clients.loadClients();
|
||||
} catch (error) {
|
||||
toast.error('Error al cargar los clientes');
|
||||
} finally {
|
||||
isLoading = false;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Clientes - ServiceManager</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="container mx-auto py-8">
|
||||
<h1 class="text-2xl font-bold mb-4">Listado de Clientes</h1>
|
||||
|
||||
{#if isLoading}
|
||||
<p>Cargando clientes...</p>
|
||||
{:else if clientList.length === 0}
|
||||
<p>No hay clientes registrados.</p>
|
||||
{:else}
|
||||
<table class="table-auto w-full border-collapse border border-gray-300">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="border border-gray-300 px-4 py-2">Nombre</th>
|
||||
<th class="border border-gray-300 px-4 py-2">Email</th>
|
||||
<th class="border border-gray-300 px-4 py-2">Acciones</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each clientList as client}
|
||||
<tr>
|
||||
<td class="border border-gray-300 px-4 py-2">{client.name}</td>
|
||||
<td class="border border-gray-300 px-4 py-2">{client.email}</td>
|
||||
<td class="border border-gray-300 px-4 py-2">
|
||||
<a href={`/clients/${client.id}/edit`} class="text-blue-500 hover:underline">Editar</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
</tbody>
|
||||
</table>
|
||||
{/if}
|
||||
</div>
|
||||
83
frontend-client/src/routes/clients/[id]/edit/+page.svelte
Normal file
83
frontend-client/src/routes/clients/[id]/edit/+page.svelte
Normal file
@@ -0,0 +1,83 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { clients } from '$lib/stores/clients';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
import { goto, page } from '$app/navigation';
|
||||
|
||||
let clientId = $page.params.id;
|
||||
let name = '';
|
||||
let email = '';
|
||||
let isSubmitting = false;
|
||||
let errors: Record<string, string> = {};
|
||||
|
||||
onMount(async () => {
|
||||
try {
|
||||
const client = await clients.loadClient(clientId);
|
||||
name = client.name;
|
||||
email = client.email;
|
||||
} catch (error) {
|
||||
toast.error('Error al cargar el cliente');
|
||||
goto('/clients');
|
||||
}
|
||||
});
|
||||
|
||||
function validateForm() {
|
||||
errors = {};
|
||||
|
||||
if (!name.trim()) {
|
||||
errors.name = 'El nombre es requerido';
|
||||
}
|
||||
|
||||
if (!email.trim()) {
|
||||
errors.email = 'El email es requerido';
|
||||
}
|
||||
|
||||
return Object.keys(errors).length === 0;
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
if (!validateForm()) return;
|
||||
|
||||
isSubmitting = true;
|
||||
|
||||
try {
|
||||
await clients.updateClient(clientId, { name, email });
|
||||
toast.success('Cliente actualizado exitosamente');
|
||||
goto('/clients');
|
||||
} catch (error) {
|
||||
toast.error('Error al actualizar el cliente');
|
||||
} finally {
|
||||
isSubmitting = false;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Editar Cliente - ServiceManager</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="container mx-auto py-8">
|
||||
<h1 class="text-2xl font-bold mb-4">Editar Cliente</h1>
|
||||
|
||||
<form on:submit|preventDefault={handleSubmit} class="space-y-4">
|
||||
<div>
|
||||
<label for="name" class="block text-sm font-medium text-gray-700">Nombre</label>
|
||||
<input id="name" type="text" bind:value={name} class="mt-1 block w-full border-gray-300 rounded-md shadow-sm" />
|
||||
{#if errors.name}
|
||||
<p class="text-red-500 text-sm">{errors.name}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="email" class="block text-sm font-medium text-gray-700">Email</label>
|
||||
<input id="email" type="email" bind:value={email} class="mt-1 block w-full border-gray-300 rounded-md shadow-sm" />
|
||||
{#if errors.email}
|
||||
<p class="text-red-500 text-sm">{errors.email}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary" disabled={isSubmitting}>
|
||||
{isSubmitting ? 'Guardando...' : 'Guardar Cambios'}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
71
frontend-client/src/routes/clients/new/+page.svelte
Normal file
71
frontend-client/src/routes/clients/new/+page.svelte
Normal file
@@ -0,0 +1,71 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { clients } from '$lib/stores/clients';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
let name = '';
|
||||
let email = '';
|
||||
let isSubmitting = false;
|
||||
let errors: Record<string, string> = {};
|
||||
|
||||
function validateForm() {
|
||||
errors = {};
|
||||
|
||||
if (!name.trim()) {
|
||||
errors.name = 'El nombre es requerido';
|
||||
}
|
||||
|
||||
if (!email.trim()) {
|
||||
errors.email = 'El email es requerido';
|
||||
}
|
||||
|
||||
return Object.keys(errors).length === 0;
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
if (!validateForm()) return;
|
||||
|
||||
isSubmitting = true;
|
||||
|
||||
try {
|
||||
await clients.createClient({ name, email });
|
||||
toast.success('Cliente creado exitosamente');
|
||||
goto('/clients');
|
||||
} catch (error) {
|
||||
toast.error('Error al crear el cliente');
|
||||
} finally {
|
||||
isSubmitting = false;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Crear Cliente - ServiceManager</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="container mx-auto py-8">
|
||||
<h1 class="text-2xl font-bold mb-4">Crear Nuevo Cliente</h1>
|
||||
|
||||
<form on:submit|preventDefault={handleSubmit} class="space-y-4">
|
||||
<div>
|
||||
<label for="name" class="block text-sm font-medium text-gray-700">Nombre</label>
|
||||
<input id="name" type="text" bind:value={name} class="mt-1 block w-full border-gray-300 rounded-md shadow-sm" />
|
||||
{#if errors.name}
|
||||
<p class="text-red-500 text-sm">{errors.name}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="email" class="block text-sm font-medium text-gray-700">Email</label>
|
||||
<input id="email" type="email" bind:value={email} class="mt-1 block w-full border-gray-300 rounded-md shadow-sm" />
|
||||
{#if errors.email}
|
||||
<p class="text-red-500 text-sm">{errors.email}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary" disabled={isSubmitting}>
|
||||
{isSubmitting ? 'Creando...' : 'Crear Cliente'}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
@@ -4,7 +4,7 @@
|
||||
import { goto } from '$app/navigation';
|
||||
import { onMount } from 'svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
|
||||
|
||||
let email = '';
|
||||
let password = '';
|
||||
let totpCode = '';
|
||||
@@ -12,23 +12,23 @@
|
||||
let showTwoFactor = false;
|
||||
let errorMessage = '';
|
||||
let showPassword = false;
|
||||
|
||||
|
||||
onMount(() => {
|
||||
// Redirect if already authenticated
|
||||
if ($auth.isAuthenticated) {
|
||||
goto('/');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
async function handleLogin() {
|
||||
if (!email || !password) {
|
||||
errorMessage = 'Por favor completa todos los campos';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
isLoading = true;
|
||||
errorMessage = '';
|
||||
|
||||
|
||||
try {
|
||||
await auth.login({
|
||||
email,
|
||||
@@ -36,12 +36,12 @@
|
||||
tenant_slug: 'aduanasoft', // Default tenant for now
|
||||
totp_code: totpCode || undefined
|
||||
});
|
||||
|
||||
|
||||
toast.success('¡Bienvenido! Has iniciado sesión correctamente');
|
||||
goto('/');
|
||||
} catch (error: any) {
|
||||
console.error('Login error:', error);
|
||||
|
||||
|
||||
// Check if 2FA is required
|
||||
if (error.message.includes('two-factor') || error.message.includes('2FA')) {
|
||||
showTwoFactor = true;
|
||||
@@ -54,7 +54,7 @@
|
||||
isLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function handleKeyDown(event: KeyboardEvent) {
|
||||
if (event.key === 'Enter') {
|
||||
handleLogin();
|
||||
@@ -62,213 +62,183 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<div class="min-h-screen flex font-sans bg-white overflow-hidden">
|
||||
|
||||
<!-- Left Side: Hero Image & Overlay (55% width) -->
|
||||
<div class="hidden lg:flex w-[55%] relative bg-gray-900">
|
||||
<!-- Background Image -->
|
||||
<div
|
||||
class="absolute inset-0 bg-cover bg-center z-0"
|
||||
style="background-image: url('/images/SOPORTE.webp'); opacity: 1;"
|
||||
/>
|
||||
|
||||
<div
|
||||
class="absolute inset-0 bg-cover bg-center z-0"
|
||||
style="background-image: url('/images/SOPORTE.webp'); opacity: 1;"
|
||||
></div>
|
||||
|
||||
<!-- Gradient Overlay -->
|
||||
<div class="absolute inset-0 bg-gradient-to-br from-[#1e3a8a]/75 to-[#172554]/75 z-10" />
|
||||
<div
|
||||
class="absolute inset-0 bg-gradient-to-t from-black/50 via-transparent to-transparent z-10"
|
||||
/>
|
||||
<div class="absolute inset-0 bg-gradient-to-br from-[#1e3a8a]/75 to-[#172554]/75 z-10"></div>
|
||||
<div class="absolute inset-0 bg-gradient-to-t from-black/50 via-transparent to-transparent z-10"></div>
|
||||
|
||||
<!-- Content -->
|
||||
<div class="relative z-20 w-full h-full flex flex-col justify-between p-16 text-white">
|
||||
<!-- Top Logo (Left) -->
|
||||
<div class="flex flex-col">
|
||||
<img
|
||||
src="/images/Logo%20AS%20blanco(1).png"
|
||||
alt="AduanaSoft"
|
||||
class="h-32 w-auto object-contain self-start drop-shadow-lg"
|
||||
/>
|
||||
</div>
|
||||
<!-- Top Logo (Left) -->
|
||||
<div class="flex flex-col">
|
||||
<img src="/images/Logo%20AS%20blanco(1).png" alt="AduanaSoft" class="h-32 w-auto object-contain self-start drop-shadow-lg" />
|
||||
</div>
|
||||
|
||||
<!-- Main Hero Text -->
|
||||
<div class="space-y-4 mb-12">
|
||||
<h2 class="text-5xl font-extrabold tracking-tight drop-shadow-xl leading-tight">
|
||||
Control Total <br />
|
||||
de Servicios de TI
|
||||
</h2>
|
||||
<p class="text-lg text-blue-100/90 font-light max-w-lg leading-relaxed drop-shadow-md">
|
||||
Portal de atención a clientes. Genere tickets de soporte técnico para nuestros sistemas y
|
||||
reciba asistencia especializada para garantizar la continuidad de su operación.
|
||||
</p>
|
||||
</div>
|
||||
<!-- Main Hero Text -->
|
||||
<div class="space-y-4 mb-12">
|
||||
<h2 class="text-5xl font-extrabold tracking-tight drop-shadow-xl leading-tight">
|
||||
Control Total <br/>
|
||||
de Servicios de TI
|
||||
</h2>
|
||||
<p class="text-lg text-blue-100/90 font-light max-w-lg leading-relaxed drop-shadow-md">
|
||||
Portal de atención a clientes. Genere tickets de soporte técnico para nuestros sistemas y reciba asistencia especializada para garantizar la continuidad de su operación.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Bottom Footer -->
|
||||
<div class="text-xs font-bold tracking-[0.2em] text-blue-200/60 uppercase">
|
||||
ServiceManager Enterprise Platform
|
||||
</div>
|
||||
<!-- Bottom Footer -->
|
||||
<div class="text-xs font-bold tracking-[0.2em] text-blue-200/60 uppercase">
|
||||
ServiceManager Enterprise Platform
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Right Side: Login Form (45% width) -->
|
||||
<div
|
||||
class="w-full lg:w-[45%] flex flex-col justify-center items-center p-8 lg:p-16 bg-white relative"
|
||||
>
|
||||
<div class="w-full lg:w-[45%] flex flex-col justify-center items-center p-8 lg:p-16 bg-white relative">
|
||||
|
||||
<div class="w-full max-w-md space-y-8">
|
||||
<!-- Logo & Header -->
|
||||
<div class="text-center space-y-2">
|
||||
<h2 class="text-3xl font-bold text-gray-900">Bienvenido</h2>
|
||||
<p class="text-gray-500 text-sm">Ingrese a su cuenta corporativa</p>
|
||||
</div>
|
||||
|
||||
<!-- Form -->
|
||||
<form on:submit|preventDefault={handleLogin} class="space-y-6 mt-8">
|
||||
{#if errorMessage}
|
||||
<div
|
||||
class="p-3 rounded-md bg-red-50 border border-red-100 flex items-center gap-3 animate-fade-in text-sm text-red-600"
|
||||
>
|
||||
<Icon name="alert-circle" class="w-4 h-4 flex-shrink-0" />
|
||||
{errorMessage}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if !showTwoFactor}
|
||||
<div class="space-y-5">
|
||||
<!-- Email Input -->
|
||||
<div class="space-y-1.5">
|
||||
<label for="email" class="block text-sm font-semibold text-gray-700"
|
||||
>Correo Electrónico</label
|
||||
>
|
||||
<div class="relative group">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon
|
||||
name="mail"
|
||||
class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
|
||||
/>
|
||||
</div>
|
||||
<input
|
||||
id="email"
|
||||
type="email"
|
||||
bind:value={email}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-3 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="admin@aduanasoft.com"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Password Input -->
|
||||
<div class="space-y-1.5">
|
||||
<label for="password" class="block text-sm font-semibold text-gray-700"
|
||||
>Contraseña</label
|
||||
>
|
||||
<div class="relative group">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon
|
||||
name="lock"
|
||||
class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
|
||||
/>
|
||||
</div>
|
||||
{#if showPassword}
|
||||
<input
|
||||
id="password"
|
||||
type="text"
|
||||
bind:value={password}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-10 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="••••••••"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
{:else}
|
||||
<input
|
||||
id="password"
|
||||
type="password"
|
||||
bind:value={password}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-10 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="••••••••"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
{/if}
|
||||
<button
|
||||
type="button"
|
||||
class="absolute inset-y-0 right-0 pr-3 flex items-center cursor-pointer text-gray-400 hover:text-gray-600 focus:outline-none"
|
||||
on:click={() => (showPassword = !showPassword)}
|
||||
>
|
||||
<Icon name={showPassword ? 'eye-off' : 'eye'} class="w-5 h-5" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex items-center">
|
||||
<input
|
||||
id="remember-me"
|
||||
name="remember-me"
|
||||
type="checkbox"
|
||||
class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded cursor-pointer"
|
||||
/>
|
||||
<label
|
||||
for="remember-me"
|
||||
class="ml-2 block text-sm text-gray-500 cursor-pointer select-none"
|
||||
>Recordar en este equipo</label
|
||||
>
|
||||
</div>
|
||||
<a
|
||||
href="/forgot-password"
|
||||
class="text-sm font-medium text-blue-600 hover:text-blue-500"
|
||||
>
|
||||
Olvide mi clave
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{:else}
|
||||
<!-- 2FA Input -->
|
||||
<div class="space-y-4 animate-slide-up">
|
||||
<label for="code" class="block text-sm font-medium text-gray-700 text-center"
|
||||
>Código de Verificación (2FA)</label
|
||||
>
|
||||
<p class="text-xs text-center text-gray-500 mb-4">Ingrese el código de 6 dígitos</p>
|
||||
|
||||
<div class="relative">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon name="shield-check" class="w-5 h-5 text-blue-500" />
|
||||
</div>
|
||||
<input
|
||||
id="code"
|
||||
type="text"
|
||||
bind:value={totpCode}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 py-3 text-center tracking-[0.5em] font-mono text-lg border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent"
|
||||
placeholder="000000"
|
||||
maxlength="6"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="pt-2">
|
||||
<button
|
||||
type="submit"
|
||||
class="w-full flex justify-center py-3.5 px-4 border border-transparent rounded-lg shadow-sm text-sm font-bold text-white bg-blue-700 hover:bg-blue-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200"
|
||||
disabled={isLoading}
|
||||
>
|
||||
{#if isLoading}
|
||||
<Icon name="loader-2" class="w-5 h-5 animate-spin mr-2" />
|
||||
Procesando...
|
||||
{:else}
|
||||
{showTwoFactor ? 'Verificar Acceso' : 'Acceder al Portal'}
|
||||
{/if}
|
||||
</button>
|
||||
<!-- Logo & Header -->
|
||||
<div class="text-center space-y-2">
|
||||
<h2 class="text-3xl font-bold text-gray-900">Bienvenido</h2>
|
||||
<p class="text-gray-500 text-sm">Ingrese a su cuenta corporativa</p>
|
||||
</div>
|
||||
|
||||
<div class="mt-8 text-center text-xs text-gray-400">
|
||||
© 2026 Aduanasoft. Acceso exclusivo autorizado.
|
||||
</div>
|
||||
</form>
|
||||
<!-- Form -->
|
||||
<form on:submit|preventDefault={handleLogin} class="space-y-6 mt-8">
|
||||
{#if errorMessage}
|
||||
<div class="p-3 rounded-md bg-red-50 border border-red-100 flex items-center gap-3 animate-fade-in text-sm text-red-600">
|
||||
<Icon name="alert-circle" class="w-4 h-4 flex-shrink-0" />
|
||||
{errorMessage}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if !showTwoFactor}
|
||||
<div class="space-y-5">
|
||||
<!-- Email Input -->
|
||||
<div class="space-y-1.5">
|
||||
<label for="email" class="block text-sm font-semibold text-gray-700">Correo Electrónico</label>
|
||||
<div class="relative group">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon name="mail" class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors" />
|
||||
</div>
|
||||
<input
|
||||
id="email"
|
||||
type="email"
|
||||
bind:value={email}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-3 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="admin@aduanasoft.com"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Password Input -->
|
||||
<div class="space-y-1.5">
|
||||
<label for="password" class="block text-sm font-semibold text-gray-700">Contraseña</label>
|
||||
<div class="relative group">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon name="lock" class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors" />
|
||||
</div>
|
||||
{#if showPassword}
|
||||
<input
|
||||
id="password"
|
||||
type="text"
|
||||
bind:value={password}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-10 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="••••••••"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
{:else}
|
||||
<input
|
||||
id="password"
|
||||
type="password"
|
||||
bind:value={password}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 pr-10 py-3 bg-[#fff9c4]/0 hover:bg-gray-50 focus:bg-white border text-gray-900 border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent transition-all duration-200 sm:text-sm"
|
||||
placeholder="••••••••"
|
||||
required
|
||||
disabled={isLoading}
|
||||
/>
|
||||
{/if}
|
||||
<button
|
||||
type="button"
|
||||
class="absolute inset-y-0 right-0 pr-3 flex items-center cursor-pointer text-gray-400 hover:text-gray-600 focus:outline-none"
|
||||
on:click={() => showPassword = !showPassword}
|
||||
>
|
||||
<Icon name={showPassword ? 'eye-off' : 'eye'} class="w-5 h-5" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex items-center">
|
||||
<input id="remember-me" name="remember-me" type="checkbox" class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded cursor-pointer">
|
||||
<label for="remember-me" class="ml-2 block text-sm text-gray-500 cursor-pointer select-none">Recordar en este equipo</label>
|
||||
</div>
|
||||
<a href="/forgot-password" class="text-sm font-medium text-blue-600 hover:text-blue-500">
|
||||
Olvide mi clave
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{:else}
|
||||
<!-- 2FA Input -->
|
||||
<div class="space-y-4 animate-slide-up">
|
||||
<label for="code" class="block text-sm font-medium text-gray-700 text-center">Código de Verificación (2FA)</label>
|
||||
<p class="text-xs text-center text-gray-500 mb-4">Ingrese el código de 6 dígitos</p>
|
||||
|
||||
<div class="relative">
|
||||
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
|
||||
<Icon name="shield-check" class="w-5 h-5 text-blue-500" />
|
||||
</div>
|
||||
<input
|
||||
id="code"
|
||||
type="text"
|
||||
bind:value={totpCode}
|
||||
on:keydown={handleKeyDown}
|
||||
class="block w-full pl-10 py-3 text-center tracking-[0.5em] font-mono text-lg border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-600 focus:border-transparent"
|
||||
placeholder="000000"
|
||||
maxlength="6"
|
||||
required
|
||||
disabled={isLoading}
|
||||
autofocus
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="pt-2">
|
||||
<button
|
||||
type="submit"
|
||||
class="w-full flex justify-center py-3.5 px-4 border border-transparent rounded-lg shadow-sm text-sm font-bold text-white bg-blue-700 hover:bg-blue-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200"
|
||||
disabled={isLoading}
|
||||
>
|
||||
{#if isLoading}
|
||||
<Icon name="loader-2" class="w-5 h-5 animate-spin mr-2" />
|
||||
Procesando...
|
||||
{:else}
|
||||
{showTwoFactor ? 'Verificar Acceso' : 'Acceder al Portal'}
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="mt-8 text-center text-xs text-gray-400">
|
||||
© 2026 Aduanasoft. Acceso exclusivo autorizado.
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@
|
||||
import { tickets } from '$lib/stores/tickets.js';
|
||||
import { toast } from '$lib/stores/toast.js';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
|
||||
let ticketId: string;
|
||||
let newComment = '';
|
||||
let isSubmittingComment = false;
|
||||
@@ -14,43 +14,20 @@
|
||||
let closeResolution = '';
|
||||
let fileInput: HTMLInputElement;
|
||||
let isUploading = false;
|
||||
let pollingInterval: any = null;
|
||||
let showAttachments = true; // Variable para controlar la visibilidad de attachments
|
||||
|
||||
async function loadComments() {
|
||||
try {
|
||||
await tickets.reloadComments(ticketId);
|
||||
} catch (error) {
|
||||
// No mostrar error en polling silencioso
|
||||
console.error('Error recargando comentarios:', error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
onMount(() => {
|
||||
// Redirect if not authenticated
|
||||
if (!$auth.isAuthenticated) {
|
||||
goto('/login');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ticketId = $page.params.id;
|
||||
if (ticketId) {
|
||||
tickets.loadTicket(ticketId);
|
||||
|
||||
// Polling cada 3 segundos
|
||||
pollingInterval = setInterval(() => {
|
||||
loadComments();
|
||||
}, 3000);
|
||||
}
|
||||
|
||||
// Cleanup cuando se desmonte el componente
|
||||
return () => {
|
||||
if (pollingInterval) {
|
||||
clearInterval(pollingInterval);
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
// Format date
|
||||
function formatDate(dateString: string): string {
|
||||
return new Date(dateString).toLocaleString('es-ES', {
|
||||
@@ -61,7 +38,7 @@
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Status mapping
|
||||
const statusConfig = {
|
||||
NEW: { label: 'Nuevo', class: 'badge-new' },
|
||||
@@ -71,7 +48,7 @@
|
||||
CLOSED: { label: 'Cerrado', class: 'badge-closed' },
|
||||
REOPENED: { label: 'Reabierto', class: 'badge-reopened' }
|
||||
};
|
||||
|
||||
|
||||
// Priority mapping
|
||||
const priorityConfig = {
|
||||
LOW: { label: 'Baja', class: 'badge-priority-low' },
|
||||
@@ -79,10 +56,10 @@
|
||||
HIGH: { label: 'Alta', class: 'badge-priority-high' },
|
||||
URGENT: { label: 'Urgente', class: 'badge-priority-urgent' }
|
||||
};
|
||||
|
||||
|
||||
async function handleAddComment() {
|
||||
if (!newComment.trim()) return;
|
||||
|
||||
|
||||
isSubmittingComment = true;
|
||||
try {
|
||||
await tickets.addComment(ticketId, newComment.trim());
|
||||
@@ -94,39 +71,34 @@
|
||||
isSubmittingComment = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async function handleFileUpload(event: Event) {
|
||||
const target = event.target as HTMLInputElement;
|
||||
const file = target.files?.[0];
|
||||
if (!file) return;
|
||||
|
||||
|
||||
// Validate file size (max 10MB)
|
||||
if (file.size > 10 * 1024 * 1024) {
|
||||
toast.error('El archivo es demasiado grande. Máximo 10MB');
|
||||
target.value = '';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Validate file type
|
||||
const allowedTypes = [
|
||||
'image/jpeg',
|
||||
'image/png',
|
||||
'image/gif',
|
||||
'image/webp',
|
||||
'application/pdf',
|
||||
'text/plain',
|
||||
'application/msword',
|
||||
'image/jpeg', 'image/png', 'image/gif', 'image/webp',
|
||||
'application/pdf', 'text/plain', 'application/msword',
|
||||
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||
'application/vnd.ms-excel',
|
||||
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
|
||||
];
|
||||
|
||||
|
||||
if (!allowedTypes.includes(file.type)) {
|
||||
toast.error('Tipo de archivo no permitido');
|
||||
target.value = '';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
isUploading = true;
|
||||
try {
|
||||
await tickets.uploadAttachment(ticketId, file);
|
||||
@@ -138,21 +110,11 @@
|
||||
isUploading = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function handleDownloadAttachment(attachment: any) {
|
||||
try {
|
||||
await tickets.downloadAttachment(ticketId, attachment.id, attachment.original_filename);
|
||||
toast.success('Descarga iniciada');
|
||||
} catch (error: any) {
|
||||
console.error('Download error:', error);
|
||||
toast.error(error.message || 'Error al descargar el archivo');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function handleCloseTicket() {
|
||||
showCloseDialog = true;
|
||||
}
|
||||
|
||||
|
||||
async function confirmCloseTicket() {
|
||||
isClosingTicket = true;
|
||||
try {
|
||||
@@ -166,15 +128,14 @@
|
||||
isClosingTicket = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function cancelCloseTicket() {
|
||||
showCloseDialog = false;
|
||||
closeResolution = '';
|
||||
}
|
||||
|
||||
|
||||
// Check if user can close ticket
|
||||
$: canClose =
|
||||
$tickets.currentTicket &&
|
||||
$: canClose = $tickets.currentTicket &&
|
||||
['RESOLVED', 'WAITING_FOR_CLIENT'].includes($tickets.currentTicket.status);
|
||||
</script>
|
||||
|
||||
@@ -187,24 +148,22 @@
|
||||
<div class="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
||||
{#if $tickets.isLoading}
|
||||
<div class="text-center py-12">
|
||||
<div class="spinner w-8 h-8 mx-auto mb-4" />
|
||||
<div class="spinner w-8 h-8 mx-auto mb-4"></div>
|
||||
<p class="text-gray-600">Cargando ticket...</p>
|
||||
</div>
|
||||
{:else if $tickets.error}
|
||||
<div class="text-center py-12">
|
||||
<div class="w-12 h-12 bg-red-100 rounded-lg flex items-center justify-center mx-auto mb-4">
|
||||
<svg class="w-6 h-6 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
</div>
|
||||
<h3 class="text-lg font-medium text-gray-900 mb-2">Error al cargar ticket</h3>
|
||||
<p class="text-gray-600 mb-4">{$tickets.error}</p>
|
||||
<button on:click={() => tickets.loadTicket(ticketId)} class="btn-primary px-4 py-2">
|
||||
<button
|
||||
on:click={() => tickets.loadTicket(ticketId)}
|
||||
class="btn-primary px-4 py-2"
|
||||
>
|
||||
Reintentar
|
||||
</button>
|
||||
</div>
|
||||
@@ -217,7 +176,7 @@
|
||||
</svg>
|
||||
<span>#{$tickets.currentTicket.id.substring(0, 8)}</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="grid grid-cols-1 lg:grid-cols-3 gap-8">
|
||||
<!-- Main Content -->
|
||||
<div class="lg:col-span-2 space-y-6">
|
||||
@@ -241,7 +200,7 @@
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{#if canClose}
|
||||
<button
|
||||
on:click={handleCloseTicket}
|
||||
@@ -253,14 +212,14 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card-content">
|
||||
<div class="prose max-w-none">
|
||||
<p class="whitespace-pre-wrap text-gray-700">
|
||||
{$tickets.currentTicket.description}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
{#if $tickets.currentTicket.resolution}
|
||||
<div class="mt-6 p-4 bg-green-50 border border-green-200 rounded-lg">
|
||||
<h4 class="font-medium text-green-900 mb-2">Resolución:</h4>
|
||||
@@ -271,87 +230,50 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Attachments -->
|
||||
{#if $tickets.attachments.length > 0}
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="flex items-center justify-between">
|
||||
<h3 class="text-lg font-semibold text-gray-900 flex items-center space-x-2">
|
||||
<span>Archivos Adjuntos</span>
|
||||
<span
|
||||
class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800"
|
||||
>
|
||||
{$tickets.attachments.length} archivo{$tickets.attachments.length !== 1
|
||||
? 's'
|
||||
: ''}
|
||||
</span>
|
||||
</h3>
|
||||
<button
|
||||
class="text-sm text-gray-500 hover:text-gray-700"
|
||||
title="Ver/Ocultar archivos adjuntos"
|
||||
on:click={() => (showAttachments = !showAttachments)}
|
||||
>
|
||||
{showAttachments ? 'Ocultar' : 'Ver'} archivos
|
||||
</button>
|
||||
<h3 class="text-lg font-semibold text-gray-900">Archivos Adjuntos</h3>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<div class="space-y-3">
|
||||
{#each $tickets.attachments as attachment}
|
||||
<div class="flex items-center justify-between p-3 bg-gray-50 rounded-lg">
|
||||
<div class="flex items-center space-x-3">
|
||||
<div class="w-8 h-8 bg-gray-200 rounded flex items-center justify-center">
|
||||
<svg class="w-4 h-4 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" />
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900">
|
||||
{attachment.original_filename}
|
||||
</p>
|
||||
<p class="text-xs text-gray-500">
|
||||
{Math.round(attachment.size_bytes / 1024)} KB •
|
||||
Subido por {attachment.uploaded_by_name} •
|
||||
{formatDate(attachment.uploaded_at)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<a
|
||||
href="/api/v1/tickets/{ticketId}/attachments/{attachment.id}/download"
|
||||
class="btn-ghost p-2"
|
||||
target="_blank"
|
||||
>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
|
||||
</svg>
|
||||
</a>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{#if showAttachments}
|
||||
<div class="card-content">
|
||||
<div class="space-y-3">
|
||||
{#each $tickets.attachments as attachment}
|
||||
<div
|
||||
class="flex items-center justify-between p-3 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors"
|
||||
>
|
||||
<div class="flex items-center space-x-3">
|
||||
<div class="w-8 h-8 bg-gray-200 rounded flex items-center justify-center">
|
||||
<svg
|
||||
class="w-4 h-4 text-gray-600"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13"
|
||||
/>
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900">
|
||||
{attachment.original_filename}
|
||||
</p>
|
||||
<p class="text-xs text-gray-500">
|
||||
{Math.round(attachment.size_bytes / 1024)} KB • Subido por {attachment.uploaded_by_name}
|
||||
•
|
||||
{formatDate(attachment.uploaded_at)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
on:click={() => handleDownloadAttachment(attachment)}
|
||||
class="btn-ghost p-2 hover:bg-blue-100 rounded-md transition-colors"
|
||||
title="Descargar archivo"
|
||||
>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
|
||||
/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
|
||||
<!-- Comments -->
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
@@ -365,24 +287,16 @@
|
||||
{:else}
|
||||
<div class="space-y-4">
|
||||
{#each $tickets.comments as comment}
|
||||
{console.log('Comment:', comment)}
|
||||
<div class="flex space-x-3">
|
||||
<div
|
||||
class="w-8 h-8 bg-primary-100 rounded-full flex items-center justify-center flex-shrink-0"
|
||||
>
|
||||
<div class="w-8 h-8 bg-primary-100 rounded-full flex items-center justify-center flex-shrink-0">
|
||||
<span class="text-primary-600 text-xs font-medium">
|
||||
{comment.author_name
|
||||
? comment.author_name
|
||||
.split(' ')
|
||||
.map(n => n[0])
|
||||
.join('')
|
||||
: '??'}
|
||||
{comment.user_name.split(' ').map(n => n[0]).join('')}
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center space-x-2 mb-1">
|
||||
<span class="text-sm font-medium text-gray-900">
|
||||
{comment.author_name}
|
||||
{comment.user_name}
|
||||
</span>
|
||||
<span class="text-xs text-gray-500">
|
||||
{formatDate(comment.created_at)}
|
||||
@@ -401,7 +315,7 @@
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
|
||||
<!-- Add Comment Form -->
|
||||
<div class="mt-6 pt-6 border-t border-gray-200">
|
||||
<div class="space-y-4">
|
||||
@@ -411,8 +325,8 @@
|
||||
placeholder="Escribe tu comentario o respuesta..."
|
||||
bind:value={newComment}
|
||||
disabled={isSubmittingComment}
|
||||
/>
|
||||
|
||||
></textarea>
|
||||
|
||||
<div class="flex justify-between items-center">
|
||||
<div class="flex items-center space-x-4">
|
||||
<input
|
||||
@@ -430,21 +344,16 @@
|
||||
disabled={isUploading}
|
||||
>
|
||||
{#if isUploading}
|
||||
<div class="spinner w-4 h-4" />
|
||||
<div class="spinner w-4 h-4"></div>
|
||||
{:else}
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" />
|
||||
</svg>
|
||||
{/if}
|
||||
<span class="text-sm">Adjuntar archivo</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
||||
<button
|
||||
on:click={handleAddComment}
|
||||
class="btn-primary px-4 py-2"
|
||||
@@ -452,7 +361,7 @@
|
||||
>
|
||||
{#if isSubmittingComment}
|
||||
<div class="flex items-center space-x-2">
|
||||
<div class="spinner w-4 h-4" />
|
||||
<div class="spinner w-4 h-4"></div>
|
||||
<span>Enviando...</span>
|
||||
</div>
|
||||
{:else}
|
||||
@@ -465,7 +374,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Sidebar -->
|
||||
<div class="space-y-6">
|
||||
<!-- Ticket Info -->
|
||||
@@ -476,44 +385,35 @@
|
||||
<div class="card-content space-y-4">
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">ID del Ticket</dt>
|
||||
<dd class="text-sm text-gray-900 font-mono">
|
||||
#{$tickets.currentTicket.id.substring(0, 8)}
|
||||
</dd>
|
||||
<dd class="text-sm text-gray-900 font-mono">#{$tickets.currentTicket.id.substring(0, 8)}</dd>
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Categoría</dt>
|
||||
<dd class="text-sm text-gray-900">
|
||||
{$tickets.currentTicket.category_name || 'Sin categoría'}
|
||||
</dd>
|
||||
<dd class="text-sm text-gray-900">{$tickets.currentTicket.category_name || 'Sin categoría'}</dd>
|
||||
</div>
|
||||
|
||||
|
||||
{#if $tickets.currentTicket.assigned_to_name}
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Asignado a</dt>
|
||||
<dd class="text-sm text-gray-900">{$tickets.currentTicket.assigned_to_name}</dd>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Creado</dt>
|
||||
<dd class="text-sm text-gray-900">{formatDate($tickets.currentTicket.created_at)}</dd>
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Última actualización</dt>
|
||||
<dd class="text-sm text-gray-900">{formatDate($tickets.currentTicket.updated_at)}</dd>
|
||||
</div>
|
||||
|
||||
|
||||
{#if $tickets.currentTicket.due_date}
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Fecha límite</dt>
|
||||
<dd
|
||||
class="text-sm text-gray-900 {new Date($tickets.currentTicket.due_date) <
|
||||
new Date()
|
||||
? 'text-red-600'
|
||||
: ''}"
|
||||
>
|
||||
<dd class="text-sm text-gray-900 {new Date($tickets.currentTicket.due_date) < new Date() ? 'text-red-600' : ''}">
|
||||
{formatDate($tickets.currentTicket.due_date)}
|
||||
{#if new Date($tickets.currentTicket.due_date) < new Date()}
|
||||
<span class="block text-xs text-red-500">¡Vencido!</span>
|
||||
@@ -531,50 +431,29 @@
|
||||
<!-- Close Ticket Dialog -->
|
||||
{#if showCloseDialog}
|
||||
<div class="fixed inset-0 z-50 overflow-y-auto">
|
||||
<div
|
||||
class="flex items-center justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
|
||||
>
|
||||
<div
|
||||
class="fixed inset-0 transition-opacity"
|
||||
role="dialog"
|
||||
tabindex="0"
|
||||
on:click={cancelCloseTicket}
|
||||
on:keydown={e => e.key === 'Escape' && cancelCloseTicket()}
|
||||
>
|
||||
<div class="absolute inset-0 bg-gray-500 opacity-75" />
|
||||
<div class="flex items-center justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
|
||||
<div class="fixed inset-0 transition-opacity" on:click={cancelCloseTicket}>
|
||||
<div class="absolute inset-0 bg-gray-500 opacity-75"></div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
|
||||
>
|
||||
|
||||
<div class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full">
|
||||
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
|
||||
<div class="sm:flex sm:items-start">
|
||||
<div
|
||||
class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:mx-0 sm:h-10 sm:w-10"
|
||||
>
|
||||
<svg
|
||||
class="h-6 w-6 text-green-600"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M5 13l4 4L19 7"
|
||||
/>
|
||||
<div class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:mx-0 sm:h-10 sm:w-10">
|
||||
<svg class="h-6 w-6 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
|
||||
</svg>
|
||||
</div>
|
||||
<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
|
||||
<h3 class="text-lg leading-6 font-medium text-gray-900">Cerrar Ticket</h3>
|
||||
<h3 class="text-lg leading-6 font-medium text-gray-900">
|
||||
Cerrar Ticket
|
||||
</h3>
|
||||
<div class="mt-2">
|
||||
<p class="text-sm text-gray-500">
|
||||
¿Estás seguro de que quieres cerrar este ticket? Esta acción indica que el
|
||||
problema ha sido resuelto satisfactoriamente.
|
||||
¿Estás seguro de que quieres cerrar este ticket? Esta acción indica que el problema ha sido resuelto satisfactoriamente.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mt-4">
|
||||
<label for="close-resolution" class="form-label">
|
||||
Comentario de cierre (opcional)
|
||||
@@ -586,7 +465,7 @@
|
||||
placeholder="Describe cómo se resolvió el problema o agrega comentarios finales..."
|
||||
bind:value={closeResolution}
|
||||
disabled={isClosingTicket}
|
||||
/>
|
||||
></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -600,7 +479,7 @@
|
||||
>
|
||||
{#if isClosingTicket}
|
||||
<div class="flex items-center space-x-2">
|
||||
<div class="spinner w-4 h-4" />
|
||||
<div class="spinner w-4 h-4"></div>
|
||||
<span>Cerrando...</span>
|
||||
</div>
|
||||
{:else}
|
||||
@@ -619,4 +498,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
"extends": "./.svelte-kit/tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"allowJs": true,
|
||||
"checkJs": true,
|
||||
"esModuleInterop": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"resolveJsonModule": true,
|
||||
"skipLibCheck": true,
|
||||
"sourceMap": true,
|
||||
"strict": true,
|
||||
"moduleResolution": "bundler",
|
||||
"target": "ES2020",
|
||||
"module": "ESNext",
|
||||
"lib": [
|
||||
"ES2020",
|
||||
"DOM",
|
||||
"DOM.Iterable"
|
||||
],
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"isolatedModules": true,
|
||||
"verbatimModuleSyntax": true
|
||||
},
|
||||
"include": [
|
||||
"src/**/*",
|
||||
"app.d.ts"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules/**",
|
||||
".svelte-kit/**",
|
||||
"build/**",
|
||||
"dist/**"
|
||||
]
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
// vite.config.js
|
||||
import { sveltekit } from "file:///app/node_modules/@sveltejs/kit/src/exports/vite/index.js";
|
||||
import { defineConfig } from "file:///app/node_modules/vite/dist/node/index.js";
|
||||
var vite_config_default = defineConfig({
|
||||
plugins: [sveltekit()],
|
||||
server: {
|
||||
port: 3e3,
|
||||
host: "0.0.0.0",
|
||||
proxy: {
|
||||
"/api": {
|
||||
target: "http://servicemanager-backend:8000",
|
||||
changeOrigin: true,
|
||||
rewrite: (path) => path.replace(/^\/api/, "")
|
||||
}
|
||||
}
|
||||
},
|
||||
preview: {
|
||||
port: 3e3,
|
||||
host: "0.0.0.0"
|
||||
},
|
||||
build: {
|
||||
target: "esnext"
|
||||
}
|
||||
});
|
||||
export {
|
||||
vite_config_default as default
|
||||
};
|
||||
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvYXBwXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvYXBwL3ZpdGUuY29uZmlnLmpzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9hcHAvdml0ZS5jb25maWcuanNcIjtpbXBvcnQgeyBzdmVsdGVraXQgfSBmcm9tICdAc3ZlbHRlanMva2l0L3ZpdGUnO1xyXG5pbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJztcclxuXHJcbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XHJcblx0cGx1Z2luczogW3N2ZWx0ZWtpdCgpXSxcclxuXHRzZXJ2ZXI6IHtcclxuXHRcdHBvcnQ6IDMwMDAsXHJcblx0XHRob3N0OiAnMC4wLjAuMCcsXHJcblx0XHRwcm94eToge1xyXG5cdFx0XHQnL2FwaSc6IHtcclxuXHRcdFx0XHR0YXJnZXQ6ICdodHRwOi8vc2VydmljZW1hbmFnZXItYmFja2VuZDo4MDAwJyxcclxuXHRcdFx0XHRjaGFuZ2VPcmlnaW46IHRydWUsXHJcblx0XHRcdFx0cmV3cml0ZTogKHBhdGgpID0+IHBhdGgucmVwbGFjZSgvXlxcL2FwaS8sICcnKVxyXG5cdFx0XHR9XHJcblx0XHR9XHJcblx0fSxcclxuXHRwcmV2aWV3OiB7XHJcblx0XHRwb3J0OiAzMDAwLFxyXG5cdFx0aG9zdDogJzAuMC4wLjAnXHJcblx0fSxcclxuXHRidWlsZDoge1xyXG5cdFx0dGFyZ2V0OiAnZXNuZXh0J1xyXG5cdH1cclxufSk7Il0sCiAgIm1hcHBpbmdzIjogIjtBQUE4TCxTQUFTLGlCQUFpQjtBQUN4TixTQUFTLG9CQUFvQjtBQUU3QixJQUFPLHNCQUFRLGFBQWE7QUFBQSxFQUMzQixTQUFTLENBQUMsVUFBVSxDQUFDO0FBQUEsRUFDckIsUUFBUTtBQUFBLElBQ1AsTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLElBQ04sT0FBTztBQUFBLE1BQ04sUUFBUTtBQUFBLFFBQ1AsUUFBUTtBQUFBLFFBQ1IsY0FBYztBQUFBLFFBQ2QsU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLFVBQVUsRUFBRTtBQUFBLE1BQzdDO0FBQUEsSUFDRDtBQUFBLEVBQ0Q7QUFBQSxFQUNBLFNBQVM7QUFBQSxJQUNSLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxFQUNQO0FBQUEsRUFDQSxPQUFPO0FBQUEsSUFDTixRQUFRO0FBQUEsRUFDVDtBQUNELENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
||||
5036
frontend-internal/package-lock.json
generated
5036
frontend-internal/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@servicemanager/internal-frontend",
|
||||
"version": "1.6.0",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
<script lang="ts">
|
||||
import { auth } from '$lib/stores/auth.js';
|
||||
;
|
||||
|
||||
|
||||
export let toggleSidebar: () => void;
|
||||
|
||||
|
||||
function handleLogout() {
|
||||
auth.logout();
|
||||
}
|
||||
|
||||
|
||||
let isMenuOpen = false;
|
||||
|
||||
|
||||
function toggleMenu() {
|
||||
isMenuOpen = !isMenuOpen;
|
||||
}
|
||||
@@ -24,20 +23,15 @@
|
||||
class="p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-primary-500 lg:hidden"
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M4 6h16M4 12h16M4 18h16"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
|
||||
<div class="hidden lg:block">
|
||||
<h1 class="text-lg font-semibold text-gray-900">ServiceManager Internal</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Right side -->
|
||||
<div class="flex items-center space-x-4">
|
||||
<!-- User menu -->
|
||||
@@ -52,23 +46,15 @@
|
||||
</span>
|
||||
</div>
|
||||
<span class="hidden sm:block text-sm">
|
||||
{$auth.user?.first_name}
|
||||
{$auth.user?.last_name}
|
||||
{$auth.user?.first_name} {$auth.user?.last_name}
|
||||
</span>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M19 9l-7 7-7-7"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
{#if isMenuOpen}
|
||||
<div
|
||||
class="absolute right-0 mt-2 w-48 bg-white rounded-md shadow-lg border border-gray-200 z-50"
|
||||
>
|
||||
<div class="absolute right-0 mt-2 w-48 bg-white rounded-md shadow-lg border border-gray-200 z-50">
|
||||
<div class="py-1">
|
||||
<div class="px-4 py-2 text-xs text-gray-500 border-b border-gray-200">
|
||||
{$auth.user?.email}
|
||||
@@ -76,7 +62,7 @@
|
||||
<a
|
||||
href="/profile"
|
||||
class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
||||
on:click={() => (isMenuOpen = false)}
|
||||
on:click={() => isMenuOpen = false}
|
||||
>
|
||||
Mi Perfil
|
||||
</a>
|
||||
@@ -96,11 +82,8 @@
|
||||
|
||||
<!-- Backdrop for mobile menu -->
|
||||
{#if isMenuOpen}
|
||||
<div
|
||||
class="fixed inset-0 z-40 lg:hidden"
|
||||
role="dialog"
|
||||
tabindex="0"
|
||||
on:click={() => (isMenuOpen = false)}
|
||||
on:keydown={e => e.key === 'Escape' && (isMenuOpen = false)}
|
||||
/>
|
||||
{/if}
|
||||
<div
|
||||
class="fixed inset-0 z-40 lg:hidden"
|
||||
on:click={() => isMenuOpen = false}
|
||||
></div>
|
||||
{/if}
|
||||
@@ -1,9 +1,8 @@
|
||||
<script>
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import { createEventDispatcher, onMount, onDestroy } from 'svelte';
|
||||
|
||||
export let open = false;
|
||||
export let title = '';
|
||||
export let size = 'lg'; // sm, md, lg, xl, 2xl
|
||||
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
@@ -16,20 +15,6 @@
|
||||
close();
|
||||
}
|
||||
}
|
||||
|
||||
function handleBackdropClick(e) {
|
||||
if (e.target === e.currentTarget) {
|
||||
close();
|
||||
}
|
||||
}
|
||||
|
||||
const sizeClasses = {
|
||||
sm: 'sm:max-w-sm',
|
||||
md: 'sm:max-w-md',
|
||||
lg: 'sm:max-w-lg',
|
||||
xl: 'sm:max-w-xl',
|
||||
'2xl': 'sm:max-w-2xl'
|
||||
};
|
||||
</script>
|
||||
|
||||
<svelte:window on:keydown={handleKeydown}/>
|
||||
@@ -38,45 +23,21 @@
|
||||
<div class="fixed inset-0 z-50 overflow-y-auto" aria-labelledby="modal-title" role="dialog" aria-modal="true">
|
||||
<div class="flex items-end justify-center min-h-screen px-4 pt-4 pb-20 text-center sm:block sm:p-0">
|
||||
|
||||
<!-- Backdrop -->
|
||||
<div
|
||||
class="fixed inset-0 transition-opacity bg-gray-500 bg-opacity-75"
|
||||
aria-hidden="true"
|
||||
on:click={handleBackdropClick}
|
||||
></div>
|
||||
<div class="fixed inset-0 transition-opacity bg-gray-500 bg-opacity-75" aria-hidden="true" on:click={close}></div>
|
||||
|
||||
<!-- Center trick -->
|
||||
<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">​</span>
|
||||
|
||||
<!-- Modal panel -->
|
||||
<div class="inline-block w-full align-bottom bg-white rounded-lg shadow-xl transform transition-all sm:my-8 sm:align-middle {sizeClasses[size]} sm:w-full">
|
||||
<!-- Header -->
|
||||
<div class="px-6 py-4 border-b border-gray-200 flex items-center justify-between">
|
||||
<h3 class="text-lg font-semibold text-gray-900" id="modal-title">
|
||||
{title}
|
||||
</h3>
|
||||
<button
|
||||
type="button"
|
||||
on:click={close}
|
||||
class="text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-primary-500 rounded-lg p-1"
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Body -->
|
||||
<div class="px-6 py-4 max-h-[70vh] overflow-y-auto">
|
||||
<slot />
|
||||
</div>
|
||||
|
||||
<!-- Footer (optional) -->
|
||||
{#if $$slots.footer}
|
||||
<div class="px-6 py-4 bg-gray-50 border-t border-gray-200 rounded-b-lg">
|
||||
<slot name="footer" />
|
||||
<div class="inline-block px-4 pt-5 pb-4 overflow-hidden text-left align-bottom transition-all transform bg-white rounded-lg shadow-xl sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6">
|
||||
<div class="sm:flex sm:items-start">
|
||||
<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left w-full">
|
||||
<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
|
||||
{title}
|
||||
</h3>
|
||||
<div class="mt-2 text-sm text-gray-500">
|
||||
<slot />
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/stores';
|
||||
import { auth } from '$lib/stores/auth.js';
|
||||
|
||||
import { page } from '$app/stores';
|
||||
|
||||
export let open = false;
|
||||
|
||||
|
||||
// Navigation items based on user role
|
||||
$: navigation = getNavigationForRole($auth.user?.role);
|
||||
|
||||
|
||||
function getNavigationForRole(role: string | undefined) {
|
||||
const baseNavigation = [
|
||||
{
|
||||
@@ -20,7 +20,7 @@
|
||||
icon: 'M9 5H7a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2'
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
if (role === 'ADMIN' || role === 'SUPPORT_MANAGER') {
|
||||
baseNavigation.push(
|
||||
{
|
||||
@@ -45,7 +45,7 @@
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
if (role === 'ADMIN') {
|
||||
baseNavigation.push(
|
||||
{
|
||||
@@ -62,59 +62,35 @@
|
||||
name: 'Auditoría',
|
||||
href: '/audit',
|
||||
icon: 'M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z'
|
||||
},
|
||||
{
|
||||
name: 'Seguridad',
|
||||
href: '/audit/security',
|
||||
icon: 'M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z'
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
return baseNavigation;
|
||||
}
|
||||
|
||||
|
||||
function isCurrentPage(href: string) {
|
||||
return $page.url.pathname === href || ($page.url.pathname.startsWith(href) && href !== '/');
|
||||
return $page.url.pathname === href ||
|
||||
($page.url.pathname.startsWith(href) && href !== '/');
|
||||
}
|
||||
</script>
|
||||
|
||||
<!-- Mobile sidebar backdrop -->
|
||||
{#if open}
|
||||
<div class="fixed inset-0 z-40 lg:hidden">
|
||||
<div
|
||||
class="fixed inset-0 bg-gray-600 bg-opacity-75"
|
||||
role="dialog"
|
||||
tabindex="0"
|
||||
on:click={() => (open = false)}
|
||||
on:keydown={e => e.key === 'Escape' && (open = false)}
|
||||
/>
|
||||
<div class="fixed inset-0 bg-gray-600 bg-opacity-75" on:click={() => open = false}></div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Sidebar -->
|
||||
<div
|
||||
class="fixed inset-y-0 left-0 z-50 w-64 bg-white shadow-lg transform {open
|
||||
? 'translate-x-0'
|
||||
: '-translate-x-full'} transition-transform duration-300 ease-in-out lg:translate-x-0 lg:static lg:inset-0"
|
||||
>
|
||||
<div class="fixed inset-y-0 left-0 z-50 w-64 bg-white shadow-lg transform {open ? 'translate-x-0' : '-translate-x-full'} transition-transform duration-300 ease-in-out lg:translate-x-0 lg:static lg:inset-0">
|
||||
<div class="flex flex-col h-full">
|
||||
<!-- Logo -->
|
||||
<div class="flex items-center justify-between h-16 px-6 bg-primary-600">
|
||||
<div class="flex items-center space-x-2">
|
||||
<div class="w-8 h-8 bg-white rounded-lg flex items-center justify-center">
|
||||
<svg
|
||||
class="w-5 h-5 text-primary-600"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192L5.636 18.364M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z"
|
||||
/>
|
||||
<svg class="w-5 h-5 text-primary-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192L5.636 18.364M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z" />
|
||||
</svg>
|
||||
</div>
|
||||
<div class="text-white">
|
||||
@@ -122,33 +98,28 @@
|
||||
<p class="text-xs text-primary-100">Panel Interno</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<button
|
||||
on:click={() => (open = false)}
|
||||
on:click={() => open = false}
|
||||
class="p-2 rounded-md text-primary-100 hover:text-white hover:bg-primary-500 lg:hidden"
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M6 18L18 6M6 6l12 12"
|
||||
/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Navigation -->
|
||||
<nav class="flex-1 px-4 py-6 space-y-2">
|
||||
{#each navigation as item}
|
||||
<a
|
||||
href={item.href}
|
||||
class="flex items-center space-x-3 px-3 py-2 rounded-md text-sm font-medium transition-colors {isCurrentPage(
|
||||
item.href
|
||||
)
|
||||
? 'bg-primary-100 text-primary-700'
|
||||
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900'}"
|
||||
on:click={() => (open = false)}
|
||||
class="flex items-center space-x-3 px-3 py-2 rounded-md text-sm font-medium transition-colors {
|
||||
isCurrentPage(item.href)
|
||||
? 'bg-primary-100 text-primary-700'
|
||||
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900'
|
||||
}"
|
||||
on:click={() => open = false}
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d={item.icon} />
|
||||
@@ -157,7 +128,7 @@
|
||||
</a>
|
||||
{/each}
|
||||
</nav>
|
||||
|
||||
|
||||
<!-- User info -->
|
||||
<div class="px-4 py-4 border-t border-gray-200">
|
||||
<div class="flex items-center space-x-3">
|
||||
@@ -168,25 +139,15 @@
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<p class="text-sm font-medium text-gray-900 truncate">
|
||||
{$auth.user?.first_name}
|
||||
{$auth.user?.last_name}
|
||||
{$auth.user?.first_name} {$auth.user?.last_name}
|
||||
</p>
|
||||
<p class="text-xs text-gray-500 truncate">
|
||||
{$auth.user?.role === 'ADMIN'
|
||||
? 'Administrador'
|
||||
: $auth.user?.role === 'SUPPORT_MANAGER'
|
||||
? 'Gerente de Soporte'
|
||||
: $auth.user?.role === 'AGENT'
|
||||
? 'Agente'
|
||||
: 'Auditor'}
|
||||
{$auth.user?.role === 'ADMIN' ? 'Administrador' :
|
||||
$auth.user?.role === 'SUPPORT_MANAGER' ? 'Gerente de Soporte' :
|
||||
$auth.user?.role === 'AGENT' ? 'Agente' : 'Auditor'}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Version info -->
|
||||
<div class="px-4 py-2 border-t border-gray-100">
|
||||
<p class="text-xs text-gray-400 text-center">v1.6.0</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
45
frontend-internal/src/lib/stores/api.ts
Normal file
45
frontend-internal/src/lib/stores/api.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import { writable } from 'svelte/store';
|
||||
|
||||
export const api = {
|
||||
async getClients() {
|
||||
const response = await fetch('/api/v1/clients');
|
||||
if (!response.ok) {
|
||||
throw new Error('Error fetching clients');
|
||||
}
|
||||
return await response.json();
|
||||
},
|
||||
|
||||
async createClient(client) {
|
||||
const response = await fetch('/api/v1/clients', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(client),
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Error creating client');
|
||||
}
|
||||
return await response.json();
|
||||
},
|
||||
|
||||
async updateClient(clientId, client) {
|
||||
const response = await fetch(`/api/v1/clients/${clientId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(client),
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Error updating client');
|
||||
}
|
||||
return await response.json();
|
||||
},
|
||||
|
||||
async deleteClient(clientId) {
|
||||
const response = await fetch(`/api/v1/clients/${clientId}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Error deleting client');
|
||||
}
|
||||
return await response.json();
|
||||
},
|
||||
};
|
||||
@@ -9,18 +9,11 @@ interface RequestOptions extends RequestInit {
|
||||
|
||||
async function request<T>(endpoint: string, options: RequestOptions = {}): Promise<T> {
|
||||
const { params, ...init } = options;
|
||||
|
||||
|
||||
let url = `${API_BASE}${endpoint}`;
|
||||
if (params) {
|
||||
// Filtrar parámetros undefined y null
|
||||
const filteredParams = Object.entries(params)
|
||||
.filter(([key, value]) => value !== undefined && value !== null && value !== '')
|
||||
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
|
||||
|
||||
if (Object.keys(filteredParams).length > 0) {
|
||||
const searchParams = new URLSearchParams(filteredParams);
|
||||
url += `?${searchParams.toString()}`;
|
||||
}
|
||||
const searchParams = new URLSearchParams(params);
|
||||
url += `?${searchParams.toString()}`;
|
||||
}
|
||||
|
||||
const authState = get(auth);
|
||||
@@ -42,9 +35,9 @@ async function request<T>(endpoint: string, options: RequestOptions = {}): Promi
|
||||
if (response.status === 401) {
|
||||
// Token expired or invalid
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.removeItem('internal_auth_token');
|
||||
localStorage.removeItem('internal_auth_user');
|
||||
window.location.href = '/login';
|
||||
localStorage.removeItem('internal_auth_token');
|
||||
localStorage.removeItem('internal_auth_user');
|
||||
window.location.href = '/login';
|
||||
}
|
||||
throw new Error('Unauthorized');
|
||||
}
|
||||
@@ -56,68 +49,25 @@ async function request<T>(endpoint: string, options: RequestOptions = {}): Promi
|
||||
|
||||
// Handle empty responses (like 204 No Content)
|
||||
if (response.status === 204) {
|
||||
return {} as T;
|
||||
return {} as T;
|
||||
}
|
||||
|
||||
return response.json();
|
||||
}
|
||||
|
||||
async function downloadFile(endpoint: string, filename: string): Promise<void> {
|
||||
const authState = get(auth);
|
||||
const token = authState.token || (typeof window !== 'undefined' ? localStorage.getItem('internal_auth_token') : null);
|
||||
|
||||
const headers = new Headers();
|
||||
if (token) {
|
||||
headers.set('Authorization', `Bearer ${token}`);
|
||||
}
|
||||
|
||||
const response = await fetch(`${API_BASE}${endpoint}`, {
|
||||
method: 'GET',
|
||||
headers
|
||||
});
|
||||
|
||||
if (response.status === 401) {
|
||||
if (typeof window !== 'undefined') {
|
||||
localStorage.removeItem('internal_auth_token');
|
||||
localStorage.removeItem('internal_auth_user');
|
||||
window.location.href = '/login';
|
||||
}
|
||||
throw new Error('Unauthorized');
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
throw new Error(errorData.detail || `Download error: ${response.statusText}`);
|
||||
}
|
||||
|
||||
// Crear blob y descargar
|
||||
const blob = await response.blob();
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = filename;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
document.body.removeChild(a);
|
||||
window.URL.revokeObjectURL(url);
|
||||
}
|
||||
|
||||
export const api = {
|
||||
get: <T>(endpoint: string, params?: Record<string, string>) =>
|
||||
get: <T>(endpoint: string, params?: Record<string, string>) =>
|
||||
request<T>(endpoint, { method: 'GET', params }),
|
||||
|
||||
post: <T>(endpoint: string, body: any) =>
|
||||
|
||||
post: <T>(endpoint: string, body: any) =>
|
||||
request<T>(endpoint, { method: 'POST', body: JSON.stringify(body) }),
|
||||
|
||||
put: <T>(endpoint: string, body: any) =>
|
||||
|
||||
put: <T>(endpoint: string, body: any) =>
|
||||
request<T>(endpoint, { method: 'PUT', body: JSON.stringify(body) }),
|
||||
|
||||
patch: <T>(endpoint: string, body: any) =>
|
||||
|
||||
patch: <T>(endpoint: string, body: any) =>
|
||||
request<T>(endpoint, { method: 'PATCH', body: JSON.stringify(body) }),
|
||||
|
||||
delete: <T>(endpoint: string) =>
|
||||
request<T>(endpoint, { method: 'DELETE' }),
|
||||
|
||||
downloadFile: (endpoint: string, filename: string) =>
|
||||
downloadFile(endpoint, filename)
|
||||
|
||||
delete: <T>(endpoint: string) =>
|
||||
request<T>(endpoint, { method: 'DELETE' })
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,532 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { api } from '$lib/utils/api';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
import { auth } from '$lib/stores/auth';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
|
||||
// Estado
|
||||
let isLoading = false;
|
||||
let analysis = null;
|
||||
let analysisHours = 24;
|
||||
let selectedThreat = null;
|
||||
let showActionModal = false;
|
||||
let actionType = '';
|
||||
let actionTarget = '';
|
||||
let actionReason = '';
|
||||
let actionDuration = 60;
|
||||
|
||||
// Usuario actual
|
||||
$: currentUser = $auth.user;
|
||||
$: canExecuteActions = currentUser && (currentUser.role === 'ADMIN' || currentUser.role === 'SUPPORT_MANAGER');
|
||||
|
||||
/**
|
||||
* Cargar análisis de seguridad
|
||||
*/
|
||||
async function loadSecurityAnalysis() {
|
||||
isLoading = true;
|
||||
try {
|
||||
analysis = await api.get('/audit/security/analysis', { hours: analysisHours });
|
||||
console.log('Security analysis loaded:', analysis);
|
||||
} catch (e: any) {
|
||||
toast.error('Error cargando análisis de seguridad: ' + (e.message || 'Error desconocido'));
|
||||
} finally {
|
||||
isLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cambiar período de análisis
|
||||
*/
|
||||
function changeAnalysisPeriod(hours: number) {
|
||||
analysisHours = hours;
|
||||
loadSecurityAnalysis();
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtener color según nivel de riesgo
|
||||
*/
|
||||
function getRiskColor(level: string) {
|
||||
const colors: any = {
|
||||
safe: 'bg-green-100 text-green-800 border-green-300',
|
||||
low: 'bg-blue-100 text-blue-800 border-blue-300',
|
||||
medium: 'bg-yellow-100 text-yellow-800 border-yellow-300',
|
||||
high: 'bg-orange-100 text-orange-800 border-orange-300',
|
||||
critical: 'bg-red-100 text-red-800 border-red-300'
|
||||
};
|
||||
return colors[level] || colors.low;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtener color de severidad de amenaza
|
||||
*/
|
||||
function getSeverityColor(severity: string) {
|
||||
const colors: any = {
|
||||
low: 'bg-blue-600 text-white',
|
||||
medium: 'bg-yellow-500 text-white',
|
||||
high: 'bg-orange-600 text-white',
|
||||
critical: 'bg-red-600 text-white'
|
||||
};
|
||||
return colors[severity] || colors.low;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtener icono de tipo de amenaza
|
||||
*/
|
||||
function getThreatIcon(type: string) {
|
||||
const icons: any = {
|
||||
brute_force_attack: 'M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z',
|
||||
privilege_escalation: 'M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z',
|
||||
mass_deletion: 'M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16',
|
||||
account_compromise: 'M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z'
|
||||
};
|
||||
return icons[type] || icons.account_compromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtener texto legible del tipo de amenaza
|
||||
*/
|
||||
function getThreatTypeText(type: string) {
|
||||
const texts: any = {
|
||||
brute_force_attack: 'Ataque de Fuerza Bruta',
|
||||
privilege_escalation: 'Escalada de Privilegios',
|
||||
mass_deletion: 'Eliminación Masiva',
|
||||
account_compromise: 'Cuenta Comprometida'
|
||||
};
|
||||
return texts[type] || type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Abrir modal para acción de seguridad
|
||||
*/
|
||||
function openActionModal(threat: any, action: string) {
|
||||
if (!canExecuteActions) {
|
||||
toast.error('No tienes permisos para ejecutar acciones de seguridad');
|
||||
return;
|
||||
}
|
||||
|
||||
selectedThreat = threat;
|
||||
actionType = action;
|
||||
|
||||
// Pre-llenar campos según el tipo de acción
|
||||
if (action === 'block_ip' && threat.affected_ips.length > 0) {
|
||||
actionTarget = threat.affected_ips[0];
|
||||
actionReason = `Bloqueo automático: ${threat.description}`;
|
||||
} else if (action === 'force_password_reset' && threat.affected_users.length > 0) {
|
||||
actionTarget = threat.affected_users[0];
|
||||
actionReason = `Reseteo de seguridad: ${threat.description}`;
|
||||
} else {
|
||||
actionTarget = '';
|
||||
actionReason = threat.description;
|
||||
}
|
||||
|
||||
showActionModal = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ejecutar acción de seguridad
|
||||
*/
|
||||
async function executeSecurityAction() {
|
||||
if (!actionTarget || !actionReason) {
|
||||
toast.error('Completa todos los campos requeridos');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await api.post('/audit/security/action', {
|
||||
action_type: actionType,
|
||||
target: actionTarget,
|
||||
reason: actionReason,
|
||||
duration_minutes: actionDuration
|
||||
});
|
||||
|
||||
if (response.success) {
|
||||
toast.success(response.message);
|
||||
showActionModal = false;
|
||||
loadSecurityAnalysis(); // Recargar análisis
|
||||
} else {
|
||||
toast.error(response.message);
|
||||
}
|
||||
} catch (e: any) {
|
||||
toast.error('Error ejecutando acción: ' + (e.message || 'Error desconocido'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Formatear fecha
|
||||
*/
|
||||
function formatDate(dateString: string) {
|
||||
const date = new Date(dateString);
|
||||
return new Intl.DateTimeFormat('es-MX', {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
timeZone: 'UTC',
|
||||
timeZoneName: 'short'
|
||||
}).format(date);
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
loadSecurityAnalysis();
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
|
||||
<!-- Header -->
|
||||
<div class="mb-6">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<h1 class="text-2xl font-bold text-gray-900 flex items-center gap-2">
|
||||
<svg class="w-8 h-8 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
|
||||
</svg>
|
||||
Análisis de Seguridad
|
||||
</h1>
|
||||
<p class="mt-1 text-sm text-gray-500">
|
||||
Detección de amenazas y análisis de vulnerabilidades
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
on:click={() => loadSecurityAnalysis()}
|
||||
class="px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 flex items-center gap-2"
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
|
||||
</svg>
|
||||
Actualizar
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Selector de Período -->
|
||||
<div class="bg-white shadow rounded-lg p-4 mb-6">
|
||||
<div class="flex items-center gap-2 mb-2">
|
||||
<svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
<span class="text-sm font-medium text-gray-700">Período de Análisis</span>
|
||||
</div>
|
||||
<div class="flex flex-wrap gap-2">
|
||||
<button
|
||||
on:click={() => changeAnalysisPeriod(24)}
|
||||
class="px-4 py-2 rounded-lg text-sm font-medium transition-colors {analysisHours === 24 ? 'bg-indigo-600 text-white' : 'bg-gray-100 text-gray-700 hover:bg-indigo-50'}"
|
||||
>
|
||||
Últimas 24 horas
|
||||
</button>
|
||||
<button
|
||||
on:click={() => changeAnalysisPeriod(48)}
|
||||
class="px-4 py-2 rounded-lg text-sm font-medium transition-colors {analysisHours === 48 ? 'bg-indigo-600 text-white' : 'bg-gray-100 text-gray-700 hover:bg-indigo-50'}"
|
||||
>
|
||||
Últimas 48 horas
|
||||
</button>
|
||||
<button
|
||||
on:click={() => changeAnalysisPeriod(168)}
|
||||
class="px-4 py-2 rounded-lg text-sm font-medium transition-colors {analysisHours === 168 ? 'bg-indigo-600 text-white' : 'bg-gray-100 text-gray-700 hover:bg-indigo-50'}"
|
||||
>
|
||||
Última semana
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{#if isLoading}
|
||||
<div class="flex justify-center items-center py-12">
|
||||
<div class="animate-spin rounded-full h-12 w-12 border-b-2 border-gray-600"></div>
|
||||
</div>
|
||||
{:else if analysis}
|
||||
<!-- Resumen de Riesgo -->
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6 border-l-4 {getRiskColor(analysis.overall_risk_level)}">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<h3 class="text-lg font-semibold text-gray-900">Nivel de Riesgo General</h3>
|
||||
<p class="text-sm text-gray-600 mt-1">Análisis de {analysis.analysis_period_hours} horas</p>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<span class="inline-block px-4 py-2 text-2xl font-bold rounded-lg {getRiskColor(analysis.overall_risk_level)}">
|
||||
{analysis.overall_risk_level.toUpperCase()}
|
||||
</span>
|
||||
<p class="text-xs text-gray-500 mt-1">Generado: {formatDate(analysis.generated_at)}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Estadísticas Rápidas -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm text-gray-500">Amenazas Detectadas</p>
|
||||
<p class="text-2xl font-bold text-gray-800">{analysis.total_threats_detected}</p>
|
||||
</div>
|
||||
<svg class="w-10 h-10 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm text-gray-500">Intentos Fallidos</p>
|
||||
<p class="text-2xl font-bold text-gray-700">{analysis.failed_login_attempts}</p>
|
||||
</div>
|
||||
<svg class="w-10 h-10 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm text-gray-500">IPs Sospechosas</p>
|
||||
<p class="text-2xl font-bold text-gray-700">{analysis.suspicious_ips_count}</p>
|
||||
</div>
|
||||
<svg class="w-10 h-10 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 12a9 9 0 01-9 9m9-9a9 9 0 00-9-9m9 9H3m9 9a9 9 0 01-9-9m9 9c1.657 0 3-4.03 3-9s-1.343-9-3-9m0 18c-1.657 0-3-4.03-3-9s1.343-9 3-9m-9 9a9 9 0 019-9" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm text-gray-500">Acciones Críticas</p>
|
||||
<p class="text-2xl font-bold text-gray-700">{analysis.critical_actions_count}</p>
|
||||
</div>
|
||||
<svg class="w-10 h-10 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Recomendaciones Generales -->
|
||||
{#if analysis.recommended_actions && analysis.recommended_actions.length > 0}
|
||||
<div class="bg-gray-50 border border-gray-200 rounded-lg p-4 mb-6">
|
||||
<div class="flex items-start gap-3">
|
||||
<svg class="w-6 h-6 text-gray-600 flex-shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||
</svg>
|
||||
<div class="flex-1">
|
||||
<h4 class="text-sm font-semibold text-gray-900 mb-2">Acciones Recomendadas</h4>
|
||||
<ul class="space-y-1">
|
||||
{#each analysis.recommended_actions as action}
|
||||
<li class="text-sm text-gray-700 flex items-start gap-2">
|
||||
<svg class="w-4 h-4 text-gray-600 flex-shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
|
||||
</svg>
|
||||
{action}
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Lista de Amenazas -->
|
||||
{#if analysis.threats && analysis.threats.length > 0}
|
||||
<div class="space-y-4">
|
||||
<h3 class="text-lg font-semibold text-gray-900">Amenazas Detectadas</h3>
|
||||
|
||||
{#each analysis.threats as threat}
|
||||
<div class="bg-white shadow rounded-lg p-6 border-l-4 {threat.severity === 'critical' ? 'border-gray-900' : threat.severity === 'high' ? 'border-gray-600' : threat.severity === 'medium' ? 'border-gray-400' : 'border-gray-200'}">
|
||||
<!-- Header de Amenaza -->
|
||||
<div class="flex items-start justify-between mb-4">
|
||||
<div class="flex items-start gap-3 flex-1">
|
||||
<div class="p-2 rounded-lg {threat.severity === 'critical' ? 'bg-gray-100' : threat.severity === 'high' ? 'bg-gray-100' : threat.severity === 'medium' ? 'bg-gray-100' : 'bg-gray-50'}">
|
||||
<svg class="w-6 h-6 {threat.severity === 'critical' ? 'text-gray-900' : threat.severity === 'high' ? 'text-gray-700' : threat.severity === 'medium' ? 'text-gray-600' : 'text-gray-500'}" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d={getThreatIcon(threat.type)} />
|
||||
</svg>
|
||||
</div>
|
||||
<div class="flex-1">
|
||||
<div class="flex items-center gap-2 mb-1">
|
||||
<h4 class="text-lg font-semibold text-gray-900">{getThreatTypeText(threat.type)}</h4>
|
||||
<span class="px-2 py-1 text-xs font-semibold rounded-full {getSeverityColor(threat.severity)}">
|
||||
{threat.severity.toUpperCase()}
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-sm text-gray-700">{threat.description}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Detalles -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-4 text-sm">
|
||||
<div>
|
||||
<span class="font-medium text-gray-600">Ocurrencias:</span>
|
||||
<span class="ml-2 text-gray-900 font-semibold">{threat.occurrences}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="font-medium text-gray-600">Primera detección:</span>
|
||||
<span class="ml-2 text-gray-900">{formatDate(threat.first_seen)}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="font-medium text-gray-600">Última detección:</span>
|
||||
<span class="ml-2 text-gray-900">{formatDate(threat.last_seen)}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- IPs y Usuarios Afectados -->
|
||||
{#if threat.affected_ips.length > 0 || threat.affected_users.length > 0}
|
||||
<div class="mb-4 text-sm">
|
||||
{#if threat.affected_ips.length > 0}
|
||||
<div class="mb-2">
|
||||
<span class="font-medium text-gray-600">IPs involucradas:</span>
|
||||
<div class="mt-1 flex flex-wrap gap-1">
|
||||
{#each threat.affected_ips as ip}
|
||||
<code class="px-2 py-1 bg-gray-100 rounded text-xs font-mono">{ip}</code>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{#if threat.affected_users.length > 0}
|
||||
<div>
|
||||
<span class="font-medium text-gray-600">Usuarios afectados:</span>
|
||||
<div class="mt-1 flex flex-wrap gap-1">
|
||||
{#each threat.affected_users as user}
|
||||
<span class="px-2 py-1 bg-gray-100 rounded text-xs">{user}</span>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Recomendaciones -->
|
||||
{#if threat.recommendations && threat.recommendations.length > 0}
|
||||
<div class="bg-gray-50 rounded-lg p-3 mb-4">
|
||||
<p class="text-xs font-semibold text-gray-700 mb-2">Recomendaciones:</p>
|
||||
<ul class="space-y-1">
|
||||
{#each threat.recommendations as rec}
|
||||
<li class="text-xs text-gray-600 flex items-start gap-2">
|
||||
<svg class="w-3 h-3 text-gray-400 flex-shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
|
||||
</svg>
|
||||
{rec}
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Acciones -->
|
||||
{#if canExecuteActions}
|
||||
<div class="flex flex-wrap gap-2">
|
||||
{#if threat.affected_ips.length > 0}
|
||||
<button
|
||||
on:click={() => openActionModal(threat, 'block_ip')}
|
||||
class="px-3 py-1.5 bg-red-600 text-white text-sm rounded hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 flex items-center gap-1"
|
||||
>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
|
||||
</svg>
|
||||
Bloquear IP
|
||||
</button>
|
||||
{/if}
|
||||
{#if threat.affected_users.length > 0}
|
||||
<button
|
||||
on:click={() => openActionModal(threat, 'force_password_reset')}
|
||||
class="px-3 py-1.5 bg-orange-600 text-white text-sm rounded hover:bg-orange-700 focus:outline-none focus:ring-2 focus:ring-orange-500 flex items-center gap-1"
|
||||
>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" />
|
||||
</svg>
|
||||
Resetear Contraseña
|
||||
</button>
|
||||
{/if}
|
||||
<button
|
||||
on:click={() => openActionModal(threat, 'notify_admin')}
|
||||
class="px-3 py-1.5 bg-blue-600 text-white text-sm rounded hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 flex items-center gap-1"
|
||||
>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 17h5l-1.405-1.405A2.032 2.032 0 0118 14.158V11a6.002 6.002 0 00-4-5.659V5a2 2 0 10-4 0v.341C7.67 6.165 6 8.388 6 11v3.159c0 .538-.214 1.055-.595 1.436L4 17h5m6 0v1a3 3 0 11-6 0v-1m6 0H9" />
|
||||
</svg>
|
||||
Notificar Admin
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<!-- No hay amenazas -->
|
||||
<div class="bg-gray-50 border border-gray-200 rounded-lg p-8 text-center">
|
||||
<svg class="w-16 h-16 text-gray-500 mx-auto mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
|
||||
</svg>
|
||||
<h3 class="text-lg font-semibold text-gray-900 mb-2">Sistema Seguro</h3>
|
||||
<p class="text-sm text-gray-600">No se detectaron amenazas en el período analizado</p>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<!-- Modal de Acción de Seguridad -->
|
||||
{#if showActionModal}
|
||||
<Modal open={showActionModal} size="lg" title="Ejecutar Acción de Seguridad" on:close={() => showActionModal = false}>
|
||||
<div class="space-y-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Tipo de Acción</label>
|
||||
<input
|
||||
type="text"
|
||||
bind:value={actionType}
|
||||
readonly
|
||||
class="block w-full rounded-md border-gray-300 bg-gray-50 shadow-sm sm:text-sm"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">
|
||||
Objetivo {#if actionType === 'block_ip'}(IP){:else if actionType === 'force_password_reset'}(Email){/if}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
bind:value={actionTarget}
|
||||
placeholder="IP o email del usuario"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-gray-500 focus:ring-gray-500 sm:text-sm"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Razón</label>
|
||||
<textarea
|
||||
bind:value={actionReason}
|
||||
rows="3"
|
||||
placeholder="Razón de la acción de seguridad"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-gray-500 focus:ring-gray-500 sm:text-sm"
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
{#if actionType === 'block_ip'}
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Duración del Bloqueo (minutos)</label>
|
||||
<input
|
||||
type="number"
|
||||
bind:value={actionDuration}
|
||||
min="1"
|
||||
max="10080"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-gray-500 focus:ring-gray-500 sm:text-sm"
|
||||
/>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="flex justify-end gap-3 pt-4 border-t">
|
||||
<button
|
||||
on:click={() => showActionModal = false}
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-gray-500"
|
||||
>
|
||||
Cancelar
|
||||
</button>
|
||||
<button
|
||||
on:click={executeSecurityAction}
|
||||
class="px-4 py-2 text-sm font-medium text-white bg-indigo-600 rounded-md hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500"
|
||||
>
|
||||
Ejecutar Acción
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
{/if}
|
||||
@@ -43,15 +43,11 @@
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
if (editingTenant) {
|
||||
// Asegurarse de enviar el campo "status" correctamente
|
||||
const updatedData = { ...formData, status: formData.is_active ? 'active' : 'inactive' };
|
||||
await api.put(`/tenants/${editingTenant.id}`, updatedData);
|
||||
toast.success(`Cliente ${formData.is_active ? 'activado' : 'desactivado'} correctamente`);
|
||||
await api.put(`/tenants/${editingTenant.id}`, formData);
|
||||
toast.success('Cliente actualizado');
|
||||
} else {
|
||||
// Asegurarse de enviar el campo "status" al crear un cliente
|
||||
const newData = { ...formData, status: formData.is_active ? 'active' : 'inactive' };
|
||||
await api.post('/tenants/', newData);
|
||||
toast.success('Cliente creado correctamente');
|
||||
await api.post('/tenants/', formData);
|
||||
toast.success('Cliente creado');
|
||||
}
|
||||
showModal = false;
|
||||
loadTenants();
|
||||
@@ -156,11 +152,6 @@
|
||||
<button type="button" on:click={() => showModal = false} class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:col-start-1 sm:text-sm">
|
||||
Cancelar
|
||||
</button>
|
||||
{#if editingTenant}
|
||||
<button type="button" on:click={async () => { await api.delete(`/tenants/${editingTenant.id}`); toast.success('Cliente eliminado'); showModal = false; loadTenants(); }} class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:col-start-1 sm:text-sm">
|
||||
Eliminar
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
@@ -1,561 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
import { api } from '$lib/utils/api';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
import Modal from '$lib/components/Modal.svelte';
|
||||
|
||||
let tickets = [];
|
||||
let categories = [];
|
||||
let systems = [];
|
||||
let users = [];
|
||||
let isLoading = false;
|
||||
let showModal = false;
|
||||
let showEditModal = false;
|
||||
let showDeleteModal = false;
|
||||
let selectedTicket = null;
|
||||
|
||||
// Filtros
|
||||
let filterStatus = '';
|
||||
let filterPriority = '';
|
||||
|
||||
// Form para editar
|
||||
let editFormData = {
|
||||
status: '',
|
||||
priority: '',
|
||||
assigned_to: ''
|
||||
};
|
||||
|
||||
let formData = {
|
||||
subject: '',
|
||||
description: '',
|
||||
category_id: '',
|
||||
affected_system_id: '',
|
||||
priority: 'MEDIUM'
|
||||
};
|
||||
|
||||
const STATUSES = [
|
||||
{ value: 'NEW', label: 'Nuevo', color: 'blue' },
|
||||
{ value: 'IN_PROGRESS', label: 'En Progreso', color: 'indigo' },
|
||||
{ value: 'WAITING_CUSTOMER', label: 'Esperando Cliente', color: 'orange' },
|
||||
{ value: 'RESOLVED', label: 'Resuelto', color: 'green' },
|
||||
{ value: 'CLOSED', label: 'Cerrado', color: 'gray' },
|
||||
{ value: 'REOPENED', label: 'Reabierto', color: 'red' }
|
||||
];
|
||||
|
||||
const PRIORITIES = [
|
||||
{ value: 'LOW', label: 'Baja', color: 'gray' },
|
||||
{ value: 'MEDIUM', label: 'Media', color: 'blue' },
|
||||
{ value: 'HIGH', label: 'Alta', color: 'orange' },
|
||||
{ value: 'URGENT', label: 'Urgente', color: 'red' }
|
||||
];
|
||||
|
||||
// Ajustar la función loadData para asegurar que los filtros se envíen correctamente
|
||||
async function loadData() {
|
||||
isLoading = true;
|
||||
try {
|
||||
const [ticketsData, categoriesData, systemsData, usersData] = await Promise.all([
|
||||
api.get('/tickets/', {
|
||||
params: {
|
||||
status: filterStatus || undefined,
|
||||
priority: filterPriority || undefined
|
||||
}
|
||||
}),
|
||||
api.get('/categories/'),
|
||||
api.get('/systems/'),
|
||||
api.get('/users/')
|
||||
]);
|
||||
tickets = ticketsData;
|
||||
categories = categoriesData;
|
||||
systems = systemsData;
|
||||
users = usersData;
|
||||
} catch (e) {
|
||||
toast.error('Error cargando datos: ' + (e.message || 'Error desconocido'));
|
||||
} finally {
|
||||
isLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Asegurar que los filtros se apliquen al cambiar su valor
|
||||
function applyFilters() {
|
||||
loadData();
|
||||
}
|
||||
|
||||
function openCreateModal() {
|
||||
selectedTicket = null;
|
||||
formData = {
|
||||
subject: '',
|
||||
description: '',
|
||||
category_id: '',
|
||||
affected_system_id: '',
|
||||
priority: 'MEDIUM'
|
||||
};
|
||||
showModal = true;
|
||||
}
|
||||
|
||||
function viewTicket(ticket) {
|
||||
// Navegar a la página de detalle del ticket
|
||||
goto(`/tickets/${ticket.id}`);
|
||||
}
|
||||
|
||||
function openEditModal(ticket) {
|
||||
selectedTicket = ticket;
|
||||
editFormData = {
|
||||
status: ticket.status,
|
||||
priority: ticket.priority,
|
||||
assigned_to: ticket.assigned_to || ''
|
||||
};
|
||||
showEditModal = true;
|
||||
}
|
||||
|
||||
function openDeleteModal(ticket) {
|
||||
selectedTicket = ticket;
|
||||
showDeleteModal = true;
|
||||
}
|
||||
|
||||
async function handleDelete() {
|
||||
if (!selectedTicket) return;
|
||||
|
||||
try {
|
||||
await api.delete(`/tickets/${selectedTicket.id}`);
|
||||
toast.success('Ticket eliminado exitosamente');
|
||||
showDeleteModal = false;
|
||||
selectedTicket = null;
|
||||
loadData();
|
||||
} catch (e) {
|
||||
toast.error(e.message || 'Error eliminando ticket');
|
||||
}
|
||||
}
|
||||
|
||||
async function handleUpdate() {
|
||||
try {
|
||||
const payload = {};
|
||||
|
||||
if (editFormData.status !== selectedTicket.status) {
|
||||
payload.status = editFormData.status;
|
||||
}
|
||||
if (editFormData.priority !== selectedTicket.priority) {
|
||||
payload.priority = editFormData.priority;
|
||||
}
|
||||
if (editFormData.assigned_to !== selectedTicket.assigned_to) {
|
||||
payload.assigned_to = editFormData.assigned_to || null;
|
||||
}
|
||||
|
||||
if (Object.keys(payload).length === 0) {
|
||||
toast.info('No hay cambios para guardar');
|
||||
showEditModal = false;
|
||||
return;
|
||||
}
|
||||
|
||||
await api.patch(`/tickets/${selectedTicket.id}`, payload);
|
||||
toast.success('Ticket actualizado exitosamente');
|
||||
showEditModal = false;
|
||||
loadData();
|
||||
} catch (e) {
|
||||
toast.error(e.message || 'Error actualizando ticket');
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
const payload = {
|
||||
subject: formData.subject,
|
||||
description: formData.description,
|
||||
category_id: formData.category_id || null,
|
||||
affected_system_id: formData.affected_system_id || null,
|
||||
priority: formData.priority
|
||||
};
|
||||
|
||||
await api.post('/tickets/', payload);
|
||||
toast.success('Ticket creado exitosamente');
|
||||
showModal = false;
|
||||
loadData();
|
||||
} catch (e) {
|
||||
toast.error(e.message || 'Error creando ticket');
|
||||
}
|
||||
}
|
||||
|
||||
function getStatusBadge(status) {
|
||||
const statusObj = STATUSES.find(s => s.value === status);
|
||||
return statusObj || { label: status, color: 'gray' };
|
||||
}
|
||||
|
||||
function getPriorityBadge(priority) {
|
||||
const priorityObj = PRIORITIES.find(p => p.value === priority);
|
||||
return priorityObj || { label: priority, color: 'gray' };
|
||||
}
|
||||
|
||||
function getCategoryName(id) {
|
||||
if (!id) return '-';
|
||||
const cat = categories.find(c => c.id === id);
|
||||
return cat ? cat.name : '-';
|
||||
}
|
||||
|
||||
function getSystemName(id) {
|
||||
if (!id) return '-';
|
||||
const sys = systems.find(s => s.id === id);
|
||||
return sys ? sys.name : '-';
|
||||
}
|
||||
|
||||
function getUserName(id) {
|
||||
if (!id) return '-';
|
||||
const user = users.find(u => u.id === id);
|
||||
return user ? `${user.first_name} ${user.last_name}` : '-';
|
||||
}
|
||||
|
||||
function formatDate(dateString) {
|
||||
if (!dateString) return '-';
|
||||
const date = new Date(dateString);
|
||||
return date.toLocaleDateString('es-ES', {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
onMount(loadData);
|
||||
</script>
|
||||
|
||||
<div class="px-4 py-8 mx-auto max-w-7xl sm:px-6 lg:px-8">
|
||||
<div class="sm:flex sm:items-center">
|
||||
<div class="sm:flex-auto">
|
||||
<h1 class="text-xl font-semibold text-gray-900">Tickets de Soporte</h1>
|
||||
<p class="mt-2 text-sm text-gray-700">Gestión de tickets del sistema de mesa de ayuda.</p>
|
||||
</div>
|
||||
<div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
|
||||
<button
|
||||
type="button"
|
||||
on:click={openCreateModal}
|
||||
class="inline-flex items-center justify-center px-4 py-2 text-sm font-medium text-white bg-indigo-600 border border-transparent rounded-md shadow-sm hover:bg-indigo-700 sm:w-auto"
|
||||
>
|
||||
Nuevo Ticket
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filtros -->
|
||||
<div class="mt-6 bg-white shadow sm:rounded-lg p-4">
|
||||
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
|
||||
<div>
|
||||
<label for="filterStatus" class="block text-sm font-medium text-gray-700">Estado</label>
|
||||
<select
|
||||
id="filterStatus"
|
||||
bind:value={filterStatus}
|
||||
on:change={applyFilters}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
<option value="">Todos</option>
|
||||
{#each STATUSES as status}
|
||||
<option value={status.value}>{status.label}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="filterPriority" class="block text-sm font-medium text-gray-700">Prioridad</label>
|
||||
<select
|
||||
id="filterPriority"
|
||||
bind:value={filterPriority}
|
||||
on:change={applyFilters}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
<option value="">Todas</option>
|
||||
{#each PRIORITIES as priority}
|
||||
<option value={priority.value}>{priority.label}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="flex items-end">
|
||||
<button
|
||||
on:click={loadData}
|
||||
class="w-full inline-flex justify-center items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
|
||||
>
|
||||
Actualizar
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tabla de Tickets -->
|
||||
<div class="mt-8 flex flex-col">
|
||||
<div class="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
|
||||
<div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
|
||||
<div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
|
||||
<table class="min-w-full divide-y divide-gray-300">
|
||||
<thead class="bg-gray-50">
|
||||
<tr>
|
||||
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Ticket</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Asunto</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Estado</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Prioridad</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Categoría</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Asignado a</th>
|
||||
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Creado</th>
|
||||
<th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
|
||||
<span class="sr-only">Acciones</span>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-gray-200 bg-white">
|
||||
{#if isLoading}
|
||||
<tr><td colspan="8" class="text-center py-4">Cargando...</td></tr>
|
||||
{:else if tickets.length === 0}
|
||||
<tr><td colspan="8" class="text-center py-4">No hay tickets registrados</td></tr>
|
||||
{:else}
|
||||
{#each tickets as ticket}
|
||||
<tr
|
||||
class="hover:bg-gray-50 cursor-pointer"
|
||||
on:click={() => viewTicket(ticket)}
|
||||
>
|
||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
|
||||
{ticket.ticket_number || ticket.id.substring(0, 8)}
|
||||
</td>
|
||||
<td class="px-3 py-4 text-sm text-gray-900">
|
||||
<div class="font-medium">{ticket.subject}</div>
|
||||
<div class="text-gray-500 truncate max-w-xs">{ticket.description}</div>
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-3 py-4 text-sm">
|
||||
<span class="inline-flex rounded-full px-2 text-xs font-semibold leading-5 bg-{getStatusBadge(ticket.status).color}-100 text-{getStatusBadge(ticket.status).color}-800">
|
||||
{getStatusBadge(ticket.status).label}
|
||||
</span>
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-3 py-4 text-sm">
|
||||
<span class="inline-flex rounded-full px-2 text-xs font-semibold leading-5 bg-{getPriorityBadge(ticket.priority).color}-100 text-{getPriorityBadge(ticket.priority).color}-800">
|
||||
{getPriorityBadge(ticket.priority).label}
|
||||
</span>
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
|
||||
{getCategoryName(ticket.category_id)}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
|
||||
{getUserName(ticket.assigned_to)}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
|
||||
{formatDate(ticket.created_at)}
|
||||
</td>
|
||||
<td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6 space-x-2">
|
||||
<button
|
||||
on:click|stopPropagation={() => openEditModal(ticket)}
|
||||
class="text-indigo-600 hover:text-indigo-900"
|
||||
>
|
||||
Editar
|
||||
</button>
|
||||
<button
|
||||
on:click|stopPropagation={() => openDeleteModal(ticket)}
|
||||
class="text-red-600 hover:text-red-900"
|
||||
>
|
||||
Eliminar
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
{/if}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal Crear Ticket -->
|
||||
<Modal open={showModal} title="Nuevo Ticket" on:close={() => showModal = false}>
|
||||
<form on:submit|preventDefault={handleSubmit} class="space-y-4">
|
||||
<div>
|
||||
<label for="subject" class="block text-sm font-medium text-gray-700">Asunto *</label>
|
||||
<input
|
||||
type="text"
|
||||
id="subject"
|
||||
bind:value={formData.subject}
|
||||
required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
placeholder="Breve descripción del problema"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="description" class="block text-sm font-medium text-gray-700">Descripción *</label>
|
||||
<textarea
|
||||
id="description"
|
||||
bind:value={formData.description}
|
||||
required
|
||||
rows="4"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
placeholder="Describe el problema en detalle..."
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label for="category" class="block text-sm font-medium text-gray-700">Categoría</label>
|
||||
<select
|
||||
id="category"
|
||||
bind:value={formData.category_id}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
<option value="">-- Seleccionar --</option>
|
||||
{#each categories as category}
|
||||
<option value={category.id}>{category.name}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="system" class="block text-sm font-medium text-gray-700">Sistema Afectado</label>
|
||||
<select
|
||||
id="system"
|
||||
bind:value={formData.affected_system_id}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
<option value="">-- Seleccionar --</option>
|
||||
{#each systems as system}
|
||||
<option value={system.id}>{system.name}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="priority" class="block text-sm font-medium text-gray-700">Prioridad *</label>
|
||||
<select
|
||||
id="priority"
|
||||
bind:value={formData.priority}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
{#each PRIORITIES as priority}
|
||||
<option value={priority.value}>{priority.label}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mt-5 sm:mt-6 sm:grid sm:grid-cols-2 sm:gap-3 sm:grid-flow-row-dense">
|
||||
<button
|
||||
type="submit"
|
||||
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-indigo-600 text-base font-medium text-white hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:col-start-2 sm:text-sm"
|
||||
>
|
||||
Crear Ticket
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
on:click={() => showModal = false}
|
||||
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:col-start-1 sm:text-sm"
|
||||
>
|
||||
Cancelar
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
<!-- Modal Editar Ticket -->
|
||||
<Modal open={showEditModal} title="Editar Ticket #{selectedTicket?.ticket_number || ''}" on:close={() => showEditModal = false}>
|
||||
<form on:submit|preventDefault={handleUpdate} class="space-y-4">
|
||||
<div>
|
||||
<label for="editStatus" class="block text-sm font-medium text-gray-700">Estado</label>
|
||||
<select
|
||||
id="editStatus"
|
||||
bind:value={editFormData.status}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
{#each STATUSES as status}
|
||||
<option value={status.value}>{status.label}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="editPriority" class="block text-sm font-medium text-gray-700">Prioridad</label>
|
||||
<select
|
||||
id="editPriority"
|
||||
bind:value={editFormData.priority}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
{#each PRIORITIES as priority}
|
||||
<option value={priority.value}>{priority.label}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="editAssigned" class="block text-sm font-medium text-gray-700">Asignar a</label>
|
||||
<select
|
||||
id="editAssigned"
|
||||
bind:value={editFormData.assigned_to}
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
>
|
||||
<option value="">-- Sin asignar --</option>
|
||||
{#each users.filter(u => u.role === 'AGENT' || u.role === 'SUPPORT_MANAGER' || u.role === 'ADMIN') as user}
|
||||
<option value={user.id}>{user.first_name} {user.last_name} ({user.role})</option>
|
||||
{/each}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="bg-gray-50 p-3 rounded">
|
||||
<p class="text-sm text-gray-600"><strong>Asunto:</strong> {selectedTicket?.subject}</p>
|
||||
<p class="text-sm text-gray-600 mt-1"><strong>Creado por:</strong> {getUserName(selectedTicket?.created_by)}</p>
|
||||
</div>
|
||||
|
||||
<div class="mt-5 sm:mt-6 sm:grid sm:grid-cols-2 sm:gap-3 sm:grid-flow-row-dense">
|
||||
<button
|
||||
type="submit"
|
||||
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-indigo-600 text-base font-medium text-white hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:col-start-2 sm:text-sm"
|
||||
>
|
||||
Guardar Cambios
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
on:click={() => showEditModal = false}
|
||||
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:col-start-1 sm:text-sm"
|
||||
>
|
||||
Cancelar
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
<!-- Modal Eliminar Ticket -->
|
||||
<Modal open={showDeleteModal} title="Eliminar Ticket" on:close={() => showDeleteModal = false}>
|
||||
<div class="space-y-4">
|
||||
<div class="bg-red-50 border border-red-200 rounded-md p-4">
|
||||
<div class="flex">
|
||||
<div class="flex-shrink-0">
|
||||
<svg class="h-5 w-5 text-red-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
|
||||
</svg>
|
||||
</div>
|
||||
<div class="ml-3">
|
||||
<h3 class="text-sm font-medium text-red-800">
|
||||
¿Estás seguro de eliminar este ticket?
|
||||
</h3>
|
||||
<div class="mt-2 text-sm text-red-700">
|
||||
<p>Esta acción no se puede deshacer. Se eliminarán también todos los comentarios y adjuntos asociados.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-gray-50 p-3 rounded">
|
||||
<p class="text-sm text-gray-600"><strong>Ticket:</strong> {selectedTicket?.ticket_number}</p>
|
||||
<p class="text-sm text-gray-600 mt-1"><strong>Asunto:</strong> {selectedTicket?.subject}</p>
|
||||
</div>
|
||||
|
||||
<div class="mt-5 sm:mt-6 sm:grid sm:grid-cols-2 sm:gap-3 sm:grid-flow-row-dense">
|
||||
<button
|
||||
type="button"
|
||||
on:click={handleDelete}
|
||||
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:col-start-2 sm:text-sm"
|
||||
>
|
||||
Sí, Eliminar
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
on:click={() => showDeleteModal = false}
|
||||
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:col-start-1 sm:text-sm"
|
||||
>
|
||||
Cancelar
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
@@ -1,402 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { goto } from '$app/navigation';
|
||||
import { page } from '$app/stores';
|
||||
import { toast } from '$lib/stores/toast';
|
||||
import { api } from '$lib/utils/api';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
let ticketId: string;
|
||||
let ticket = null;
|
||||
let comments = [];
|
||||
let attachments = [];
|
||||
let users = [];
|
||||
let isLoading = false;
|
||||
let newComment = '';
|
||||
let isSubmittingComment = false;
|
||||
let pollingInterval: any = null;
|
||||
|
||||
const STATUSES = [
|
||||
{ value: 'NEW', label: 'Nuevo', color: 'blue' },
|
||||
{ value: 'IN_PROGRESS', label: 'En Progreso', color: 'indigo' },
|
||||
{ value: 'WAITING_CUSTOMER', label: 'Esperando Cliente', color: 'orange' },
|
||||
{ value: 'RESOLVED', label: 'Resuelto', color: 'green' },
|
||||
{ value: 'CLOSED', label: 'Cerrado', color: 'gray' },
|
||||
{ value: 'REOPENED', label: 'Reabierto', color: 'red' }
|
||||
];
|
||||
|
||||
const PRIORITIES = [
|
||||
{ value: 'LOW', label: 'Baja', color: 'gray' },
|
||||
{ value: 'MEDIUM', label: 'Media', color: 'blue' },
|
||||
{ value: 'HIGH', label: 'Alta', color: 'orange' },
|
||||
{ value: 'URGENT', label: 'Urgente', color: 'red' }
|
||||
];
|
||||
|
||||
async function loadComments() {
|
||||
try {
|
||||
const commentsData = await api.get(`/tickets/${ticketId}/comments`);
|
||||
comments = commentsData;
|
||||
} catch (e) {
|
||||
// No mostrar error en polling silencioso
|
||||
console.error('Error recargando comentarios:', e);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadData() {
|
||||
isLoading = true;
|
||||
try {
|
||||
const [ticketData, commentsData, attachmentsData, usersData] = await Promise.all([
|
||||
api.get(`/tickets/${ticketId}`),
|
||||
api.get(`/tickets/${ticketId}/comments`),
|
||||
api.get(`/tickets/${ticketId}/attachments`),
|
||||
api.get('/users/')
|
||||
]);
|
||||
ticket = ticketData;
|
||||
comments = commentsData;
|
||||
attachments = attachmentsData;
|
||||
users = usersData;
|
||||
} catch (e) {
|
||||
toast.error('Error cargando ticket: ' + (e.message || 'Error desconocido'));
|
||||
} finally {
|
||||
isLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function handleAddComment() {
|
||||
if (!newComment.trim()) return;
|
||||
|
||||
isSubmittingComment = true;
|
||||
try {
|
||||
const comment = await api.post(`/tickets/${ticketId}/comments`, {
|
||||
content: newComment.trim(),
|
||||
is_internal: false
|
||||
});
|
||||
comments = [...comments, comment];
|
||||
newComment = '';
|
||||
toast.success('Comentario agregado');
|
||||
} catch (e) {
|
||||
toast.error(e.message || 'Error al agregar comentario');
|
||||
} finally {
|
||||
isSubmittingComment = false;
|
||||
}
|
||||
}
|
||||
|
||||
function getStatusBadge(status) {
|
||||
const statusObj = STATUSES.find(s => s.value === status);
|
||||
return statusObj || { label: status, color: 'gray' };
|
||||
}
|
||||
|
||||
function getPriorityBadge(priority) {
|
||||
const priorityObj = PRIORITIES.find(p => p.value === priority);
|
||||
return priorityObj || { label: priority, color: 'gray' };
|
||||
}
|
||||
|
||||
function getUserName(id) {
|
||||
if (!id) return 'Desconocido';
|
||||
const user = users.find(u => u.id === id);
|
||||
return user ? `${user.first_name} ${user.last_name}` : 'Desconocido';
|
||||
}
|
||||
|
||||
function formatDate(dateString) {
|
||||
if (!dateString) return '-';
|
||||
const date = new Date(dateString);
|
||||
return date.toLocaleString('es-ES', {
|
||||
day: '2-digit',
|
||||
month: '2-digit',
|
||||
year: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
async function handleDownloadAttachment(attachment: any) {
|
||||
try {
|
||||
await api.downloadFile(
|
||||
`/tickets/${ticketId}/attachments/${attachment.id}/download`,
|
||||
attachment.original_filename
|
||||
);
|
||||
toast.success('Descarga iniciada');
|
||||
} catch (error) {
|
||||
console.error('Download error:', error);
|
||||
toast.error('Error al descargar el archivo');
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
ticketId = $page.params.id;
|
||||
if (ticketId) {
|
||||
loadData();
|
||||
// Polling cada 3 segundos
|
||||
pollingInterval = setInterval(() => {
|
||||
loadComments();
|
||||
}, 3000);
|
||||
}
|
||||
|
||||
// Cleanup cuando se desmonte el componente
|
||||
return () => {
|
||||
if (pollingInterval) {
|
||||
clearInterval(pollingInterval);
|
||||
}
|
||||
};
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="px-4 py-8 mx-auto max-w-7xl sm:px-6 lg:px-8">
|
||||
{#if isLoading}
|
||||
<div class="text-center py-12">
|
||||
<div class="inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-indigo-600" />
|
||||
<p class="mt-2 text-gray-600">Cargando ticket...</p>
|
||||
</div>
|
||||
{:else if ticket}
|
||||
<!-- Breadcrumb -->
|
||||
<div class="flex items-center space-x-2 text-sm text-gray-500 mb-6">
|
||||
<a href="/tickets" class="hover:text-indigo-600">Tickets</a>
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
|
||||
</svg>
|
||||
<span>#{ticket.ticket_number || ticket.id.substring(0, 8)}</span>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||
<!-- Main Content -->
|
||||
<div class="lg:col-span-2 space-y-6">
|
||||
<!-- Ticket Header -->
|
||||
<div class="bg-white shadow rounded-lg">
|
||||
<div class="px-6 py-5 border-b border-gray-200">
|
||||
<div class="flex justify-between items-start">
|
||||
<div class="flex-1">
|
||||
<h1 class="text-2xl font-bold text-gray-900 mb-2">
|
||||
{ticket.subject || ticket.title}
|
||||
</h1>
|
||||
<div class="flex items-center space-x-3">
|
||||
<span
|
||||
class="inline-flex rounded-full px-2 text-xs font-semibold leading-5 bg-{getStatusBadge(
|
||||
ticket.status
|
||||
).color}-100 text-{getStatusBadge(ticket.status).color}-800"
|
||||
>
|
||||
{getStatusBadge(ticket.status).label}
|
||||
</span>
|
||||
<span
|
||||
class="inline-flex rounded-full px-2 text-xs font-semibold leading-5 bg-{getPriorityBadge(
|
||||
ticket.priority
|
||||
).color}-100 text-{getPriorityBadge(ticket.priority).color}-800"
|
||||
>
|
||||
{getPriorityBadge(ticket.priority).label}
|
||||
</span>
|
||||
<span class="text-sm text-gray-500">
|
||||
Creado {formatDate(ticket.created_at)}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
on:click={() => goto('/tickets')}
|
||||
class="inline-flex items-center px-3 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
|
||||
>
|
||||
Volver
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="px-6 py-5">
|
||||
<div class="prose max-w-none">
|
||||
<p class="whitespace-pre-wrap text-gray-700">
|
||||
{ticket.description}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Attachments Section -->
|
||||
{#if attachments && attachments.length > 0}
|
||||
<div class="bg-white shadow rounded-lg">
|
||||
<div class="px-6 py-5 border-b border-gray-200">
|
||||
<h3 class="text-lg font-semibold text-gray-900">
|
||||
Archivos Adjuntos ({attachments.length})
|
||||
</h3>
|
||||
</div>
|
||||
<div class="px-6 py-5">
|
||||
<div class="space-y-2">
|
||||
{#each attachments as attachment}
|
||||
<div
|
||||
class="flex items-center justify-between p-3 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors"
|
||||
>
|
||||
<div class="flex items-center space-x-3">
|
||||
<div
|
||||
class="w-10 h-10 bg-indigo-100 rounded-lg flex items-center justify-center flex-shrink-0"
|
||||
>
|
||||
<svg
|
||||
class="w-5 h-5 text-indigo-600"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13"
|
||||
/>
|
||||
</svg>
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<p class="text-sm font-medium text-gray-900 truncate">
|
||||
{attachment.original_filename}
|
||||
</p>
|
||||
<p class="text-xs text-gray-500">
|
||||
{Math.round(attachment.size_bytes / 1024)} KB
|
||||
{#if attachment.uploaded_by_name}
|
||||
• Subido por {attachment.uploaded_by_name}
|
||||
{/if}
|
||||
{#if attachment.uploaded_at}
|
||||
• {formatDate(attachment.uploaded_at)}
|
||||
{/if}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
on:click={() => handleDownloadAttachment(attachment)}
|
||||
class="inline-flex items-center p-2 text-sm font-medium text-indigo-600 hover:bg-indigo-50 rounded-md transition-colors"
|
||||
title="Descargar {attachment.original_filename}"
|
||||
>
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
stroke-width="2"
|
||||
d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
|
||||
/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Comments Section -->
|
||||
<div class="bg-white shadow rounded-lg">
|
||||
<div class="px-6 py-5 border-b border-gray-200">
|
||||
<h3 class="text-lg font-semibold text-gray-900">Conversación</h3>
|
||||
</div>
|
||||
<div class="px-6 py-5">
|
||||
{#if comments.length === 0}
|
||||
<p class="text-gray-500 text-center py-4">
|
||||
No hay comentarios aún. ¡Sé el primero en comentar!
|
||||
</p>
|
||||
{:else}
|
||||
<div class="space-y-4">
|
||||
{#each comments as comment}
|
||||
<div class="flex space-x-3">
|
||||
<div
|
||||
class="w-8 h-8 bg-indigo-100 rounded-full flex items-center justify-center flex-shrink-0"
|
||||
>
|
||||
<span class="text-indigo-600 text-xs font-medium">
|
||||
{comment.author_name
|
||||
? comment.author_name
|
||||
.split(' ')
|
||||
.map(n => n[0])
|
||||
.join('')
|
||||
: '??'}
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center space-x-2 mb-1">
|
||||
<span class="text-sm font-medium text-gray-900">
|
||||
{comment.author_name || 'Usuario Desconocido'}
|
||||
</span>
|
||||
<span class="text-xs text-gray-500">
|
||||
{formatDate(comment.created_at)}
|
||||
</span>
|
||||
{#if comment.is_internal}
|
||||
<span class="bg-red-100 text-red-700 text-xs px-2 py-0.5 rounded">
|
||||
Interno
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
<p class="text-gray-700 whitespace-pre-wrap">
|
||||
{comment.content}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Add Comment Form -->
|
||||
<div class="mt-6 pt-6 border-t border-gray-200">
|
||||
<form on:submit|preventDefault={handleAddComment} class="space-y-4">
|
||||
<textarea
|
||||
rows="4"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm border p-2"
|
||||
placeholder="Escribe tu comentario o respuesta..."
|
||||
bind:value={newComment}
|
||||
disabled={isSubmittingComment}
|
||||
/>
|
||||
|
||||
<div class="flex justify-end">
|
||||
<button
|
||||
type="submit"
|
||||
class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:opacity-50"
|
||||
disabled={isSubmittingComment || !newComment.trim()}
|
||||
>
|
||||
{#if isSubmittingComment}
|
||||
<div class="flex items-center space-x-2">
|
||||
<div
|
||||
class="inline-block animate-spin rounded-full h-4 w-4 border-b-2 border-white"
|
||||
/>
|
||||
<span>Enviando...</span>
|
||||
</div>
|
||||
{:else}
|
||||
Enviar Comentario
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Sidebar -->
|
||||
<div class="space-y-6">
|
||||
<!-- Ticket Info -->
|
||||
<div class="bg-white shadow rounded-lg">
|
||||
<div class="px-6 py-5 border-b border-gray-200">
|
||||
<h3 class="text-lg font-semibold text-gray-900">Información</h3>
|
||||
</div>
|
||||
<div class="px-6 py-5 space-y-4">
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">ID del Ticket</dt>
|
||||
<dd class="text-sm text-gray-900 font-mono">
|
||||
#{ticket.ticket_number || ticket.id.substring(0, 8)}
|
||||
</dd>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Creado por</dt>
|
||||
<dd class="text-sm text-gray-900">{getUserName(ticket.created_by)}</dd>
|
||||
</div>
|
||||
|
||||
{#if ticket.assigned_to}
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Asignado a</dt>
|
||||
<dd class="text-sm text-gray-900">{getUserName(ticket.assigned_to)}</dd>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Creado</dt>
|
||||
<dd class="text-sm text-gray-900">{formatDate(ticket.created_at)}</dd>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<dt class="text-sm font-medium text-gray-500">Última actualización</dt>
|
||||
<dd class="text-sm text-gray-900">{formatDate(ticket.updated_at)}</dd>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user