From ca2ac15cdbca5399e96e42a49dfe9332c7e2d63a Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 11 Dec 2019 10:23:59 +0300 Subject: [PATCH] fix product type --- apps/search_indexes/documents/product.py | 2 +- apps/search_indexes/serializers.py | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/search_indexes/documents/product.py b/apps/search_indexes/documents/product.py index 2a88f4ad..aa8fc999 100644 --- a/apps/search_indexes/documents/product.py +++ b/apps/search_indexes/documents/product.py @@ -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={ diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 962c4032..4fc5a027 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -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)