add filters for all routes
This commit is contained in:
@@ -1,8 +1,19 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
|
||||
def get_all(session: Session) -> list[models.ShipmentPublic]:
|
||||
def get_all(
|
||||
session: Session,
|
||||
names: list[str],
|
||||
dates: list[str],
|
||||
forms: list[int]
|
||||
) -> list[models.ShipmentPublic]:
|
||||
statement = select(models.Shipment)
|
||||
if len(names) > 0:
|
||||
statement = statement.where(models.Shipment.name.in_(names))
|
||||
if len(dates) > 0:
|
||||
statement = statement.where(models.Shipment.date.in_(list(map(lambda x: datetime.strptime(x, '%Y-%m-%d'), dates))))
|
||||
if len(forms) > 0:
|
||||
statement = statement.join(models.Form).where(models.Form.name.in_(forms))
|
||||
return session.exec(statement.order_by(models.Shipment.name)).all()
|
||||
|
||||
def get_one(session: Session, shipment_id: int) -> models.ShipmentPublic:
|
||||
|
||||
@@ -1,15 +1,26 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
import src.shipments.service as service
|
||||
from src.auth.auth import get_current_user
|
||||
|
||||
router = APIRouter(prefix='/shipments')
|
||||
|
||||
@router.get('/', response_model=list[models.ShipmentPublic], )
|
||||
def get_shipments(session: Session = Depends(get_session)):
|
||||
return service.get_all(session)
|
||||
def get_shipments(
|
||||
session: Session = Depends(get_session),
|
||||
names: list[str] = Query([]),
|
||||
dates: list[str] = Query([]),
|
||||
forms: list[str] = Query([]),
|
||||
):
|
||||
return service.get_all(
|
||||
session,
|
||||
names,
|
||||
dates,
|
||||
forms,
|
||||
)
|
||||
|
||||
@router.get('/{id}', response_model=models.ShipmentPublic)
|
||||
def get_shipment(id: int, session: Session = Depends(get_session)):
|
||||
|
||||
Reference in New Issue
Block a user