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

same queryset for Establishment list and detail views

Browse Source
This commit is contained in:
evgeniy-st 2019-10-23 13:00:39 +03:00
parent 6f2a2e537d
commit 083c8a7eaa
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/establishment/views/web.py
View File

@ -19,9 +19,12 @@ class EstablishmentMixinView:
def get_queryset(self): def get_queryset(self):
"""Overridden method 'get_queryset'.""" """Overridden method 'get_queryset'."""
return models.Establishment.objects.published() \ qs = models.Establishment.objects.published() \
.with_base_related() \ .with_base_related() \
.annotate_in_favorites(self.request.user) .annotate_in_favorites(self.request.user)
if self.request.country_code:
qs = qs.by_country_code(self.request.country_code)
return qs
class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView): class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView):
@ -30,13 +33,6 @@ class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView):
filter_class = filters.EstablishmentFilter filter_class = filters.EstablishmentFilter
serializer_class = serializers.EstablishmentBaseSerializer serializer_class = serializers.EstablishmentBaseSerializer
def get_queryset(self):
"""Overridden method 'get_queryset'."""
qs = super(EstablishmentListView, self).get_queryset()
if self.request.country_code:
qs = qs.by_country_code(self.request.country_code)
return qs
class EstablishmentRetrieveView(EstablishmentMixinView, generics.RetrieveAPIView): class EstablishmentRetrieveView(EstablishmentMixinView, generics.RetrieveAPIView):
"""Resource for getting a establishment.""" """Resource for getting a establishment."""
@ -45,9 +41,7 @@ class EstablishmentRetrieveView(EstablishmentMixinView, generics.RetrieveAPIView
serializer_class = serializers.EstablishmentDetailSerializer serializer_class = serializers.EstablishmentDetailSerializer
def get_queryset(self): def get_queryset(self):
return super().get_queryset() \ return super().get_queryset().with_extended_related()
.by_country_code(self.request.country_code) \
.with_extended_related()
class EstablishmentRecentReviewListView(EstablishmentListView): class EstablishmentRecentReviewListView(EstablishmentListView):