Patch 3.0 MVP

Author: Le7uk

backend/app/__pycache__/migrate.cpython-313.pyc

@@ -44,9 +44,10 @@ class Booking(Base):
     id = Column(Integer, primary_key=True, index=True)
     user_id = Column(Integer, ForeignKey("users.id"))
     route_id = Column(Integer, ForeignKey("routes.id"))
-    seat_number = Column(Integer)
+    carriage = Column(Integer)  
+    seat_number = Column(Integer)  
     booking_date = Column(DateTime, default=datetime.utcnow)
-    status = Column(String, default="active") 
+    status = Column(String, default="active")
 
     user = relationship("User", back_populates="bookings")
     route = relationship("Route", back_populates="bookings")

backend/app/__pycache__/models.cpython-313.pyc

@@ -7,6 +7,32 @@
 
 router = APIRouter(prefix="/api/bookings", tags=["Bookings"])
 
+@router.get("/my", response_model=list[BookingResponse])
+def get_my_bookings(
+    current_user: User = Depends(get_current_user),
+    db: Session = Depends(get_db)
+):
+    """Отримати мої бронювання"""
+    bookings = db.query(Booking).filter(
+        Booking.user_id == current_user.id
+    ).all()
+    return bookings
+
+@router.get("/occupied/{route_id}")
+def get_occupied_seats(route_id: int, db: Session = Depends(get_db)):
+
+    bookings = db.query(Booking).filter(
+        Booking.route_id == route_id,
+        Booking.status == "active"
+    ).all()
+    
+    occupied = [
+        {"carriage": b.carriage, "seat": b.seat_number} 
+        for b in bookings
+    ]
+    
+    return {"occupied_seats": occupied}
+
 @router.post("", response_model=BookingResponse)
 def create_booking(
     booking_data: BookingCreate,
@@ -20,18 +46,27 @@ def create_booking(
     if route.available_seats <= 0:
         raise HTTPException(status_code=400, detail="No available seats")
 
+    # Перевірка валідності вагону і місця
+    if booking_data.carriage < 1 or booking_data.carriage > 10:
+        raise HTTPException(status_code=400, detail="Carriage must be between 1-10")
+    
+    if booking_data.seat_number < 1 or booking_data.seat_number > 20:
+        raise HTTPException(status_code=400, detail="Seat must be between 1-20")
+    
     existing_booking = db.query(Booking).filter(
         Booking.route_id == booking_data.route_id,
+        Booking.carriage == booking_data.carriage,
         Booking.seat_number == booking_data.seat_number,
         Booking.status == "active"
     ).first()
 
     if existing_booking:
-        raise HTTPException(status_code=400, detail="Seat already booked")
+        raise HTTPException(status_code=400, detail="This seat is already booked")
 
     new_booking = Booking(
         user_id=current_user.id,
         route_id=booking_data.route_id,
+        carriage=booking_data.carriage,
         seat_number=booking_data.seat_number
     )
 
@@ -43,15 +78,6 @@ def create_booking(
 
     return new_booking
 
-@router.get("/my", response_model=list[BookingResponse])
-def get_my_bookings(
-    current_user: User = Depends(get_current_user),
-    db: Session = Depends(get_db)
-):
-    bookings = db.query(Booking).filter(
-        Booking.user_id == current_user.id
-    ).all()
-    return bookings
 
 @router.delete("/{booking_id}")
 def cancel_booking(
@@ -67,7 +93,6 @@ def cancel_booking(
     if not booking:
         raise HTTPException(status_code=404, detail="Booking not found")
 
-    # Повернути місце
     route = db.query(Route).filter(Route.id == booking.route_id).first()
     route.available_seats += 1
 

backend/app/__pycache__/seed_data.cpython-313.pyc

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, HTTPException , Depends, Query 
 from sqlalchemy.orm import Session
 from ..database import get_db
 from ..models import Route, Train

backend/app/models.py

@@ -2,15 +2,16 @@
 from datetime import datetime
 from .route import RouteResponse
 
-
 class BookingCreate(BaseModel):
     route_id: int
+    carriage: int  
     seat_number: int
 
 class BookingResponse(BaseModel):
     id: int
     user_id: int
     route_id: int
+    carriage: int  
     seat_number: int
     booking_date: datetime
     status: str