generated from gilles/template-webapp
import ali
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
from decimal import Decimal
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import or_, select
|
||||
from sqlalchemy import or_, select, text
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
@@ -33,6 +33,7 @@ class ItemRepository(BaseRepository[Item]):
|
||||
selectinload(Item.category),
|
||||
selectinload(Item.location),
|
||||
selectinload(Item.documents),
|
||||
selectinload(Item.parent_item),
|
||||
)
|
||||
.where(Item.id == id)
|
||||
)
|
||||
@@ -55,6 +56,8 @@ class ItemRepository(BaseRepository[Item]):
|
||||
.options(
|
||||
selectinload(Item.category),
|
||||
selectinload(Item.location),
|
||||
selectinload(Item.documents),
|
||||
selectinload(Item.parent_item),
|
||||
)
|
||||
.offset(skip)
|
||||
.limit(limit)
|
||||
@@ -91,20 +94,24 @@ class ItemRepository(BaseRepository[Item]):
|
||||
stmt = select(Item).options(
|
||||
selectinload(Item.category),
|
||||
selectinload(Item.location),
|
||||
selectinload(Item.documents),
|
||||
selectinload(Item.parent_item),
|
||||
)
|
||||
|
||||
# Recherche textuelle
|
||||
# Recherche full-text via FTS5
|
||||
if query:
|
||||
search_term = f"%{query}%"
|
||||
stmt = stmt.where(
|
||||
or_(
|
||||
Item.name.ilike(search_term),
|
||||
Item.description.ilike(search_term),
|
||||
Item.brand.ilike(search_term),
|
||||
Item.model.ilike(search_term),
|
||||
Item.notes.ilike(search_term),
|
||||
)
|
||||
)
|
||||
# Échapper les caractères spéciaux FTS5 et ajouter le préfixe *
|
||||
safe_query = query.replace('"', '""').strip()
|
||||
if safe_query:
|
||||
# Recherche par préfixe pour résultats en temps réel
|
||||
fts_terms = " ".join(f'"{word}"*' for word in safe_query.split() if word)
|
||||
stmt = stmt.where(
|
||||
Item.id.in_(
|
||||
select(text("rowid")).select_from(text("fts_items")).where(
|
||||
text("fts_items MATCH :fts_query")
|
||||
)
|
||||
)
|
||||
).params(fts_query=fts_terms)
|
||||
|
||||
# Filtres
|
||||
if category_id is not None:
|
||||
@@ -141,16 +148,16 @@ class ItemRepository(BaseRepository[Item]):
|
||||
stmt = select(func.count(Item.id))
|
||||
|
||||
if query:
|
||||
search_term = f"%{query}%"
|
||||
stmt = stmt.where(
|
||||
or_(
|
||||
Item.name.ilike(search_term),
|
||||
Item.description.ilike(search_term),
|
||||
Item.brand.ilike(search_term),
|
||||
Item.model.ilike(search_term),
|
||||
Item.notes.ilike(search_term),
|
||||
)
|
||||
)
|
||||
safe_query = query.replace('"', '""').strip()
|
||||
if safe_query:
|
||||
fts_terms = " ".join(f'"{word}"*' for word in safe_query.split() if word)
|
||||
stmt = stmt.where(
|
||||
Item.id.in_(
|
||||
select(text("rowid")).select_from(text("fts_items")).where(
|
||||
text("fts_items MATCH :fts_query")
|
||||
)
|
||||
)
|
||||
).params(fts_query=fts_terms)
|
||||
|
||||
if category_id is not None:
|
||||
stmt = stmt.where(Item.category_id == category_id)
|
||||
|
||||
Reference in New Issue
Block a user