add filters for all routes

backend/src/productors/service.py

@@ -1,7 +1,11 @@
 from sqlmodel import Session, select
 import src.models as models
 
-def get_all(session: Session, names: list[str], types: list[str]) -> list[models.ProductorPublic]:
+def get_all(
+    session: Session, 
+    names: list[str], 
+    types: list[str]
+) -> list[models.ProductorPublic]:
     statement = select(models.Productor)
     if len(names) > 0:
         statement = statement.where(models.Productor.name.in_(names))

backend/src/products/products.py

@@ -14,7 +14,12 @@ def get_products(
     types: list[str] = Query([]),
     productors: list[str] = Query([]),
 ):
-    return service.get_all(session, names, productors, types)
+    return service.get_all(
+        session, 
+        names, 
+        productors, 
+        types,
+    )
 
 @router.get('/{id}', response_model=models.ProductPublic)
 def get_product(id: int, session: Session = Depends(get_session)):

backend/src/products/service.py

@@ -6,7 +6,6 @@ def get_all(
     names: list[str], 
     productors: list[str],
     types: list[str],
-
 ) -> list[models.ProductPublic]:
     statement = select(models.Product)
     if len(names) > 0:

backend/src/shipments/service.py

@@ -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:

backend/src/shipments/shipments.py

@@ -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)):

backend/src/users/service.py

@@ -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:

backend/src/users/users.py

@@ -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)):