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

Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

Browse Source
This commit is contained in:
Александр Пархомин 2020-02-05 18:42:54 +03:00
commit 8aa7f89fe2
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/establishment/serializers/back.py
View File

@ -17,6 +17,7 @@ from gallery.models import Image
from location.serializers import AddressDetailSerializer, TranslatedField, AddressBaseSerializer from location.serializers import AddressDetailSerializer, TranslatedField, AddressBaseSerializer
from main.models import Currency from main.models import Currency
from main.serializers import AwardSerializer from main.serializers import AwardSerializer
from tag.serializers import TagBaseSerializer
from utils.decorators import with_base_attributes from utils.decorators import with_base_attributes
from utils.methods import string_random from utils.methods import string_random
from utils.serializers import ImageBaseSerializer, ProjectModelSerializer, TimeZoneChoiceField, \ from utils.serializers import ImageBaseSerializer, ProjectModelSerializer, TimeZoneChoiceField, \
@ -90,6 +91,12 @@ class EstablishmentListCreateSerializer(model_serializers.EstablishmentBaseSeria
subtypes = model_serializers.EstablishmentSubTypeBaseSerializer(source='establishment_subtypes', subtypes = model_serializers.EstablishmentSubTypeBaseSerializer(source='establishment_subtypes',
read_only=True, many=True) read_only=True, many=True)
restaurant_category = TagBaseSerializer(read_only=True, many=True, allow_null=True)
restaurant_cuisine = TagBaseSerializer(read_only=True, many=True, allow_null=True)
artisan_category = TagBaseSerializer(read_only=True, many=True, allow_null=True)
distillery_type = TagBaseSerializer(read_only=True, many=True, allow_null=True)
food_producer = TagBaseSerializer(read_only=True, many=True, allow_null=True)
class Meta(model_serializers.EstablishmentBaseSerializer.Meta): class Meta(model_serializers.EstablishmentBaseSerializer.Meta):
fields = [ fields = [
'id', 'id',
@ -123,6 +130,11 @@ class EstablishmentListCreateSerializer(model_serializers.EstablishmentBaseSeria
'address_id', 'address_id',
'status', 'status',
'status_display', 'status_display',
'restaurant_category',
'restaurant_cuisine',
'artisan_category',
'distillery_type',
'food_producer',
] ]
def to_representation(self, instance): def to_representation(self, instance):

8
apps/establishment/views/back.py
View File

@ -58,6 +58,14 @@ class EstablishmentListCreateView(EstablishmentMixinViews, generics.ListCreateAP
IsEstablishmentAdministrator, IsEstablishmentAdministrator,
) )
def get_queryset(self):
return super().get_queryset() \
.with_certain_tag_category_related('category', 'restaurant_category') \
.with_certain_tag_category_related('cuisine', 'restaurant_cuisine') \
.with_certain_tag_category_related('shop_category', 'artisan_category') \
.with_certain_tag_category_related('distillery_type', 'distillery_type') \
.with_certain_tag_category_related('producer_type', 'food_producer')
class EmployeeEstablishmentPositionsView(generics.ListAPIView): class EmployeeEstablishmentPositionsView(generics.ListAPIView):
"""Establishment by employee view.""" """Establishment by employee view."""