Versión 1.3.0: Conexion completa del proyecto

backend/app/models/category.py

@@ -1,8 +1,8 @@
-
 """
 Category Model - ServiceManagerWeb
+Categorías de tickets por tenant
 """
-from sqlalchemy import String, Text, Boolean, ForeignKey
+from sqlalchemy import String, Text, Boolean, Integer, ForeignKey, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.dialects.postgresql import UUID
 from typing import List, Optional
@@ -11,18 +11,40 @@ import uuid
 from app.core.database import Base
 
 class Category(Base):
-    __tablename__ = "categories"
+    """Modelo de categorías de tickets (ticket_categories en BD)"""
+    __tablename__ = "ticket_categories"  # ✅ CORREGIDO: nombre correcto de tabla
     
+    # Campos básicos
     name: Mapped[str] = mapped_column(String(100), nullable=False)
-    description: Mapped[Optional[str]] = mapped_column(Text)
-    is_active: Mapped[bool] = mapped_column(Boolean, default=True)
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
     
-    # Optional: Tenant specific categories?
-    tenant_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("tenants.id", ondelete="CASCADE"), nullable=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
+    )
     
     # Relationships
     tickets: Mapped[List["Ticket"]] = relationship("Ticket", back_populates="category")
-    tenant: Mapped["Tenant"] = relationship("Tenant") # Assuming Tenant model is imported
+    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'),
+    )
 
     def __repr__(self) -> str:
-        return f"<Category(id={self.id}, name='{self.name}')>"
+        return f"<Category(id={self.id}, name='{self.name}', tenant_id={self.tenant_id})>"

backend/app/models/system.py

@@ -1,25 +1,43 @@
-
 """
 System Model - ServiceManagerWeb
+Sistemas afectados por tenant
 """
-from sqlalchemy import String, Text, Boolean
+from sqlalchemy import String, Text, Boolean, ForeignKey, UniqueConstraint
 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):
-    __tablename__ = "systems"
+    """Modelo de sistemas afectados (affected_systems en BD)"""
+    __tablename__ = "affected_systems"  # ✅ CORREGIDO: nombre correcto de tabla
     
+    # Campos básicos
     name: Mapped[str] = mapped_column(String(100), nullable=False)
-    description: Mapped[Optional[str]] = mapped_column(Text)
-    is_active: Mapped[bool] = mapped_column(Boolean, default=True)
+    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
+    )
     
     # Relationships
-    # 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")
+    # ✅ 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'),
+    )
 
     def __repr__(self) -> str:
-        return f"<System(id={self.id}, name='{self.name}')>"
+        return f"<System(id={self.id}, name='{self.name}', tenant_id={self.tenant_id})>"

backend/app/models/tenant.py

@@ -1,9 +1,7 @@
 """
 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
@@ -13,17 +11,14 @@ 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
@@ -51,18 +46,14 @@ 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"
     
     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

backend/app/models/ticket.py

@@ -1,56 +1,112 @@
 """
 Ticket Model - ServiceManagerWeb
+Tickets de soporte - Core del negocio
 """
-from sqlalchemy import String, ForeignKey, Text
+from sqlalchemy import String, ForeignKey, Text, Integer, CheckConstraint, UniqueConstraint
 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
 
 class TicketStatus(str, enum.Enum):
+    """Estados posibles de un ticket"""
     NEW = "NEW"
     TRIAGE = "TRIAGE"
     IN_PROGRESS = "IN_PROGRESS"
-    WAITING_FOR_CLIENT = "WAITING_FOR_CLIENT"
+    WAITING_CUSTOMER = "WAITING_CUSTOMER"  # ✅ CORREGIDO: nombre según schema.sql
     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"
     
-    # 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)
+    # Multi-tenancy
+    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)
     
-    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)
+    # 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
+    )
     
-    # 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: 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
+    )
     
-    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("categories.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)
 
     # Relationships
     tenant: Mapped["Tenant"] = relationship("Tenant", back_populates="tickets")
     
-    system: Mapped["System"] = relationship("System", back_populates="tickets")
-    category: Mapped["Category"] = relationship("Category", 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"
+    )
     
     created_by_user: Mapped["User"] = relationship(
         "User", 
@@ -63,3 +119,12 @@ class Ticket(Base):
         foreign_keys=[assigned_to], 
         back_populates="assigned_tickets"
     )
+    
+    # ✅ 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})>"