Info display tweaks

This commit is contained in:
James Pattinson
2025-12-10 13:29:12 +00:00
parent 86f1dc65f4
commit f4b69aace0
6 changed files with 103 additions and 31 deletions

View File

@@ -3,19 +3,19 @@ from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from app.api.deps import get_db
from app.crud.crud_ppr import ppr as crud_ppr
from app.schemas.ppr import PPR
from app.schemas.ppr import PPRPublic
router = APIRouter()
@router.get("/arrivals", response_model=List[PPR])
@router.get("/arrivals", response_model=List[PPRPublic])
async def get_public_arrivals(db: Session = Depends(get_db)):
"""Get today's arrivals for public display"""
arrivals = crud_ppr.get_arrivals_today(db)
return arrivals
@router.get("/departures", response_model=List[PPR])
@router.get("/departures", response_model=List[PPRPublic])
async def get_public_departures(db: Session = Depends(get_db)):
"""Get today's departures for public display"""
departures = crud_ppr.get_departures_today(db)

View File

@@ -48,7 +48,7 @@ class CRUDPPR:
return query.order_by(desc(PPRRecord.submitted_dt)).offset(skip).limit(limit).all()
def get_arrivals_today(self, db: Session) -> List[PPRRecord]:
"""Get today's arrivals"""
"""Get today's arrivals - includes aircraft that have arrived and may have departed"""
today = date.today()
return db.query(PPRRecord).filter(
and_(
@@ -56,7 +56,8 @@ class CRUDPPR:
or_(
PPRRecord.status == PPRStatus.NEW,
PPRRecord.status == PPRStatus.CONFIRMED,
PPRRecord.status == PPRStatus.LANDED
PPRRecord.status == PPRStatus.LANDED,
PPRRecord.status == PPRStatus.DEPARTED
)
)
).order_by(PPRRecord.eta).all()

View File

@@ -96,6 +96,25 @@ class PPR(PPRInDBBase):
pass
class PPRPublic(BaseModel):
"""Public schema for arrivals/departures board - excludes sensitive data"""
id: int
status: PPRStatus
ac_reg: str
ac_type: str
ac_call: Optional[str] = None
in_from: str
eta: datetime
out_to: Optional[str] = None
etd: Optional[datetime] = None
landed_dt: Optional[datetime] = None
departed_dt: Optional[datetime] = None
submitted_dt: datetime
class Config:
from_attributes = True
class PPRInDB(PPRInDBBase):
pass