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

Serverside sort and limit for vendor and filaments

Browse Source
This commit is contained in:
Donkie
2023-08-25 10:23:12 +02:00
parent b9f1b71c1f
commit 9d51ee49ed
6 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spoolman/database/spool.py
View File

@@ -10,7 +10,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import contains_eager, joinedload
from spoolman.database import filament, models
from spoolman.database.utils import SortOrder
from spoolman.database.utils import SortOrder, parse_nested_field
from spoolman.exceptions import ItemCreateError, ItemNotFoundError
from spoolman.math import weight_from_length
@@ -76,28 +76,6 @@ async def get_by_id(db: AsyncSession, spool_id: int) -> models.Spool:
return spool
def parse_nested_field(base_obj: type[models.Base], field: str) -> sqlalchemy.Column:
"""Parse a nested field string into a sqlalchemy field object."""
fields = field.split(".")
if not hasattr(base_obj, fields[0]):
raise ValueError(f"Invalid field name '{field}'")
if fields[0] == "filament" and len(fields) == 1:
raise ValueError("No field specified for filament")
if fields[0] == "filament":
return parse_nested_field(models.Filament, ".".join(fields[1:]))
if fields[0] == "vendor" and len(fields) == 1:
raise ValueError("No field specified for vendor")
if fields[0] == "vendor":
return parse_nested_field(models.Vendor, ".".join(fields[1:]))
if len(fields) > 1:
raise ValueError(f"Field '{fields[0]}' does not have any nested fields")
return getattr(base_obj, fields[0])
async def find( # noqa: C901, PLR0912
*,
db: AsyncSession,