Book in functions
This commit is contained in:
@@ -25,25 +25,25 @@ class CRUDArrival:
|
||||
query = query.filter(Arrival.status == status)
|
||||
|
||||
if date_from:
|
||||
query = query.filter(func.date(Arrival.booked_in_dt) >= date_from)
|
||||
query = query.filter(func.date(Arrival.created_dt) >= date_from)
|
||||
|
||||
if date_to:
|
||||
query = query.filter(func.date(Arrival.booked_in_dt) <= date_to)
|
||||
query = query.filter(func.date(Arrival.created_dt) <= date_to)
|
||||
|
||||
return query.order_by(desc(Arrival.booked_in_dt)).offset(skip).limit(limit).all()
|
||||
return query.order_by(desc(Arrival.created_dt)).offset(skip).limit(limit).all()
|
||||
|
||||
def get_arrivals_today(self, db: Session) -> List[Arrival]:
|
||||
"""Get today's arrivals (booked in or landed)"""
|
||||
today = date.today()
|
||||
return db.query(Arrival).filter(
|
||||
and_(
|
||||
func.date(Arrival.booked_in_dt) == today,
|
||||
func.date(Arrival.created_dt) == today,
|
||||
or_(
|
||||
Arrival.status == ArrivalStatus.BOOKED_IN,
|
||||
Arrival.status == ArrivalStatus.LANDED
|
||||
)
|
||||
)
|
||||
).order_by(Arrival.booked_in_dt).all()
|
||||
).order_by(Arrival.created_dt).all()
|
||||
|
||||
def create(self, db: Session, obj_in: ArrivalCreate, created_by: str) -> Arrival:
|
||||
db_obj = Arrival(
|
||||
|
||||
Reference in New Issue
Block a user