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

added grape variety attr to es

Browse Source
This commit is contained in:
Anatoly 2019-11-18 00:01:13 +03:00
parent d9e46fdfad
commit cb1366b57b
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,14 @@ class ProductDocument(Document):
}, },
multi=True, multi=True,
) )
grape_variety = fields.ObjectField(
properties={
'id': fields.IntegerField(),
'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES),
'value': fields.KeywordField(),
},
multi=True,
)
wine_region = fields.ObjectField(properties={ wine_region = fields.ObjectField(properties={
'id': fields.IntegerField(), 'id': fields.IntegerField(),
'name': fields.KeywordField(), 'name': fields.KeywordField(),

8
apps/search_indexes/serializers.py
View File

@ -69,8 +69,8 @@ class WineRegionDocumentSerializer(serializers.Serializer):
return instance.wine_region if instance and instance.wine_region else None return instance.wine_region if instance and instance.wine_region else None
class WineColorDocumentSerializer(serializers.Serializer): class TagDocumentSerializer(serializers.Serializer):
"""Wine color ES document serializer,""" """Tag ES document serializer,"""
id = serializers.IntegerField() id = serializers.IntegerField()
label_translated = serializers.SerializerMethodField() label_translated = serializers.SerializerMethodField()
@ -217,7 +217,8 @@ class ProductDocumentSerializer(DocumentSerializer):
tags = TagsDocumentSerializer(many=True) tags = TagsDocumentSerializer(many=True)
subtypes = ProductSubtypeDocumentSerializer(many=True, allow_null=True) subtypes = ProductSubtypeDocumentSerializer(many=True, allow_null=True)
wine_region = WineRegionDocumentSerializer(allow_null=True) wine_region = WineRegionDocumentSerializer(allow_null=True)
wine_colors = WineColorDocumentSerializer(many=True) wine_colors = TagDocumentSerializer(many=True)
grape_variety = TagDocumentSerializer(many=True)
product_type = ProductTypeDocumentSerializer(allow_null=True) product_type = ProductTypeDocumentSerializer(allow_null=True)
establishment_detail = ProductEstablishmentDocumentSerializer(source='establishment', allow_null=True) establishment_detail = ProductEstablishmentDocumentSerializer(source='establishment', allow_null=True)
@ -241,5 +242,6 @@ class ProductDocumentSerializer(DocumentSerializer):
'subtypes', 'subtypes',
'wine_region', 'wine_region',
'wine_colors', 'wine_colors',
'grape_variety',
'establishment_detail', 'establishment_detail',
) )

7
apps/search_indexes/views.py
View File

@ -243,6 +243,13 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
constants.LOOKUP_QUERY_EXCLUDE, constants.LOOKUP_QUERY_EXCLUDE,
] ]
}, },
'grape_variety_id': {
'field': 'grape_variety.id',
'lookups': [
constants.LOOKUP_QUERY_IN,
constants.LOOKUP_QUERY_EXCLUDE,
]
},
'wine_from_country_code': { 'wine_from_country_code': {
'field': 'wine_region.country.code', 'field': 'wine_region.country.code',
}, },