diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 46a8619e..1d405be7 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -98,7 +98,8 @@ class EstablishmentTypeBaseSerializer(serializers.ModelSerializer): 'id', 'name', 'name_translated', - 'use_subtypes' + 'use_subtypes', + 'index_name', ] extra_kwargs = { 'name': {'write_only': True}, @@ -210,6 +211,8 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): in_favorites = serializers.BooleanField(allow_null=True) tags = TagBaseSerializer(read_only=True, many=True) currency = CurrencySerializer() + type = EstablishmentTypeBaseSerializer(source='establishment_type', read_only=True) + subtypes = EstablishmentSubTypeBaseSerializer(many=True, source='establishment_subtypes') class Meta: """Meta class.""" @@ -228,9 +231,12 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): 'in_favorites', 'address', 'tags', - 'currency' + 'currency', + 'type', + 'subtypes', ] + class EstablishmentListRetrieveSerializer(EstablishmentBaseSerializer): """Establishment with city serializer.""" @@ -254,10 +260,7 @@ class EstablishmentGeoSerializer(EstablishmentBaseSerializer): class Meta(EstablishmentBaseSerializer.Meta): """Meta class.""" - fields = EstablishmentBaseSerializer.Meta.fields + [ - 'type', - 'subtypes', - ] + fields = EstablishmentBaseSerializer.Meta.fields class RangePriceSerializer(serializers.Serializer): @@ -270,8 +273,6 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): description_translated = TranslatedField() image = serializers.URLField(source='image_url') - type = EstablishmentTypeBaseSerializer(source='establishment_type', read_only=True) - subtypes = EstablishmentSubTypeBaseSerializer(many=True, source='establishment_subtypes') awards = AwardSerializer(many=True) schedule = ScheduleRUDSerializer(many=True, allow_null=True) phones = ContactPhonesSerializer(read_only=True, many=True) @@ -294,8 +295,6 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): fields = EstablishmentBaseSerializer.Meta.fields + [ 'description_translated', 'image', - 'subtypes', - 'type', 'awards', 'schedule', 'website',