added grape variety attr to es
This commit is contained in:
parent
d9e46fdfad
commit
cb1366b57b
|
|
@ -44,6 +44,14 @@ class ProductDocument(Document):
|
|||
},
|
||||
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={
|
||||
'id': fields.IntegerField(),
|
||||
'name': fields.KeywordField(),
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ class WineRegionDocumentSerializer(serializers.Serializer):
|
|||
return instance.wine_region if instance and instance.wine_region else None
|
||||
|
||||
|
||||
class WineColorDocumentSerializer(serializers.Serializer):
|
||||
"""Wine color ES document serializer,"""
|
||||
class TagDocumentSerializer(serializers.Serializer):
|
||||
"""Tag ES document serializer,"""
|
||||
|
||||
id = serializers.IntegerField()
|
||||
label_translated = serializers.SerializerMethodField()
|
||||
|
|
@ -217,7 +217,8 @@ class ProductDocumentSerializer(DocumentSerializer):
|
|||
tags = TagsDocumentSerializer(many=True)
|
||||
subtypes = ProductSubtypeDocumentSerializer(many=True, 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)
|
||||
establishment_detail = ProductEstablishmentDocumentSerializer(source='establishment', allow_null=True)
|
||||
|
||||
|
|
@ -241,5 +242,6 @@ class ProductDocumentSerializer(DocumentSerializer):
|
|||
'subtypes',
|
||||
'wine_region',
|
||||
'wine_colors',
|
||||
'grape_variety',
|
||||
'establishment_detail',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -243,6 +243,13 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
|
|||
constants.LOOKUP_QUERY_EXCLUDE,
|
||||
]
|
||||
},
|
||||
'grape_variety_id': {
|
||||
'field': 'grape_variety.id',
|
||||
'lookups': [
|
||||
constants.LOOKUP_QUERY_IN,
|
||||
constants.LOOKUP_QUERY_EXCLUDE,
|
||||
]
|
||||
},
|
||||
'wine_from_country_code': {
|
||||
'field': 'wine_region.country.code',
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user