jamesp/ppr-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature enhancement

Browse Source
This commit is contained in:
James Pattinson
2025-12-12 12:11:00 -05:00
parent 32ad7a793a
commit ab3319af06
12 changed files with 512 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/app/crud/crud_departure.py
View File

@@ -25,25 +25,25 @@ class CRUDDeparture:
query = query.filter(Departure.status == status)
if date_from:
query = query.filter(func.date(Departure.booked_out_dt) >= date_from)
query = query.filter(func.date(Departure.created_dt) >= date_from)
if date_to:
query = query.filter(func.date(Departure.booked_out_dt) <= date_to)
query = query.filter(func.date(Departure.created_dt) <= date_to)
return query.order_by(desc(Departure.booked_out_dt)).offset(skip).limit(limit).all()
return query.order_by(desc(Departure.created_dt)).offset(skip).limit(limit).all()
def get_departures_today(self, db: Session) -> List[Departure]:
"""Get today's departures (booked out or departed)"""
today = date.today()
return db.query(Departure).filter(
and_(
func.date(Departure.booked_out_dt) == today,
func.date(Departure.created_dt) == today,
or_(
Departure.status == DepartureStatus.BOOKED_OUT,
Departure.status == DepartureStatus.DEPARTED
)
)
).order_by(Departure.booked_out_dt).all()
).order_by(Departure.created_dt).all()
def create(self, db: Session, obj_in: DepartureCreate, created_by: str) -> Departure:
db_obj = Departure(
@@ -82,7 +82,7 @@ class CRUDDeparture:
db_obj.status = status
if status == DepartureStatus.DEPARTED and timestamp:
db_obj.departure_dt = timestamp
db_obj.departed_dt = timestamp
db.add(db_obj)
db.commit()

18
backend/app/crud/crud_local_flight.py
View File

@@ -29,12 +29,12 @@ class CRUDLocalFlight:
query = query.filter(LocalFlight.flight_type == flight_type)
if date_from:
query = query.filter(func.date(LocalFlight.booked_out_dt) >= date_from)
query = query.filter(func.date(LocalFlight.created_dt) >= date_from)
if date_to:
query = query.filter(func.date(LocalFlight.booked_out_dt) <= date_to)
query = query.filter(func.date(LocalFlight.created_dt) <= date_to)
return query.order_by(desc(LocalFlight.booked_out_dt)).offset(skip).limit(limit).all()
return query.order_by(desc(LocalFlight.created_dt)).offset(skip).limit(limit).all()
def get_active_flights(self, db: Session) -> List[LocalFlight]:
"""Get currently active (booked out or departed) flights"""
@@ -43,33 +43,33 @@ class CRUDLocalFlight:
LocalFlight.status == LocalFlightStatus.BOOKED_OUT,
LocalFlight.status == LocalFlightStatus.DEPARTED
)
).order_by(desc(LocalFlight.booked_out_dt)).all()
).order_by(desc(LocalFlight.created_dt)).all()
def get_departures_today(self, db: Session) -> List[LocalFlight]:
"""Get today's departures (booked out or departed)"""
today = date.today()
return db.query(LocalFlight).filter(
and_(
func.date(LocalFlight.booked_out_dt) == today,
func.date(LocalFlight.created_dt) == today,
or_(
LocalFlight.status == LocalFlightStatus.BOOKED_OUT,
LocalFlight.status == LocalFlightStatus.DEPARTED
)
)
).order_by(LocalFlight.booked_out_dt).all()
).order_by(LocalFlight.created_dt).all()
def get_booked_out_today(self, db: Session) -> List[LocalFlight]:
"""Get all flights booked out today"""
today = date.today()
return db.query(LocalFlight).filter(
and_(
func.date(LocalFlight.booked_out_dt) == today,
func.date(LocalFlight.created_dt) == today,
or_(
LocalFlight.status == LocalFlightStatus.BOOKED_OUT,
LocalFlight.status == LocalFlightStatus.LANDED
)
)
).order_by(LocalFlight.booked_out_dt).all()
).order_by(LocalFlight.created_dt).all()
def create(self, db: Session, obj_in: LocalFlightCreate, created_by: str) -> LocalFlight:
db_obj = LocalFlight(
@@ -114,7 +114,7 @@ class CRUDLocalFlight:
# Set timestamps based on status
current_time = timestamp if timestamp is not None else datetime.utcnow()
if status == LocalFlightStatus.DEPARTED:
db_obj.departure_dt = current_time
db_obj.departed_dt = current_time
elif status == LocalFlightStatus.LANDED:
db_obj.landed_dt = current_time