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

rest category & rest cuisine for favs

Browse Source 
(cherry picked from commit 79a70fb)
This commit is contained in:
Kuroshini 2019-12-09 16:47:46 +03:00
parent 912431690d
commit 0f11a47a79
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,13 +451,17 @@ class EstablishmentSimilarSerializer(EstablishmentBaseSerializer):
address = AddressDetailSerializer(read_only=True) address = AddressDetailSerializer(read_only=True)
schedule = ScheduleRUDSerializer(many=True, allow_null=True) schedule = ScheduleRUDSerializer(many=True, allow_null=True)
type = EstablishmentTypeGeoSerializer(source='establishment_type') type = EstablishmentTypeGeoSerializer(source='establishment_type')
artisan_category = TagBaseSerializer(many=True, allow_null=True) artisan_category = TagBaseSerializer(many=True, allow_null=True, read_only=True)
restaurant_category = TagBaseSerializer(many=True, allow_null=True, read_only=True)
restaurant_cuisine = TagBaseSerializer(many=True, allow_null=True, read_only=True)
class Meta(EstablishmentBaseSerializer.Meta): class Meta(EstablishmentBaseSerializer.Meta):
fields = EstablishmentBaseSerializer.Meta.fields + [ fields = EstablishmentBaseSerializer.Meta.fields + [
'schedule', 'schedule',
'type', 'type',
'artisan_category', 'artisan_category',
'restaurant_category',
'restaurant_cuisine',
] ]

2
apps/favorites/views.py
View File

@ -30,6 +30,8 @@ class FavoritesEstablishmentListView(generics.ListAPIView):
"""Override get_queryset method""" """Override get_queryset method"""
return Establishment.objects.filter(favorites__user=self.request.user) \ return Establishment.objects.filter(favorites__user=self.request.user) \
.order_by('-favorites').with_base_related() \ .order_by('-favorites').with_base_related() \
.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('shop_category', 'artisan_category')