From 39b2fc49b5c8e1c22682088fcd144563b7ae4c96 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Wed, 18 Sep 2019 11:46:53 +0300 Subject: [PATCH] ES Establishment tags. indexing & search --- apps/search_indexes/documents/establishment.py | 13 +++++++++---- apps/search_indexes/views.py | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index b82bc579..7138cabd 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -18,8 +18,13 @@ class EstablishmentDocument(Document): properties=OBJECT_FIELD_PROPERTIES) tags = fields.ObjectField( properties={ - 'id': fields.IntegerField(attr='id'), - 'label': fields.ObjectField(attr='label') + 'id': fields.IntegerField(attr='metadata.id'), + 'label': fields.ObjectField(attr='metadata.label_indexing', + properties=OBJECT_FIELD_PROPERTIES), + 'category': fields.ObjectField(attr='metadata.category', + properties={ + 'id': fields.IntegerField(), + }) }, multi=True) address = fields.ObjectField( @@ -61,5 +66,5 @@ class EstablishmentDocument(Document): 'price_level', ) - def prepare_tags(self, instance): - return instance.tags_indexing + def get_queryset(self): + return super().get_queryset().published() diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 31d982a4..2accb3e5 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -85,5 +85,11 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): }, 'country': { 'field': 'address.city.country.code' + }, + 'tags_id': { + 'field': 'tags.id', + }, + 'tags_category_id': { + 'field': 'tags.category.id', } }