phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix extra tags indexing

Browse Source
This commit is contained in:
Kuroshini 2019-12-02 21:32:03 +03:00
parent 140ba040e7
commit e981b48fa0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/establishment/models.py
View File

@ -602,6 +602,14 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin,
if qs.exists(): if qs.exists():
return qs.first().image return qs.first().image
@property
def restaurant_category_indexing(self):
return self.tags.filter(category__index_name='category')
@property
def restaurant_cuisine_indexing(self):
return self.tags.filter(category__index_name='cuisine')
class EstablishmentNoteQuerySet(models.QuerySet): class EstablishmentNoteQuerySet(models.QuerySet):
"""QuerySet for model EstablishmentNote.""" """QuerySet for model EstablishmentNote."""

8
apps/search_indexes/documents/establishment.py
View File

@ -56,7 +56,7 @@ class EstablishmentDocument(Document):
properties=OBJECT_FIELD_PROPERTIES), properties=OBJECT_FIELD_PROPERTIES),
'value': fields.KeywordField(), 'value': fields.KeywordField(),
}, },
multi=True) multi=True, attr='restaurant_category_indexing')
restaurant_cuisine = fields.ObjectField( restaurant_cuisine = fields.ObjectField(
properties={ properties={
'id': fields.IntegerField(attr='id'), 'id': fields.IntegerField(attr='id'),
@ -64,7 +64,7 @@ class EstablishmentDocument(Document):
properties=OBJECT_FIELD_PROPERTIES), properties=OBJECT_FIELD_PROPERTIES),
'value': fields.KeywordField(), 'value': fields.KeywordField(),
}, },
multi=True) multi=True, attr='restaurant_cuisine_indexing')
visible_tags = fields.ObjectField( visible_tags = fields.ObjectField(
properties={ properties={
'id': fields.IntegerField(attr='id'), 'id': fields.IntegerField(attr='id'),
@ -158,6 +158,4 @@ class EstablishmentDocument(Document):
) )
def get_queryset(self): def get_queryset(self):
return super().get_queryset().with_es_related() \ return super().get_queryset().with_es_related()
.with_certain_tag_category_related('category', 'restaurant_category') \
.with_certain_tag_category_related('cuisine', 'restaurant_cuisine')