add filters for all routes
This commit is contained in:
@@ -1,8 +1,16 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
|
||||
def get_all(session: Session) -> list[models.UserPublic]:
|
||||
def get_all(
|
||||
session: Session,
|
||||
names: list[str],
|
||||
emails: list[str],
|
||||
) -> list[models.UserPublic]:
|
||||
statement = select(models.User)
|
||||
if len(names) > 0:
|
||||
statement = statement.where(models.User.name.in_(names))
|
||||
if len(emails) > 0:
|
||||
statement = statement.where(models.User.email.in_(emails))
|
||||
return session.exec(statement.order_by(models.User.name)).all()
|
||||
|
||||
def get_one(session: Session, user_id: int) -> models.UserPublic:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
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
|
||||
@@ -8,8 +8,16 @@ import src.users.service as service
|
||||
router = APIRouter(prefix='/users')
|
||||
|
||||
@router.get('/', response_model=list[models.UserPublic])
|
||||
def get_users(session: Session = Depends(get_session)):
|
||||
return service.get_all(session)
|
||||
def get_users(
|
||||
session: Session = Depends(get_session),
|
||||
names: list[str] = Query([]),
|
||||
emails: list[str] = Query([]),
|
||||
):
|
||||
return service.get_all(
|
||||
session,
|
||||
names,
|
||||
emails,
|
||||
)
|
||||
|
||||
@router.get('/{id}', response_model=models.UserPublic)
|
||||
def get_users(id: int, session: Session = Depends(get_session)):
|
||||
|
||||
Reference in New Issue
Block a user