Projects/dibbler
10
3
Fork 0
Code Issues 26 Pull Requests 1 Actions Activity

fixup! WIP

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-12-09 13:25:34 +09:00
parent aaa5a6c556
commit c6ecb6fae9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dibbler/queries/search_product.py
View File

@@ -1,4 +1,4 @@
from sqlalchemy import and_, literal, or_, select from sqlalchemy import and_, literal, not_, or_, select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from dibbler.models import Product from dibbler.models import Product
@@ -7,7 +7,7 @@ from dibbler.models import Product
def search_product( def search_product(
string: str, string: str,
sql_session: Session, sql_session: Session,
find_hidden_products=True, find_hidden_products=False,
) -> Product | list[Product]: ) -> Product | list[Product]:
exact_match = sql_session.scalars( exact_match = sql_session.scalars(
select(Product).where( select(Product).where(
@@ -15,7 +15,7 @@ def search_product(
Product.bar_code == string, Product.bar_code == string,
and_( and_(
Product.name == string, Product.name == string,
literal(True) if find_hidden_products else not Product.hidden, literal(True) if find_hidden_products else not_(Product.hidden),
), ),
) )
) )
@@ -30,7 +30,7 @@ def search_product(
Product.bar_code.ilike(f"%{string}%"), Product.bar_code.ilike(f"%{string}%"),
and_( and_(
Product.name.ilike(f"%{string}%"), Product.name.ilike(f"%{string}%"),
literal(True) if find_hidden_products else not Product.hidden, literal(True) if find_hidden_products else not_(Product.hidden),
), ),
) )
) )

2
tests/queries/test_search_product.py
View File

@@ -37,7 +37,7 @@ def test_search_product_name_exact_match(sql_session: Session) -> None:
def test_search_product_name_partial_match(sql_session: Session) -> None: def test_search_product_name_partial_match(sql_session: Session) -> None:
insert_test_data(sql_session) insert_test_data(sql_session)
result = search_product("Product", sql_session) result = search_product("Test Product", sql_session)
assert isinstance(result, list) assert isinstance(result, list)
assert len(result) == 2 assert len(result) == 2
names = {product.name for product in result} names = {product.name for product in result}