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

Fixed spool price sorting not working

Browse Source 
Resolves #349
This commit is contained in:
Donkie
2024-05-20 22:42:44 +02:00
parent 52c52bcfd8
commit ca545b72b9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spoolman/database/spool.py
View File

@@ -109,7 +109,7 @@ async def get_by_id(db: AsyncSession, spool_id: int) -> models.Spool:
return spool return spool
async def find( # noqa: C901 async def find( # noqa: C901, PLR0912
*, *,
db: AsyncSession, db: AsyncSession,
filament_name: Optional[str] = None, filament_name: Optional[str] = None,
@@ -185,6 +185,8 @@ async def find( # noqa: C901
elif fieldstr == "filament.combined_name": elif fieldstr == "filament.combined_name":
sorts.append(models.Vendor.name) sorts.append(models.Vendor.name)
sorts.append(models.Filament.name) sorts.append(models.Filament.name)
elif fieldstr == "price":
sorts.append(coalesce(models.Spool.price, models.Filament.price))
else: else:
sorts.append(parse_nested_field(models.Spool, fieldstr)) sorts.append(parse_nested_field(models.Spool, fieldstr))