tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Renamed vendor.x to filament.vendor.x in spool API

Browse Source
This commit is contained in:
Donkie
2023-09-09 10:20:56 +02:00
parent 6ee3b8df70
commit 6f94c17050
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spoolman/api/v1/spool.py
View File

@@ -135,16 +135,16 @@ async def find(
"Partial case-insensitive search term for the filament material. Separate multiple terms with a comma." "Partial case-insensitive search term for the filament material. Separate multiple terms with a comma."
), ),
), ),
vendor_name: Optional[str] = Query( filament_vendor_name: Optional[str] = Query(
alias="vendor.name", alias="filament.vendor.name",
default=None, default=None,
title="Vendor Name", title="Vendor Name",
description=( description=(
"Partial case-insensitive search term for the filament vendor name. Separate multiple terms with a comma." "Partial case-insensitive search term for the filament vendor name. Separate multiple terms with a comma."
), ),
), ),
vendor_id: Optional[str] = Query( filament_vendor_id: Optional[str] = Query(
alias="vendor.id", alias="filament.vendor.id",
default=None, default=None,
title="Vendor ID", title="Vendor ID",
description="Match an exact vendor ID. Separate multiple IDs with a comma.", description="Match an exact vendor ID. Separate multiple IDs with a comma.",
@@ -205,22 +205,22 @@ async def find(
else: else:
filament_ids = None filament_ids = None
vendor_id = vendor_id if vendor_id is not None else vendor_id_old filament_vendor_id = filament_vendor_id if filament_vendor_id is not None else vendor_id_old
if vendor_id is not None: if filament_vendor_id is not None:
try: try:
vendor_ids = [int(vendor_id_item) for vendor_id_item in vendor_id.split(",")] filament_vendor_ids = [int(vendor_id_item) for vendor_id_item in filament_vendor_id.split(",")]
except ValueError as e: except ValueError as e:
raise RequestValidationError([ErrorWrapper(ValueError("Invalid vendor_id"), ("query", "vendor_id"))]) from e raise RequestValidationError([ErrorWrapper(ValueError("Invalid vendor_id"), ("query", "vendor_id"))]) from e
else: else:
vendor_ids = None filament_vendor_ids = None
db_items, total_count = await spool.find( db_items, total_count = await spool.find(
db=db, db=db,
filament_name=filament_name if filament_name is not None else filament_name_old, filament_name=filament_name if filament_name is not None else filament_name_old,
filament_id=filament_ids, filament_id=filament_ids,
filament_material=filament_material if filament_material is not None else filament_material_old, filament_material=filament_material if filament_material is not None else filament_material_old,
vendor_name=vendor_name if vendor_name is not None else vendor_name_old, vendor_name=filament_vendor_name if filament_vendor_name is not None else vendor_name_old,
vendor_id=vendor_ids, vendor_id=filament_vendor_ids,
location=location, location=location,
lot_nr=lot_nr, lot_nr=lot_nr,
allow_archived=allow_archived, allow_archived=allow_archived,

10
tests_integration/tests/spool/test_find.py
View File

@@ -345,7 +345,7 @@ def test_find_spools_by_empty_filament_material(spools: Fixture):
assert spool_lists_equal(spools_result, (spools.spools[3], spools.spools[4])) assert spool_lists_equal(spools_result, (spools.spools[3], spools.spools[4]))
@pytest.mark.parametrize("field_name", ["vendor_name", "vendor.name"]) @pytest.mark.parametrize("field_name", ["vendor_name", "filament.vendor.name"])
def test_find_spools_by_filament_vendor_name(spools: Fixture, field_name: str): def test_find_spools_by_filament_vendor_name(spools: Fixture, field_name: str):
# Execute # Execute
result = httpx.get( result = httpx.get(
@@ -363,7 +363,7 @@ def test_find_spools_by_empty_filament_vendor_name(spools: Fixture):
# Execute # Execute
result = httpx.get( result = httpx.get(
f"{URL}/api/v1/spool", f"{URL}/api/v1/spool",
params={"vendor.name": ""}, params={"filament.vendor.name": ""},
) )
result.raise_for_status() result.raise_for_status()
@@ -372,7 +372,7 @@ def test_find_spools_by_empty_filament_vendor_name(spools: Fixture):
assert spools_result == [spools.spools[4]] assert spools_result == [spools.spools[4]]
@pytest.mark.parametrize("field_name", ["vendor_id", "vendor.id"]) @pytest.mark.parametrize("field_name", ["vendor_id", "filament.vendor.id"])
def test_find_spools_by_filament_vendor_id(spools: Fixture, field_name: str): def test_find_spools_by_filament_vendor_id(spools: Fixture, field_name: str):
# Execute # Execute
result = httpx.get( result = httpx.get(
@@ -394,7 +394,7 @@ def test_find_spools_by_multiple_vendor_ids(spools: Fixture):
result = httpx.get( result = httpx.get(
f"{URL}/api/v1/spool", f"{URL}/api/v1/spool",
params={ params={
"vendor.id": f"{vendor_1},{vendor_2}", "filament.vendor.id": f"{vendor_1},{vendor_2}",
"allow_archived": True, "allow_archived": True,
}, },
) )
@@ -410,7 +410,7 @@ def test_find_spools_by_empty_filament_vendor_id(spools: Fixture):
# Execute # Execute
result = httpx.get( result = httpx.get(
f"{URL}/api/v1/spool", f"{URL}/api/v1/spool",
params={"vendor.id": -1}, params={"filament.vendor.id": -1},
) )
result.raise_for_status() result.raise_for_status()