fix product type

This commit is contained in:
alex 2019-12-11 10:23:59 +03:00
parent 41659958f7
commit ca2ac15cdb
2 changed files with 5 additions and 8 deletions

View File

@ -19,7 +19,7 @@ class ProductDocument(Document):
'id': fields.IntegerField(),
'name': fields.ObjectField(attr='name_indexing', properties=OBJECT_FIELD_PROPERTIES),
'index_name': fields.KeywordField(),
}
},
)
subtypes = fields.ObjectField(
properties={

View File

@ -108,6 +108,9 @@ class ProductTypeSerializer(serializers.Serializer):
return get_translated_value(obj.get('name'))
return get_translated_value(obj.name)
def get_attribute(self, instance):
return instance.product_type if instance and instance.product_type else None
class CityDocumentShortSerializer(serializers.Serializer):
"""City serializer for ES Document,"""
@ -169,12 +172,6 @@ class PSAddressDocumentSerializer(serializers.Serializer):
street_name_1 = serializers.CharField()
postal_code = serializers.CharField()
def to_representation(self, instance):
if instance != AttrDict(d={}) or \
(isinstance(instance, dict) and len(instance) != 0):
return super().to_representation(instance)
return None
class ProductEstablishmentSerializer(serializers.Serializer):
"""Related to Product Establishment ES document serializer."""
@ -311,7 +308,7 @@ class ProductDocumentSerializer(InFavoritesMixin):
subtypes = ProductSubtypeDocumentSerializer(many=True, allow_null=True)
wine_colors = TagDocumentSerializer(many=True)
grape_variety = TagDocumentSerializer(many=True)
# product_type = ProductTypeSerializer(allow_null=True)
product_type = ProductTypeSerializer(allow_null=True)
establishment_detail = ProductEstablishmentSerializer(source='establishment', allow_null=True)
wine_origins = WineOriginSerializer(many=True)