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

Added type and subtypes fields with index names in establishment list view

Browse Source
This commit is contained in:
Semyon Yekhmenin 2019-11-15 13:06:17 +00:00 committed by d.kuzmenko
parent 8f6cf792e7
commit 73f20bd2e8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/establishment/serializers/common.py
View File

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