Making text search apply to both description and sku in imported parts and augmented parts

app/crud/augmented_part.py

@@ -57,14 +57,9 @@ async def get_by_sku(db: AsyncSession, sku: str) -> AugmentedPart | None:
     return result.scalars().first()
 
 
-async def list_all(
-    db: AsyncSession, skip: int = 0, limit: int = 100
-) -> list[AugmentedPart]:
+async def list_all(db: AsyncSession, skip: int = 0, limit: int = 100) -> list[AugmentedPart]:
     result = await db.execute(
-        select(AugmentedPart)
-        .order_by(AugmentedPart.description)
-        .offset(skip)
-        .limit(limit)
+        select(AugmentedPart).order_by(AugmentedPart.description).offset(skip).limit(limit)
     )
     return list(result.scalars().all())
 
@@ -89,19 +84,11 @@ async def list_filtered(
     direction: str = "asc",
     skip: int = 0,
     limit: int = 100,
-    match_sku: bool = False,
 ) -> list[AugmentedPart]:
     q = select(AugmentedPart)
     if description.strip():
         term = f"%{description.strip()}%"
-        if match_sku:
-            q = q.where(
-                or_(
-                    AugmentedPart.description.ilike(term), AugmentedPart.sku.ilike(term)
-                )
-            )
-        else:
-            q = q.where(AugmentedPart.description.ilike(term))
+        q = q.where(or_(AugmentedPart.description.ilike(term), AugmentedPart.sku.ilike(term)))
     if colour_id is not None:
         q = q.where(AugmentedPart.colour_id == colour_id)
     if manufacturer_id is not None:
@@ -130,7 +117,8 @@ async def count_filtered(
 
     q = select(func.count()).select_from(AugmentedPart)
     if description.strip():
-        q = q.where(AugmentedPart.description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(or_(AugmentedPart.description.ilike(term), AugmentedPart.sku.ilike(term)))
     if colour_id is not None:
         q = q.where(AugmentedPart.colour_id == colour_id)
     if manufacturer_id is not None:
@@ -153,17 +141,13 @@ async def get_unlinked_imported_parts_filtered(
     limit: int = 50,
 ) -> list[ImportedPart]:
     q = select(ImportedPart).where(
-        ImportedPart.InventoryID.not_in(
-            select(augmented_part_imported_parts.c.imported_part_id)
-        )
+        ImportedPart.InventoryID.not_in(select(augmented_part_imported_parts.c.imported_part_id))
     )
     if description.strip():
         q = q.where(ImportedPart.Description.ilike(f"%{description.strip()}%"))
     if colour.strip():
         q = q.where(ImportedPart.TBXColour.ilike(f"%{colour.strip()}%"))
-    result = await db.execute(
-        q.order_by(ImportedPart.InventoryID).offset(skip).limit(limit)
-    )
+    result = await db.execute(q.order_by(ImportedPart.InventoryID).offset(skip).limit(limit))
     return list(result.scalars().all())
 
 

app/crud/imported_part.py

@@ -1,4 +1,4 @@
-from sqlalchemy import distinct, insert, select, update
+from sqlalchemy import distinct, insert, or_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.models.imported_part import ImportedPart
@@ -61,7 +61,10 @@ async def list_filtered(
 ) -> list[ImportedPart]:
     q = select(ImportedPart)
     if description.strip():
-        q = q.where(ImportedPart.Description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(ImportedPart.Description.ilike(term), ImportedPart.InventoryID.ilike(term))
+        )
     q = _apply_sort(q, sort, direction)
     result = await db.execute(q.offset(skip).limit(limit))
     return list(result.scalars().all())
@@ -88,7 +91,10 @@ async def count_filtered(db: AsyncSession, description: str = "") -> int:
 
     q = select(func.count()).select_from(ImportedPart)
     if description.strip():
-        q = q.where(ImportedPart.Description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(ImportedPart.Description.ilike(term), ImportedPart.InventoryID.ilike(term))
+        )
     result = await db.execute(q)
     return result.scalar_one()