magnum-opus-tender-hack/backend
1
0
Fork 0
mirror of https://github.com/magnum-opus-tender-hack/backend.git synced 2024-11-22 09:16:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

improved word search

Browse Source
This commit is contained in:
Alexander Karpov 2022-10-22 12:52:23 +03:00
parent 23e30bbcb8
commit b301b8103c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/search/services/search.py
View File

@ -28,6 +28,15 @@ def process_unit_operation(unit: ProductUnitCharacteristic.objects, operation: s
return unit return unit
def apply_qs_search(qs: Product.objects, text: str):
for st in [".", ",", "!", "?"]:
text = text.replace(st, " ")
text = text.split()
for word in text:
qs = qs.filter(name__unaccent__trigram_similar=word) | qs.filter(name__unaccent__icontains=word)
return qs
def process_search(data: List[dict], limit=5, offset=0) -> List[dict]: def process_search(data: List[dict], limit=5, offset=0) -> List[dict]:
prep_data = [] prep_data = []
prep_dict = {} prep_dict = {}
@ -98,7 +107,7 @@ def process_search(data: List[dict], limit=5, offset=0) -> List[dict]:
typ = x["type"] typ = x["type"]
val = x["value"] val = x["value"]
if typ == "Name": if typ == "Name":
qs = qs.filter(name__unaccent__trigram_similar=val) qs = apply_qs_search(qs, val)
elif typ == "Category": elif typ == "Category":
qs = qs.filter(category__name__unaccent__trigram_similar=val) qs = qs.filter(category__name__unaccent__trigram_similar=val)
elif typ == "Unknown": elif typ == "Unknown":
@ -108,7 +117,7 @@ def process_search(data: List[dict], limit=5, offset=0) -> List[dict]:
val = "".join(translate_ru_en(val)) val = "".join(translate_ru_en(val))
type = get_hints(val) type = get_hints(val)
if type == "Name": if type == "Name":
qs = qs.filter(name__unaccent__trigram_similar=val) qs = apply_qs_search(qs, val)
elif type == "Category": elif type == "Category":
qs = qs.filter(category__name__unaccent__trigram_similar=val) qs = qs.filter(category__name__unaccent__trigram_similar=val)
elif type == "Unknown": elif type == "Unknown":
@ -123,4 +132,4 @@ def process_search(data: List[dict], limit=5, offset=0) -> List[dict]:
qs = qs.filter(unit_characteristics__in=val) qs = qs.filter(unit_characteristics__in=val)
else: else:
qs = qs.filter(characteristics__in=val) qs = qs.filter(characteristics__in=val)
return [x.serialize_self() for x in qs[offset:offset+limit]] return [x.serialize_self() for x in qs[offset : offset + limit]]