phase 3 23 qr-scan-check

backend/api/routers/tickets.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
@@ -6,7 +6,7 @@ from sqlalchemy.orm import selectinload
 from api.deps import get_current_user
 from database.models import Seat, Ticket, TicketStatus, User
 from database.session import get_db
-from schemas.ticket import TicketResponse
+from schemas.ticket import TicketResponse, TicketScanRequest, TicketScanResponse
 
 router = APIRouter(prefix="/api/tickets", tags=["tickets"])
 
@@ -27,3 +27,59 @@ async def get_my_tickets(
         .order_by(Ticket.created_at.desc())
     )
     return list(result.scalars().all())
+
+
+@router.post("/scan", response_model=TicketScanResponse)
+async def scan_ticket(
+    body: TicketScanRequest,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> TicketScanResponse:
+    """
+    Сканирует билет по secret_token (QR-код).
+    Переводит статус PAID → SCANNED. Идемпотентно обрабатывает повторное сканирование.
+    """
+    result = await db.execute(
+        select(Ticket).where(Ticket.secret_token == body.token)
+    )
+    ticket: Ticket | None = result.scalar_one_or_none()
+
+    if ticket is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=TicketScanResponse(
+                success=False,
+                message="Билет не найден или подделка",
+                ticket_id=None,
+            ).model_dump(),
+        )
+
+    if ticket.status == TicketStatus.SCANNED:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=TicketScanResponse(
+                success=False,
+                message="Билет уже отсканирован!",
+                ticket_id=ticket.id,
+            ).model_dump(),
+        )
+
+    if ticket.status != TicketStatus.PAID:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=TicketScanResponse(
+                success=False,
+                message=f"Проход запрещен: статус билета '{ticket.status.value}'",
+                ticket_id=ticket.id,
+            ).model_dump(),
+        )
+
+    # PAID → SCANNED
+    ticket.status = TicketStatus.SCANNED
+    await db.commit()
+
+    return TicketScanResponse(
+        success=True,
+        message="Проход разрешен",
+        ticket_id=ticket.id,
+    )

backend/core/pdf_generator.py

@@ -3,7 +3,6 @@
 Поддержка кириллицы: ищет системный TTF-шрифт; при неудаче — транслитерация.
 """
 import io
-import json
 import os
 
 import qrcode
@@ -85,6 +84,7 @@ def generate_qr_ticket(
     row: int,
     number: int,
     price: int,
+    secret_token: str,
 ) -> bytes:
     """
     Renders a landscape ticket (600×250 pt) and returns PDF bytes.
@@ -165,11 +165,7 @@ def generate_qr_ticket(
     c.drawCentredString(495, 30, _safe("Сканировать при входе"))
 
     # ── QR code ──
-    qr_data = json.dumps(
-        {"id": ticket_id, "t": title, "s": sector, "r": row, "m": number},
-        ensure_ascii=False,
-        separators=(",", ":"),
-    )
+    qr_data = f"https://openticket.artifitial.ru/scanner?token={secret_token}"
     qr = qrcode.QRCode(box_size=5, border=1, error_correction=qrcode.constants.ERROR_CORRECT_M)
     qr.add_data(qr_data)
     qr.make(fit=True)

backend/database/models.py

@@ -1,4 +1,5 @@
 import enum
+import uuid
 from datetime import datetime, timezone
 from sqlalchemy import String, Integer, ForeignKey, DateTime, Enum, Boolean
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
@@ -55,6 +56,11 @@ class Ticket(Base):
     )
     idempotency_key: Mapped[str] = mapped_column(String, unique=True, nullable=True)
     pdf_url: Mapped[str | None] = mapped_column(String, nullable=True)
+    # nullable=True — безопасно для существующих строк; новые билеты получают UUID автоматически
+    secret_token: Mapped[str | None] = mapped_column(
+        String, unique=True, index=True, nullable=True,
+        default=lambda: str(uuid.uuid4()),
+    )
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
     updated_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), 

backend/migrations/versions/b2e071ae215a_add_secret_token.py

@@ -0,0 +1,34 @@
+"""add secret token
+
+Revision ID: b2e071ae215a
+Revises: d096f9d0b612
+Create Date: 2026-03-10 11:51:02.385582
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b2e071ae215a'
+down_revision: Union[str, Sequence[str], None] = 'd096f9d0b612'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('tickets', sa.Column('secret_token', sa.String(), nullable=True))
+    op.create_index(op.f('ix_tickets_secret_token'), 'tickets', ['secret_token'], unique=True)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_tickets_secret_token'), table_name='tickets')
+    op.drop_column('tickets', 'secret_token')
+    # ### end Alembic commands ###

backend/schemas/ticket.py

@@ -32,3 +32,13 @@ class TicketResponse(BaseModel):
     seat: SeatInfo
 
     model_config = ConfigDict(from_attributes=True)
+
+
+class TicketScanRequest(BaseModel):
+    token: str
+
+
+class TicketScanResponse(BaseModel):
+    success: bool
+    message: str
+    ticket_id: int | None

backend/worker.py

@@ -71,6 +71,7 @@ async def _handle_ticket_paid(
         row=seat.row,
         number=seat.number,
         price=seat.price,
+        secret_token=str(ticket.secret_token),
     )
 
     object_name = f"tickets/ticket_{ticket_id}.pdf"