Compare commits
4 Commits
ea682d8cd9
...
659fc2f446
| Author | SHA1 | Date | |
|---|---|---|---|
| 659fc2f446 | |||
| 91ff49cdec | |||
| ac0cb6f132 | |||
| d4ff32dac7 |
25
backend/app/api/schemas/attachment.py
Normal file
25
backend/app/api/schemas/attachment.py
Normal file
@@ -0,0 +1,25 @@
|
||||
"""
|
||||
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)
|
||||
@@ -133,10 +133,10 @@ class ClientProfileUpdate(ClientProfileBase):
|
||||
class ClientProfileResponse(ClientProfileBase):
|
||||
"""Schema de respuesta para ClientProfile."""
|
||||
|
||||
id: uuid.UUID
|
||||
id: Optional[uuid.UUID] = None
|
||||
tenant_id: uuid.UUID
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
created_at: Optional[datetime] = None
|
||||
updated_at: Optional[datetime] = None
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
@@ -8,6 +8,7 @@ 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
|
||||
@@ -257,41 +258,49 @@ async def get_current_user(
|
||||
detail="Invalid token"
|
||||
)
|
||||
|
||||
# TODO: Fetch actual user from database
|
||||
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"
|
||||
)
|
||||
|
||||
return {
|
||||
"id": payload["sub"],
|
||||
"email": payload["email"],
|
||||
"role": payload["role"],
|
||||
"tenant_id": payload["tenant_id"]
|
||||
"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()
|
||||
}
|
||||
|
||||
|
||||
# ===================================
|
||||
# DEPENDENCIES
|
||||
# ===================================
|
||||
|
||||
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
|
||||
# Dependencies are imported from app.api.deps to avoid duplication
|
||||
# Use get_current_user and get_current_active_superuser from deps.py
|
||||
@@ -50,11 +50,49 @@ async def get_current_client_profile(
|
||||
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)
|
||||
# Si no existe, devolver un perfil vacío con solo tenant_id
|
||||
# No crear en base de datos hasta que el usuario guarde
|
||||
return ClientProfileResponse(
|
||||
id=None,
|
||||
tenant_id=current_tenant.id,
|
||||
business_name=None,
|
||||
commercial_name=None,
|
||||
client_code=None,
|
||||
client_type=None,
|
||||
rfc=None,
|
||||
tax_id=None,
|
||||
country=None,
|
||||
state=None,
|
||||
city=None,
|
||||
address=None,
|
||||
external_number=None,
|
||||
internal_number=None,
|
||||
postal_code=None,
|
||||
neighborhood=None,
|
||||
main_phone=None,
|
||||
secondary_phone=None,
|
||||
direct_phone=None,
|
||||
phone_extension=None,
|
||||
fax=None,
|
||||
business_hours=None,
|
||||
website=None,
|
||||
main_email=None,
|
||||
billing_email=None,
|
||||
advertising_medium=None,
|
||||
nationality=None,
|
||||
logo_url=None,
|
||||
company_representative=None,
|
||||
legal_representative=None,
|
||||
credit_limit=None,
|
||||
payment_terms=None,
|
||||
preferred_currency="MXN",
|
||||
send_to_billing=False,
|
||||
is_active_client=True,
|
||||
is_prospect=False,
|
||||
notes=None,
|
||||
created_at=None,
|
||||
updated_at=None
|
||||
)
|
||||
|
||||
return profile
|
||||
|
||||
|
||||
@@ -3,18 +3,24 @@ Tickets endpoints - ServiceManagerWeb
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status, UploadFile, File
|
||||
from fastapi.responses import FileResponse
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func
|
||||
from sqlalchemy.orm import selectinload
|
||||
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.api.deps import get_current_user, get_current_tenant
|
||||
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.tenant import Tenant
|
||||
from app.models.category import Category
|
||||
from app.models.system import System
|
||||
from app.models.comment import TicketComment
|
||||
from app.models.attachment import TicketAttachment
|
||||
from app.api.schemas.attachment import AttachmentResponse
|
||||
from app.core.file_handler import file_handler
|
||||
import uuid
|
||||
|
||||
router = APIRouter()
|
||||
@@ -573,19 +579,60 @@ async def delete_ticket(
|
||||
return {"message": "Ticket deleted successfully"}
|
||||
|
||||
# ===================================
|
||||
# ATTACHMENT ENDPOINTS (placeholder)
|
||||
# ===================================
|
||||
# ATTACHMENT ENDPOINTS
|
||||
# ===================================
|
||||
|
||||
@router.get("/{ticket_id}/attachments")
|
||||
@router.get("/{ticket_id}/attachments", response_model=List[AttachmentResponse])
|
||||
async def get_ticket_attachments(
|
||||
ticket_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant)
|
||||
):
|
||||
"""
|
||||
Obtener adjuntos de un ticket
|
||||
"""
|
||||
return []
|
||||
"""Obtener adjuntos de un ticket"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=400, detail="ID de ticket inválido")
|
||||
|
||||
# Verificar que el ticket existe y pertenece al tenant
|
||||
result = await db.execute(
|
||||
select(Ticket).where(Ticket.id == ticket_uuid, Ticket.tenant_id == current_tenant.id)
|
||||
)
|
||||
ticket = result.scalar_one_or_none()
|
||||
|
||||
if not ticket:
|
||||
raise HTTPException(status_code=404, detail="Ticket no encontrado")
|
||||
|
||||
# Obtener attachments
|
||||
result = await db.execute(
|
||||
select(TicketAttachment)
|
||||
.where(TicketAttachment.ticket_id == ticket_uuid)
|
||||
.options(selectinload(TicketAttachment.uploaded_by_user))
|
||||
.order_by(TicketAttachment.created_at.desc())
|
||||
)
|
||||
attachments = result.scalars().all()
|
||||
|
||||
# Construir respuesta
|
||||
response = []
|
||||
for att in attachments:
|
||||
response.append(AttachmentResponse(
|
||||
id=att.id,
|
||||
ticket_id=att.ticket_id,
|
||||
comment_id=att.comment_id,
|
||||
uploaded_by=att.uploaded_by,
|
||||
filename=att.filename,
|
||||
original_filename=att.original_filename,
|
||||
mime_type=att.mime_type,
|
||||
file_size=att.file_size,
|
||||
file_path=att.file_path,
|
||||
uploaded_by_name=f"{att.uploaded_by_user.first_name} {att.uploaded_by_user.last_name}" if att.uploaded_by_user else "Unknown",
|
||||
created_at=att.created_at,
|
||||
download_url=f"/api/v1/tickets/{ticket_id}/attachments/{att.id}/download"
|
||||
))
|
||||
|
||||
return response
|
||||
|
||||
|
||||
@router.post("/{ticket_id}/attachments", status_code=status.HTTP_201_CREATED)
|
||||
@@ -593,12 +640,106 @@ async def upload_attachment(
|
||||
ticket_id: str,
|
||||
file: UploadFile = File(...),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user)
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant)
|
||||
):
|
||||
"""
|
||||
Subir un archivo adjunto a un ticket
|
||||
"""
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_501_NOT_IMPLEMENTED,
|
||||
detail="File uploads not yet implemented"
|
||||
"""Subir un archivo adjunto a un ticket"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=400, detail="ID de ticket inválido")
|
||||
|
||||
# Verificar ticket
|
||||
result = await db.execute(
|
||||
select(Ticket).where(Ticket.id == ticket_uuid, Ticket.tenant_id == current_tenant.id)
|
||||
)
|
||||
ticket = result.scalar_one_or_none()
|
||||
|
||||
if not ticket:
|
||||
raise HTTPException(status_code=404, detail="Ticket no encontrado")
|
||||
|
||||
# Guardar archivo
|
||||
file_metadata = await file_handler.save_upload(file, current_tenant.id, ticket_uuid)
|
||||
|
||||
# Crear registro en BD
|
||||
attachment = TicketAttachment(
|
||||
id=uuid.uuid4(),
|
||||
ticket_id=ticket_uuid,
|
||||
uploaded_by=current_user.id,
|
||||
filename=file_metadata["filename"],
|
||||
original_filename=file_metadata["original_filename"],
|
||||
mime_type=file_metadata["mime_type"],
|
||||
file_size=file_metadata["file_size"],
|
||||
file_path=file_metadata["file_path"],
|
||||
md5_hash=file_metadata["md5_hash"],
|
||||
sha256_hash=file_metadata["sha256_hash"],
|
||||
created_at=datetime.utcnow()
|
||||
)
|
||||
|
||||
db.add(attachment)
|
||||
await db.commit()
|
||||
await db.refresh(attachment, ["uploaded_by_user"])
|
||||
|
||||
return {
|
||||
"success": True,
|
||||
"message": "Archivo subido exitosamente",
|
||||
"data": AttachmentResponse(
|
||||
id=attachment.id,
|
||||
ticket_id=attachment.ticket_id,
|
||||
comment_id=attachment.comment_id,
|
||||
uploaded_by=attachment.uploaded_by,
|
||||
filename=attachment.filename,
|
||||
original_filename=attachment.original_filename,
|
||||
mime_type=attachment.mime_type,
|
||||
file_size=attachment.file_size,
|
||||
file_path=attachment.file_path,
|
||||
uploaded_by_name=f"{attachment.uploaded_by_user.first_name} {attachment.uploaded_by_user.last_name}",
|
||||
created_at=attachment.created_at,
|
||||
download_url=f"/api/v1/tickets/{ticket_id}/attachments/{attachment.id}/download"
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@router.get("/{ticket_id}/attachments/{attachment_id}/download")
|
||||
async def download_attachment(
|
||||
ticket_id: str,
|
||||
attachment_id: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_tenant: Tenant = Depends(get_current_tenant)
|
||||
):
|
||||
"""Descargar un archivo adjunto"""
|
||||
try:
|
||||
ticket_uuid = uuid.UUID(ticket_id)
|
||||
attachment_uuid = uuid.UUID(attachment_id)
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=400, detail="ID inválido")
|
||||
|
||||
# Verificar ticket
|
||||
result = await db.execute(
|
||||
select(Ticket).where(Ticket.id == ticket_uuid, Ticket.tenant_id == current_tenant.id)
|
||||
)
|
||||
ticket = result.scalar_one_or_none()
|
||||
|
||||
if not ticket:
|
||||
raise HTTPException(status_code=404, detail="Ticket no encontrado")
|
||||
|
||||
# Obtener attachment
|
||||
result = await db.execute(
|
||||
select(TicketAttachment)
|
||||
.where(TicketAttachment.id == attachment_uuid, TicketAttachment.ticket_id == ticket_uuid)
|
||||
)
|
||||
attachment = result.scalar_one_or_none()
|
||||
|
||||
if not attachment:
|
||||
raise HTTPException(status_code=404, detail="Adjunto no encontrado")
|
||||
|
||||
# Obtener path del archivo
|
||||
file_path = file_handler.get_file_path(attachment.file_path)
|
||||
|
||||
# Retornar archivo
|
||||
return FileResponse(
|
||||
path=file_path,
|
||||
filename=attachment.original_filename,
|
||||
media_type=attachment.mime_type
|
||||
)
|
||||
@@ -23,101 +23,98 @@ class Settings(BaseSettings):
|
||||
# ===================================
|
||||
# GENERAL
|
||||
# ===================================
|
||||
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")
|
||||
ENVIRONMENT: str = Field(default="development")
|
||||
DEBUG: bool = Field(default=False)
|
||||
SECRET_KEY: str = Field(...)
|
||||
API_VERSION: str = Field(default="v1")
|
||||
|
||||
# ===================================
|
||||
# DATABASE
|
||||
# ===================================
|
||||
DATABASE_URL: str = Field(..., env="DATABASE_URL")
|
||||
DATABASE_URL: str = Field(...)
|
||||
|
||||
# ===================================
|
||||
# REDIS
|
||||
# ===================================
|
||||
REDIS_URL: str = Field(..., env="REDIS_URL")
|
||||
REDIS_URL: str = Field(...)
|
||||
|
||||
# ===================================
|
||||
# JWT AUTHENTICATION
|
||||
# ===================================
|
||||
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")
|
||||
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)
|
||||
|
||||
# ===================================
|
||||
# CORS
|
||||
# ===================================
|
||||
CORS_ORIGINS: str = Field(
|
||||
default="http://localhost:3000,http://localhost:3001",
|
||||
env="CORS_ORIGINS"
|
||||
default="http://localhost:3000,http://localhost:3001"
|
||||
)
|
||||
|
||||
# ===================================
|
||||
# EMAIL
|
||||
# ===================================
|
||||
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")
|
||||
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)
|
||||
|
||||
DEFAULT_FROM_EMAIL: str = Field(default="noreply@servicemanager.local", env="DEFAULT_FROM_EMAIL")
|
||||
DEFAULT_FROM_NAME: str = Field(default="ServiceManager", env="DEFAULT_FROM_NAME")
|
||||
DEFAULT_FROM_EMAIL: str = Field(default="noreply@servicemanager.local")
|
||||
DEFAULT_FROM_NAME: str = Field(default="ServiceManager")
|
||||
|
||||
# ===================================
|
||||
# FILE UPLOADS
|
||||
# ===================================
|
||||
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"
|
||||
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"
|
||||
)
|
||||
UPLOAD_PATH: str = Field(default="/app/uploads", env="UPLOAD_PATH")
|
||||
UPLOAD_PATH: str = Field(default="/app/uploads")
|
||||
|
||||
@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]
|
||||
@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(",")]
|
||||
|
||||
# ===================================
|
||||
# SECURITY
|
||||
# ===================================
|
||||
RATE_LIMIT_ENABLED: bool = Field(default=True, env="RATE_LIMIT_ENABLED")
|
||||
PASSWORD_MIN_LENGTH: int = Field(default=8, env="PASSWORD_MIN_LENGTH")
|
||||
RATE_LIMIT_ENABLED: bool = Field(default=True)
|
||||
PASSWORD_MIN_LENGTH: int = Field(default=8)
|
||||
|
||||
# Argon2 settings
|
||||
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")
|
||||
ARGON2_TIME_COST: int = Field(default=3)
|
||||
ARGON2_MEMORY_COST: int = Field(default=65536)
|
||||
ARGON2_PARALLELISM: int = Field(default=4)
|
||||
|
||||
# ===================================
|
||||
# LOGGING
|
||||
# ===================================
|
||||
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")
|
||||
LOG_LEVEL: str = Field(default="INFO")
|
||||
LOG_FORMAT: str = Field(default="json")
|
||||
LOG_FILE: Optional[str] = Field(default=None)
|
||||
|
||||
# ===================================
|
||||
# FRONTEND URLS
|
||||
# ===================================
|
||||
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")
|
||||
CLIENT_FRONTEND_URL: str = Field(default="http://localhost:3000")
|
||||
INTERNAL_FRONTEND_URL: str = Field(default="http://localhost:3001")
|
||||
|
||||
# ===================================
|
||||
# HEALTH CHECKS
|
||||
# ===================================
|
||||
HEALTH_CHECK_TIMEOUT: int = Field(default=30, env="HEALTH_CHECK_TIMEOUT")
|
||||
HEALTH_CHECK_TIMEOUT: int = Field(default=30)
|
||||
|
||||
# ===================================
|
||||
# CELERY
|
||||
# ===================================
|
||||
CELERY_BROKER_URL: str = Field(..., env="CELERY_BROKER_URL")
|
||||
CELERY_RESULT_BACKEND: str = Field(..., env="CELERY_RESULT_BACKEND")
|
||||
CELERY_BROKER_URL: str = Field(...)
|
||||
CELERY_RESULT_BACKEND: str = Field(...)
|
||||
|
||||
def is_production(self) -> bool:
|
||||
"""Check if environment is production."""
|
||||
|
||||
101
backend/app/core/file_handler.py
Normal file
101
backend/app/core/file_handler.py
Normal file
@@ -0,0 +1,101 @@
|
||||
"""
|
||||
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()
|
||||
@@ -22,6 +22,7 @@ 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.core.logging import setup_logging
|
||||
from app.api.v1.router import api_router
|
||||
|
||||
@@ -7,6 +7,7 @@ from .comment import TicketComment
|
||||
from .system import System
|
||||
from .category import Category
|
||||
from .client_profile import ClientProfile
|
||||
from .attachment import TicketAttachment
|
||||
|
||||
__all__ = [
|
||||
"User",
|
||||
@@ -15,5 +16,6 @@ __all__ = [
|
||||
"TicketComment",
|
||||
"System",
|
||||
"Category",
|
||||
"ClientProfile"
|
||||
"ClientProfile",
|
||||
"TicketAttachment"
|
||||
]
|
||||
62
backend/app/models/attachment.py
Normal file
62
backend/app/models/attachment.py
Normal file
@@ -0,0 +1,62 @@
|
||||
"""
|
||||
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"]
|
||||
}
|
||||
@@ -8,12 +8,15 @@ 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
|
||||
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."""
|
||||
|
||||
@@ -64,6 +64,11 @@ class TicketComment(Base):
|
||||
# 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}>"
|
||||
@@ -126,6 +126,12 @@ class Ticket(Base):
|
||||
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'),
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
Generic single-database configuration.
|
||||
@@ -1,78 +0,0 @@
|
||||
from logging.config import fileConfig
|
||||
|
||||
from sqlalchemy import engine_from_config
|
||||
from sqlalchemy import pool
|
||||
|
||||
from alembic import context
|
||||
|
||||
# this is the Alembic Config object, which provides
|
||||
# access to the values within the .ini file in use.
|
||||
config = context.config
|
||||
|
||||
# Interpret the config file for Python logging.
|
||||
# This line sets up loggers basically.
|
||||
if config.config_file_name is not None:
|
||||
fileConfig(config.config_file_name)
|
||||
|
||||
# add your model's MetaData object here
|
||||
# for 'autogenerate' support
|
||||
# from myapp import mymodel
|
||||
# target_metadata = mymodel.Base.metadata
|
||||
target_metadata = None
|
||||
|
||||
# other values from the config, defined by the needs of env.py,
|
||||
# can be acquired:
|
||||
# my_important_option = config.get_main_option("my_important_option")
|
||||
# ... etc.
|
||||
|
||||
|
||||
def run_migrations_offline() -> None:
|
||||
"""Run migrations in 'offline' mode.
|
||||
|
||||
This configures the context with just a URL
|
||||
and not an Engine, though an Engine is acceptable
|
||||
here as well. By skipping the Engine creation
|
||||
we don't even need a DBAPI to be available.
|
||||
|
||||
Calls to context.execute() here emit the given string to the
|
||||
script output.
|
||||
|
||||
"""
|
||||
url = config.get_main_option("sqlalchemy.url")
|
||||
context.configure(
|
||||
url=url,
|
||||
target_metadata=target_metadata,
|
||||
literal_binds=True,
|
||||
dialect_opts={"paramstyle": "named"},
|
||||
)
|
||||
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
def run_migrations_online() -> None:
|
||||
"""Run migrations in 'online' mode.
|
||||
|
||||
In this scenario we need to create an Engine
|
||||
and associate a connection with the context.
|
||||
|
||||
"""
|
||||
connectable = engine_from_config(
|
||||
config.get_section(config.config_ini_section, {}),
|
||||
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,26 +0,0 @@
|
||||
"""${message}
|
||||
|
||||
Revision ID: ${up_revision}
|
||||
Revises: ${down_revision | comma,n}
|
||||
Create Date: ${create_date}
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
${imports if imports else ""}
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = ${repr(up_revision)}
|
||||
down_revision: Union[str, None] = ${repr(down_revision)}
|
||||
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
${upgrades if upgrades else "pass"}
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
${downgrades if downgrades else "pass"}
|
||||
22
backend/pytest.ini
Normal file
22
backend/pytest.ini
Normal file
@@ -0,0 +1,22 @@
|
||||
[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
|
||||
@@ -69,6 +69,7 @@ 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
|
||||
|
||||
|
||||
0
backend/tests/__init__.py
Normal file
0
backend/tests/__init__.py
Normal file
28
backend/tests/conftest.py
Normal file
28
backend/tests/conftest.py
Normal file
@@ -0,0 +1,28 @@
|
||||
"""
|
||||
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"
|
||||
}
|
||||
7
backend/tests/test.env
Normal file
7
backend/tests/test.env
Normal file
@@ -0,0 +1,7 @@
|
||||
# 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
|
||||
58
backend/tests/test_basic.py
Normal file
58
backend/tests/test_basic.py
Normal file
@@ -0,0 +1,58 @@
|
||||
"""
|
||||
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
|
||||
50
backend/tests/test_health.py
Normal file
50
backend/tests/test_health.py
Normal file
@@ -0,0 +1,50 @@
|
||||
"""
|
||||
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
|
||||
@@ -1,8 +1,14 @@
|
||||
import { writable, 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;
|
||||
@@ -73,12 +79,17 @@ 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
|
||||
}
|
||||
});
|
||||
@@ -88,12 +99,12 @@ async function apiCall(endpoint: string, options: RequestInit = {}) {
|
||||
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 => `${e.loc.join('.')}: ${e.msg}`).join(', ');
|
||||
errorMessage = error.detail.map((e: FastAPIValidationError) => `${e.loc.join('.')}: ${e.msg}`).join(', ');
|
||||
} else if (typeof error.detail === 'string') {
|
||||
errorMessage = error.detail;
|
||||
} else {
|
||||
@@ -105,7 +116,7 @@ async function apiCall(endpoint: string, options: RequestInit = {}) {
|
||||
} catch (e) {
|
||||
errorMessage = `HTTP ${response.status}: ${response.statusText}`;
|
||||
}
|
||||
|
||||
|
||||
throw new Error(errorMessage);
|
||||
}
|
||||
|
||||
@@ -122,15 +133,15 @@ function createTicketsStore() {
|
||||
// Load user's tickets
|
||||
loadTickets: async () => {
|
||||
update((state: TicketsState) => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
|
||||
try {
|
||||
const tickets = await apiCall('/tickets/');
|
||||
update((state: TicketsState) => ({ ...state, tickets, isLoading: false }));
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load tickets'
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load tickets'
|
||||
}));
|
||||
}
|
||||
},
|
||||
@@ -138,7 +149,7 @@ function createTicketsStore() {
|
||||
// Load specific ticket with details
|
||||
loadTicket: async (ticketId: string) => {
|
||||
update((state: TicketsState) => ({ ...state, isLoading: true, error: null }));
|
||||
|
||||
|
||||
try {
|
||||
const [ticket, comments, attachments] = await Promise.all([
|
||||
apiCall(`/tickets/${ticketId}`),
|
||||
@@ -146,18 +157,18 @@ function createTicketsStore() {
|
||||
apiCall(`/tickets/${ticketId}/attachments`)
|
||||
]);
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
currentTicket: ticket,
|
||||
comments,
|
||||
attachments,
|
||||
isLoading: false
|
||||
update((state: TicketsState) => ({
|
||||
...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: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to load ticket'
|
||||
}));
|
||||
}
|
||||
},
|
||||
@@ -176,38 +187,38 @@ function createTicketsStore() {
|
||||
// Create new ticket
|
||||
createTicket: async (ticket: CreateTicketRequest) => {
|
||||
update((state: TicketsState) => ({ ...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
|
||||
};
|
||||
|
||||
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);
|
||||
|
||||
console.log('Sending ticket data:', ticketData);
|
||||
|
||||
const newTicket = await apiCall('/tickets/', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(ticketData)
|
||||
});
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
tickets: [newTicket, ...state.tickets],
|
||||
isLoading: false
|
||||
update((state: TicketsState) => ({
|
||||
...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: TicketsState) => ({
|
||||
...state,
|
||||
isLoading: false,
|
||||
error: error instanceof Error ? error.message : 'Failed to create ticket'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -221,16 +232,16 @@ function createTicketsStore() {
|
||||
body: JSON.stringify({ content })
|
||||
});
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
comments: [...state.comments, comment]
|
||||
update((state: TicketsState) => ({
|
||||
...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: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to add comment'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -243,10 +254,16 @@ 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}`
|
||||
'Authorization': `Bearer ${authState.token}`,
|
||||
'X-Tenant-ID': authState.user.tenant_id
|
||||
},
|
||||
body: formData
|
||||
});
|
||||
@@ -256,18 +273,19 @@ function createTicketsStore() {
|
||||
throw new Error(error.detail || 'Upload failed');
|
||||
}
|
||||
|
||||
const attachment = await response.json();
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
attachments: [...state.attachments, attachment]
|
||||
const result = await response.json();
|
||||
const attachment = result.data || result;
|
||||
|
||||
update((state: TicketsState) => ({
|
||||
...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: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to upload attachment'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -289,9 +307,9 @@ function createTicketsStore() {
|
||||
|
||||
return updatedTicket;
|
||||
} catch (error) {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to close ticket'
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
error: error instanceof Error ? error.message : 'Failed to close ticket'
|
||||
}));
|
||||
throw error;
|
||||
}
|
||||
@@ -304,11 +322,11 @@ function createTicketsStore() {
|
||||
|
||||
// Clear current ticket
|
||||
clearCurrentTicket: () => {
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
currentTicket: null,
|
||||
comments: [],
|
||||
attachments: []
|
||||
update((state: TicketsState) => ({
|
||||
...state,
|
||||
currentTicket: null,
|
||||
comments: [],
|
||||
attachments: []
|
||||
}));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -77,9 +77,15 @@
|
||||
|
||||
async function loadBusinessProfile() {
|
||||
try {
|
||||
if (!$auth.token || !$auth.user) {
|
||||
console.warn('Usuario no autenticado');
|
||||
return;
|
||||
}
|
||||
|
||||
const response = await fetch('/api/v1/client-profile/', {
|
||||
headers: {
|
||||
Authorization: `Bearer ${$auth.token}`
|
||||
Authorization: `Bearer ${$auth.token}`,
|
||||
'X-Tenant-ID': $auth.user.tenant_id
|
||||
}
|
||||
});
|
||||
|
||||
@@ -91,6 +97,12 @@
|
||||
businessProfile[key] = profile[key];
|
||||
}
|
||||
});
|
||||
} else if (response.status === 404) {
|
||||
// No hay perfil aún, esto es normal para nuevos clientes
|
||||
console.info('No se encontró perfil empresarial existente');
|
||||
} else {
|
||||
const error = await response.json().catch(() => ({ detail: 'Error desconocido' }));
|
||||
console.error('Error al cargar perfil empresarial:', error);
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('No se pudo cargar el perfil empresarial:', error);
|
||||
@@ -261,7 +273,8 @@
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${$auth.token}`
|
||||
Authorization: `Bearer ${$auth.token}`,
|
||||
'X-Tenant-ID': $auth.user.tenant_id
|
||||
},
|
||||
body: JSON.stringify(profileData)
|
||||
});
|
||||
@@ -305,51 +318,51 @@
|
||||
<button
|
||||
class="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-2 px-1 border-b-2 font-medium text-sm transition-colors {activeTab ===
|
||||
'personal'
|
||||
? 'border-primary-500 text-primary-600'
|
||||
? 'border-white text-white'
|
||||
: ''}"
|
||||
on:click={() => (activeTab = 'personal')}
|
||||
>
|
||||
👤 Personal
|
||||
Personal
|
||||
</button>
|
||||
|
||||
<button
|
||||
class="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-2 px-1 border-b-2 font-medium text-sm transition-colors {activeTab ===
|
||||
'general'
|
||||
? 'border-primary-500 text-primary-600'
|
||||
? 'border-white text-white'
|
||||
: ''}"
|
||||
on:click={() => (activeTab = 'general')}
|
||||
>
|
||||
🏢 General
|
||||
General
|
||||
</button>
|
||||
|
||||
<button
|
||||
class="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-2 px-1 border-b-2 font-medium text-sm transition-colors {activeTab ===
|
||||
'contact'
|
||||
? 'border-primary-500 text-primary-600'
|
||||
? 'border-white text-white'
|
||||
: ''}"
|
||||
on:click={() => (activeTab = 'contact')}
|
||||
>
|
||||
📞 Contacto
|
||||
Contacto
|
||||
</button>
|
||||
|
||||
<button
|
||||
class="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-2 px-1 border-b-2 font-medium text-sm transition-colors {activeTab ===
|
||||
'security'
|
||||
? 'border-primary-500 text-primary-600'
|
||||
? 'border-white text-white'
|
||||
: ''}"
|
||||
on:click={() => (activeTab = 'security')}
|
||||
>
|
||||
🔐 Seguridad
|
||||
Seguridad
|
||||
</button>
|
||||
|
||||
<button
|
||||
class="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-2 px-1 border-b-2 font-medium text-sm transition-colors {activeTab ===
|
||||
'account'
|
||||
? 'border-primary-500 text-primary-600'
|
||||
? 'border-white text-white'
|
||||
: ''}"
|
||||
on:click={() => (activeTab = 'account')}
|
||||
>
|
||||
ℹ️ Cuenta
|
||||
Cuenta
|
||||
</button>
|
||||
</nav>
|
||||
</div>
|
||||
@@ -417,7 +430,7 @@
|
||||
</div>
|
||||
|
||||
<div class="flex justify-end">
|
||||
<button type="submit" class="btn-primary px-6 py-2" disabled={isUpdatingProfile}>
|
||||
<button type="submit" class="bg-white border border-gray-300 text-gray-700 hover:bg-gray-50 px-6 py-2 rounded-md font-medium transition-colors" disabled={isUpdatingProfile}>
|
||||
{#if isUpdatingProfile}
|
||||
<div class="flex items-center space-x-2">
|
||||
<div class="spinner w-4 h-4" />
|
||||
@@ -517,7 +530,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Ubicación -->
|
||||
<div class="bg-blue-50 p-4 rounded-lg">
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Ubicación</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
|
||||
<div>
|
||||
@@ -602,7 +615,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Representantes -->
|
||||
<div class="bg-purple-50 p-4 rounded-lg">
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Representantes</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
@@ -628,7 +641,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Configuración -->
|
||||
<div class="bg-green-50 p-4 rounded-lg">
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Configuración</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
@@ -680,7 +693,7 @@
|
||||
<div class="flex justify-end pt-6">
|
||||
<button
|
||||
type="submit"
|
||||
class="btn-primary px-8 py-2"
|
||||
class="bg-white border border-gray-300 text-gray-700 hover:bg-gray-50 px-8 py-2 rounded-md font-medium transition-colors"
|
||||
disabled={isSavingBusinessProfile}
|
||||
>
|
||||
{#if isSavingBusinessProfile}
|
||||
@@ -689,7 +702,7 @@
|
||||
<span>Guardando...</span>
|
||||
</div>
|
||||
{:else}
|
||||
💾 Guardar Perfil Empresarial
|
||||
Guardar Perfil Empresarial
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
@@ -709,8 +722,8 @@
|
||||
<div class="card-content">
|
||||
<form on:submit|preventDefault={handleBusinessProfileSave} class="space-y-6">
|
||||
<!-- Teléfonos -->
|
||||
<div class="bg-blue-50 p-4 rounded-lg">
|
||||
<h3 class="font-medium text-gray-900 mb-4">📞 Teléfonos</h3>
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Teléfonos</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<label class="form-label">Teléfono Principal</label>
|
||||
@@ -766,8 +779,8 @@
|
||||
</div>
|
||||
|
||||
<!-- Emails -->
|
||||
<div class="bg-green-50 p-4 rounded-lg">
|
||||
<h3 class="font-medium text-gray-900 mb-4">✉️ Correos Electrónicos</h3>
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Correos Electrónicos</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<label class="form-label">Email Principal</label>
|
||||
@@ -798,8 +811,8 @@
|
||||
</div>
|
||||
|
||||
<!-- Web y Horarios -->
|
||||
<div class="bg-purple-50 p-4 rounded-lg">
|
||||
<h3 class="font-medium text-gray-900 mb-4">🌐 Web y Horarios</h3>
|
||||
<div class="bg-white p-4 rounded-lg border border-gray-200">
|
||||
<h3 class="font-medium text-gray-900 mb-4">Web y Horarios</h3>
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<label class="form-label">Página Web</label>
|
||||
@@ -836,7 +849,7 @@
|
||||
<div class="flex justify-end pt-6">
|
||||
<button
|
||||
type="submit"
|
||||
class="btn-primary px-8 py-2"
|
||||
class="bg-white border border-gray-300 text-gray-700 hover:bg-gray-50 px-8 py-2 rounded-md font-medium transition-colors"
|
||||
disabled={isSavingBusinessProfile}
|
||||
>
|
||||
{#if isSavingBusinessProfile}
|
||||
@@ -845,7 +858,7 @@
|
||||
<span>Guardando...</span>
|
||||
</div>
|
||||
{:else}
|
||||
💾 Guardar Información de Contacto
|
||||
Guardar Información de Contacto
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
@@ -959,7 +972,7 @@
|
||||
</div>
|
||||
|
||||
<div class="flex justify-end">
|
||||
<button type="submit" class="btn-primary px-6 py-2" disabled={isChangingPassword}>
|
||||
<button type="submit" class="bg-white border border-gray-300 text-gray-700 hover:bg-gray-50 px-6 py-2 rounded-md font-medium transition-colors" disabled={isChangingPassword}>
|
||||
{#if isChangingPassword}
|
||||
<div class="flex items-center space-x-2">
|
||||
<div class="spinner w-4 h-4" />
|
||||
|
||||
29
frontend-client/tsconfig.json
Normal file
29
frontend-client/tsconfig.json
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"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
|
||||
},
|
||||
"include": [
|
||||
"src/**/*",
|
||||
"app.d.ts"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules/**",
|
||||
".svelte-kit/**",
|
||||
"build/**",
|
||||
"dist/**"
|
||||
]
|
||||
}
|
||||
@@ -8,7 +8,7 @@ export default defineConfig({
|
||||
host: '0.0.0.0',
|
||||
proxy: {
|
||||
'/api': {
|
||||
target: 'http://servicemanager-backend:8000',
|
||||
target: 'http://backend:8000',
|
||||
changeOrigin: true,
|
||||
rewrite: (path) => path.replace(/^\/api/, '')
|
||||
}
|
||||
|
||||
29
frontend-internal/tsconfig.json
Normal file
29
frontend-internal/tsconfig.json
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"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
|
||||
},
|
||||
"include": [
|
||||
"src/**/*",
|
||||
"app.d.ts"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules/**",
|
||||
".svelte-kit/**",
|
||||
"build/**",
|
||||
"dist/**"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user