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

Fixed find spools not working if no vendor

Browse Source
This commit is contained in:
Donkie
2023-05-10 22:32:58 +02:00
parent 514b23881a
commit 87690b06ca
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spoolman/database/filament.py
View File

@@ -69,7 +69,11 @@ async def find(
article_number: Optional[str] = None, article_number: Optional[str] = None,
) -> list[models.Filament]: ) -> list[models.Filament]:
"""Find a list of filament objects by search criteria.""" """Find a list of filament objects by search criteria."""
stmt = select(models.Filament).options(contains_eager(models.Filament.vendor)).join(models.Filament.vendor) stmt = (
select(models.Filament)
.options(contains_eager(models.Filament.vendor))
.join(models.Filament.vendor, isouter=True)
)
if vendor_name is not None: if vendor_name is not None:
stmt = stmt.where(models.Vendor.name.ilike(f"%{vendor_name}%")) stmt = stmt.where(models.Vendor.name.ilike(f"%{vendor_name}%"))
if vendor_id is not None: if vendor_id is not None:

4
spoolman/database/spool.py
View File

@@ -74,8 +74,8 @@ async def find(
"""Find a list of spool objects by search criteria.""" """Find a list of spool objects by search criteria."""
stmt = ( stmt = (
sqlalchemy.select(models.Spool) sqlalchemy.select(models.Spool)
.join(models.Spool.filament) .join(models.Spool.filament, isouter=True)
.join(models.Filament.vendor) .join(models.Filament.vendor, isouter=True)
.options(contains_eager(models.Spool.filament).contains_eager(models.Filament.vendor)) .options(contains_eager(models.Spool.filament).contains_eager(models.Filament.vendor))
) )
if filament_name is not None: if filament_name is not None: