Zahar
77d5be8fd1
- Backend:
- Add address column to tickets and migration script
- Create guest users when user_id is missing; accept user_name and address
- Normalize stored image paths and expose absolute image_url
- Introduce utils for path normalization and ticket serialization
- Add CORS configuration for dashboard/emulator origins
- Tickets API:
- Serialize via ticket_to_dict with consistent schema
- Change status update to PATCH /api/tickets/{id}/status with JSON body
- Add DELETE /api/tickets/{id} with safe file removal
- Dashboard:
- Fetch tickets from backend, show thumbnails, absolute image URLs
- Status select + PATCH updates, toasts for feedback
- Add i18n key btn.viewDetails
- Mobile app:
- Persist device user_id via SharedPreferences
- Fetch and merge API tickets; prefer network imageUrl
- Submit user_name and address; delete via API when available
- Make location acquisition robust with fallbacks and non-blocking UX
- Android/deps:
- Disable Geolocator NMEA listener to prevent crashes
- Downgrade geolocator to ^11.0.0 for stability
BREAKING CHANGE:
- Status endpoint changed from PATCH /api/tickets/{id}?new_status=... to
PATCH /api/tickets/{id}/status with JSON body: {"status":"in_progress"}.
- /api/tickets and /api/tickets/{id} responses now use "id" (replacing
"ticket_id"), include "image_url", and normalize fields for clients. Update
consumers to use the new schema.
82 lines
3.1 KiB
Python
82 lines
3.1 KiB
Python
# app/routes/tickets.py
|
|
from typing import Optional, List
|
|
import logging
|
|
from fastapi import APIRouter, Depends, HTTPException, Query, Request
|
|
from sqlalchemy.orm import Session
|
|
from app.database import get_db
|
|
from app.services.ticket_service import TicketService, TicketStatus, SeverityLevel
|
|
from pydantic import BaseModel
|
|
from app.utils import ticket_to_dict
|
|
|
|
router = APIRouter()
|
|
logger = logging.getLogger(__name__)
|
|
logging.basicConfig(level=logging.INFO)
|
|
|
|
class TicketStatusUpdate(BaseModel):
|
|
status: TicketStatus
|
|
|
|
# ----------------------
|
|
# GET /tickets
|
|
# ----------------------
|
|
@router.get("/tickets", response_model=List[dict])
|
|
def list_tickets(
|
|
request: Request,
|
|
user_id: Optional[str] = Query(None, description="Filter by user ID"),
|
|
category: Optional[str] = Query(None, description="Filter by category"),
|
|
severity: Optional[SeverityLevel] = Query(None, description="Filter by severity"),
|
|
status: Optional[TicketStatus] = Query(None, description="Filter by status"),
|
|
db: Session = Depends(get_db)
|
|
):
|
|
"""
|
|
Return all tickets by default. Optional query params may filter results.
|
|
Each item is serialized using ticket_to_dict(...) which guarantees:
|
|
- image_url is an absolute forward-slash URL
|
|
- created_at is ISO-8601 string
|
|
- consistent schema for dashboard & mobile clients
|
|
"""
|
|
service = TicketService(db)
|
|
tickets = service.list_tickets(user_id=user_id, category=category, severity=severity, status=status)
|
|
return [ticket_to_dict(t, request) for t in tickets]
|
|
|
|
# ----------------------
|
|
# GET /tickets/{ticket_id}
|
|
# ----------------------
|
|
@router.get("/tickets/{ticket_id}", response_model=dict)
|
|
def get_ticket(ticket_id: str, request: Request, db: Session = Depends(get_db)):
|
|
service = TicketService(db)
|
|
ticket = service.get_ticket(ticket_id)
|
|
if not ticket:
|
|
raise HTTPException(status_code=404, detail=f"Ticket {ticket_id} not found")
|
|
return ticket_to_dict(ticket, request)
|
|
|
|
# ----------------------
|
|
# PATCH /tickets/{ticket_id}/status - Update status
|
|
# ----------------------
|
|
@router.patch("/tickets/{ticket_id}/status", response_model=dict)
|
|
def update_ticket_status(
|
|
ticket_id: str,
|
|
status_update: TicketStatusUpdate, # JSON body with status
|
|
request: Request,
|
|
db: Session = Depends(get_db)
|
|
):
|
|
service = TicketService(db)
|
|
try:
|
|
ticket = service.update_ticket_status(ticket_id, status_update.status)
|
|
except Exception as e:
|
|
logger.error(f"Failed to update ticket status: {e}")
|
|
raise HTTPException(status_code=400, detail=str(e))
|
|
return ticket_to_dict(ticket, request)
|
|
|
|
# ----------------------
|
|
# DELETE /tickets/{ticket_id} - Delete ticket + image
|
|
# ----------------------
|
|
@router.delete("/tickets/{ticket_id}", response_model=dict)
|
|
def delete_ticket(ticket_id: str, db: Session = Depends(get_db)):
|
|
service = TicketService(db)
|
|
try:
|
|
service.delete_ticket(ticket_id)
|
|
except Exception as e:
|
|
logger.error(f"Failed to delete ticket {ticket_id}: {e}")
|
|
raise HTTPException(status_code=400, detail=str(e))
|
|
return {"deleted": True, "id": ticket_id}
|