diff --git a/core/elasticsearch/__init__.py b/core/elasticsearch/__init__.py index d3674193..473f93af 100644 --- a/core/elasticsearch/__init__.py +++ b/core/elasticsearch/__init__.py @@ -183,7 +183,6 @@ COMMON_ANALYSIS = { }, "query_lc": {"tokenizer": "standard", "filter": ["lowercase", "asciifolding"]}, }, - "normalizer": {"lc": {"type": "custom", "filter": ["lowercase", "asciifolding"]}}, } diff --git a/core/elasticsearch/documents.py b/core/elasticsearch/documents.py index ebebc4c5..4a2c895e 100644 --- a/core/elasticsearch/documents.py +++ b/core/elasticsearch/documents.py @@ -1,4 +1,4 @@ -from django_elasticsearch_dsl import Document, SearchAsYouTypeField, fields +from django_elasticsearch_dsl import Document, fields from django_elasticsearch_dsl.registries import registry from core.elasticsearch import COMMON_ANALYSIS, ActiveOnlyMixin, _add_multilang_fields @@ -10,8 +10,7 @@ class _BaseDoc(ActiveOnlyMixin, Document): attr="name", analyzer="standard", fields={ - "raw": fields.KeywordField(ignore_above=256, normalizer="lc"), - "sat": SearchAsYouTypeField(max_shingle_size=4), + "raw": fields.KeywordField(ignore_above=256), "ngram": fields.TextField( analyzer="name_ngram", search_analyzer="query_lc" ), @@ -54,14 +53,6 @@ class _BaseDoc(ActiveOnlyMixin, Document): class ProductDocument(_BaseDoc): rating = fields.FloatField(attr="rating") - product_type = fields.KeywordField() - sales_rank = fields.IntegerField() - - def prepare_product_type(self, obj): - return obj.category.slug.split("-")[0] if obj.category else "other" - - def prepare_sales_rank(self, obj): - return obj.total_orders or 0 class Index(_BaseDoc.Index): name = "products"