Major refactor WIP

This commit is contained in:
2026-04-03 11:13:44 -04:00
parent dee58e0aae
commit 7b2de645db
25 changed files with 5841 additions and 7760 deletions
+79 -1
View File
@@ -5,7 +5,11 @@ from datetime import date
from app.api.deps import get_db, get_current_read_user, get_current_operator_user
from app.crud.crud_ppr import ppr as crud_ppr
from app.crud.crud_journal import journal as crud_journal
from app.crud.crud_arrival import arrival as crud_arrival
from app.crud.crud_departure import departure as crud_departure
from app.schemas.ppr import PPR, PPRCreate, PPRUpdate, PPRStatus, PPRStatusUpdate, Journal
from app.schemas.arrival import ArrivalCreate
from app.schemas.departure import DepartureCreate
from app.models.ppr import User
from app.core.utils import get_client_ip
from app.core.email import email_service
@@ -373,4 +377,78 @@ async def get_ppr_journal(
detail="PPR record not found"
)
return crud_journal.get_by_ppr_id(db, ppr_id=ppr_id)
return crud_journal.get_by_ppr_id(db, ppr_id=ppr_id)
@router.post("/{ppr_id}/activate")
async def activate_ppr(
request: Request,
ppr_id: int,
db: Session = Depends(get_db),
current_user: User = Depends(get_current_operator_user)
):
"""Activate a PPR by creating BOOKED_IN arrival and (if out_to set) BOOKED_OUT departure records."""
db_ppr = crud_ppr.get(db, ppr_id=ppr_id)
if not db_ppr:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="PPR record not found")
if db_ppr.status not in (PPRStatus.NEW, PPRStatus.CONFIRMED):
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=f"PPR cannot be activated in its current state ({db_ppr.status.value})"
)
client_ip = get_client_ip(request)
username = current_user.username
# Create INBOUND arrival (ADMIN submitted_via sets status to INBOUND)
in_from = (db_ppr.in_from or "ZZZZ")[:4].upper()
arrival_in = ArrivalCreate(
registration=db_ppr.ac_reg,
type=db_ppr.ac_type,
callsign=db_ppr.ac_call,
pob=db_ppr.pob_in,
in_from=in_from,
eta=db_ppr.eta,
notes=db_ppr.notes,
submitted_via="ADMIN"
)
new_arrival = crud_arrival.create(db, obj_in=arrival_in, created_by=username, submitted_via="ADMIN", user_ip=client_ip)
# Create PENDING departure linked to this arrival (only visible once arrival lands)
new_departure = None
if db_ppr.out_to:
departure_in = DepartureCreate(
registration=db_ppr.ac_reg,
type=db_ppr.ac_type,
callsign=db_ppr.ac_call,
pob=db_ppr.pob_out if db_ppr.pob_out else db_ppr.pob_in,
out_to=db_ppr.out_to,
etd=db_ppr.etd,
notes=db_ppr.notes,
arrival_id=new_arrival.id,
)
new_departure = crud_departure.create(db, obj_in=departure_in, created_by=username, submitted_via="ADMIN", user_ip=client_ip)
# Mark PPR as ACTIVATED — removes it from Today's PPR and pending arrivals displays
crud_ppr.update_status(db, ppr_id=ppr_id, status=PPRStatus.ACTIVATED, user=username, user_ip=client_ip)
# Broadcast WebSocket update
if hasattr(request.app.state, 'connection_manager'):
await request.app.state.connection_manager.broadcast({
"type": "ppr_activated",
"data": {
"ppr_id": ppr_id,
"arrival_id": new_arrival.id,
"departure_id": new_departure.id if new_departure else None
}
})
return {
"arrival_id": new_arrival.id,
"departure_id": new_departure.id if new_departure else None,
"message": (
f"PPR activated: arrival #{new_arrival.id} created"
+ (f", departure #{new_departure.id} queued (will appear when aircraft lands)" if new_departure else "")
)
}