From 0f11a47a790c0b49dbd9b306eaff90644d0a8431 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 9 Dec 2019 16:47:46 +0300 Subject: [PATCH] rest category & rest cuisine for favs (cherry picked from commit 79a70fb) --- apps/establishment/serializers/common.py | 6 +++++- apps/favorites/views.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 5c77ccbf..19b4b764 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -451,13 +451,17 @@ class EstablishmentSimilarSerializer(EstablishmentBaseSerializer): address = AddressDetailSerializer(read_only=True) schedule = ScheduleRUDSerializer(many=True, allow_null=True) 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): fields = EstablishmentBaseSerializer.Meta.fields + [ 'schedule', 'type', 'artisan_category', + 'restaurant_category', + 'restaurant_cuisine', ] diff --git a/apps/favorites/views.py b/apps/favorites/views.py index bee25ced..4faa3e07 100644 --- a/apps/favorites/views.py +++ b/apps/favorites/views.py @@ -30,6 +30,8 @@ class FavoritesEstablishmentListView(generics.ListAPIView): """Override get_queryset method""" return Establishment.objects.filter(favorites__user=self.request.user) \ .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')