diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index ec0809cb..a12e23c8 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -14,7 +14,6 @@ EstablishmentIndex.settings(number_of_shards=1, number_of_replicas=1) class EstablishmentDocument(Document): """Establishment document.""" - name = fields.ObjectField(properties=OBJECT_FIELD_PROPERTIES) description = fields.ObjectField(properties=OBJECT_FIELD_PROPERTIES) tags = fields.ObjectField( properties={ @@ -28,14 +27,12 @@ class EstablishmentDocument(Document): model = models.Establishment fields = ( 'id', + 'name', 'public_mark', 'toque_number', 'price_level', ) - def prepare_name(self, instance): - return instance.name - def prepare_description(self, instance): return instance.description diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 2e69bc1e..f4c27c9b 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -43,7 +43,6 @@ class NewsDocumentSerializer(DocumentSerializer): class EstablishmentDocumentSerializer(DocumentSerializer): """Establishment document serializer.""" - name_translated = serializers.SerializerMethodField(allow_null=True) description_translated = serializers.SerializerMethodField(allow_null=True) class Meta: @@ -57,15 +56,10 @@ class EstablishmentDocumentSerializer(DocumentSerializer): 'public_mark', 'toque_number', 'price_level', - 'name_translated', 'description_translated', 'tags', ) - @staticmethod - def get_name_translated(obj): - return get_translated_value(obj.name) - @staticmethod def get_description_translated(obj): return get_translated_value(obj.description) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 9b007125..0e6b57c1 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -56,7 +56,6 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): 'price_level', ) translated_search_fields = ( - 'name', 'description', ) filter_fields = { diff --git a/project/settings/development.py b/project/settings/development.py index 7ecc6aa2..d5fdb4f1 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -11,3 +11,17 @@ SCHEMA_URI = 'http' DEFAULT_SUBDOMAIN = 'www' SITE_DOMAIN_URI = 'id-east.ru' DOMAIN_URI = 'gm.id-east.ru' + + +# ELASTICSEARCH SETTINGS +ELASTICSEARCH_DSL = { + 'default': { + 'hosts': 'localhost:9200' + } +} + + +ELASTICSEARCH_INDEX_NAMES = { + 'search_indexes.documents.news': 'development_news', + 'search_indexes.documents.establishment': 'development_establishment', +} diff --git a/project/settings/stage.py b/project/settings/stage.py index bbb2f245..59fc78ed 100644 --- a/project/settings/stage.py +++ b/project/settings/stage.py @@ -11,3 +11,17 @@ SCHEMA_URI = 'https' DEFAULT_SUBDOMAIN = 'www' SITE_DOMAIN_URI = 'id-east.ru' DOMAIN_URI = 'gm-stage.id-east.ru' + + +# ELASTICSEARCH SETTINGS +ELASTICSEARCH_DSL = { + 'default': { + 'hosts': 'localhost:9200' + } +} + + +ELASTICSEARCH_INDEX_NAMES = { + 'search_indexes.documents.news': 'stage_news', + 'search_indexes.documents.establishment': 'stage_establishment', +}