From 6a58caa2ecb3d7e54638d78459ef923f5103a152 Mon Sep 17 00:00:00 2001 From: Donkie Date: Mon, 3 Apr 2023 22:02:38 +0200 Subject: [PATCH] Fixed up the find object API --- spoolman/api/v1/filament.py | 9 +++++++-- spoolman/api/v1/spool.py | 11 +++++++++-- spoolman/api/v1/vendor.py | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/spoolman/api/v1/filament.py b/spoolman/api/v1/filament.py index 6d8251e..bea135b 100644 --- a/spoolman/api/v1/filament.py +++ b/spoolman/api/v1/filament.py @@ -73,8 +73,13 @@ class FilamentUpdateParameters(FilamentParameters): description="Get a list of filaments that matches the search query.", response_model_exclude_none=True, ) -async def find(_vendor: Union[int, None] = None) -> list[Filament]: - return [] +async def find( + vendor_id: Optional[int] = None, + name: Optional[str] = None, + material: Optional[str] = None, + article_number: Optional[str] = None, +) -> list[Filament]: + return [] # TODO: Implement @router.get( diff --git a/spoolman/api/v1/spool.py b/spoolman/api/v1/spool.py index 72b7a55..b9e11a3 100644 --- a/spoolman/api/v1/spool.py +++ b/spoolman/api/v1/spool.py @@ -63,8 +63,15 @@ class SpoolUseParameters(BaseModel): description="Get a list of spools that matches the search query.", response_model_exclude_none=True, ) -async def find(_filament: Union[int, None] = None) -> list[Spool]: - return [] +async def find( + filament_id: Optional[int] = None, + name: Optional[str] = None, + material: Optional[str] = None, + vendor: Optional[str] = None, + location: Optional[str] = None, + lot_nr: Optional[str] = None, +) -> list[Spool]: + return [] # TODO: Implement @router.get( diff --git a/spoolman/api/v1/vendor.py b/spoolman/api/v1/vendor.py index 1a76055..5e261f4 100644 --- a/spoolman/api/v1/vendor.py +++ b/spoolman/api/v1/vendor.py @@ -44,8 +44,8 @@ class VendorUpdateParameters(VendorParameters): description="Get a list of vendors that matches the search query.", response_model_exclude_none=True, ) -async def find(_name: Union[int, None] = None) -> list[Vendor]: - return [] +async def find(name: Optional[str] = None) -> list[Vendor]: + return [] # TODO: Implement @router.get(