Qs locations

api_spot/api/serializers/locations.py

@@ -19,7 +19,11 @@ class LocationGetSerializer(serializers.ModelSerializer):
         read_only=True,
         source='location_extra_photo'
     )
-    is_favorited = serializers.SerializerMethodField()
+    low_price = serializers.DecimalField(max_digits=10, decimal_places=2)
+    rating = serializers.DecimalField(max_digits=3, decimal_places=2)
+    is_favorited = serializers.BooleanField()
+    # count_workspace = serializers.IntegerField()
+    # count_meeting_room = serializers.IntegerField()
     coordinates = serializers.SerializerMethodField()
 
     class Meta:
@@ -35,7 +39,6 @@ class Meta:
             'main_photo',
             'extra_photo',
             'rating',
-            'low_price',
             'short_annotation',
             'description',
             'is_favorited',
@@ -45,15 +48,6 @@ class Meta:
             'days_open'
         )
 
-    def get_is_favorited(self, instance, *args, **kwargs) -> bool:
-        """
-        Отображение наличия location в избранном при листинге location.
-        """
-        user = self.context['request'].user
-        if not user.is_authenticated:
-            return False
-        return instance.favorites.filter(user_id=user.id).exists()
-
     def get_coordinates(self, instance) -> list[Decimal]:
         """
         Список координат

api_spot/api/views/locations.py

@@ -1,10 +1,12 @@
+from django.db.models import (Avg, Count, Min, Prefetch, Value,)
 from django_filters.rest_framework import DjangoFilterBackend
 from drf_spectacular.utils import extend_schema
 from rest_framework import filters
 from rest_framework.generics import ListAPIView
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.permissions import AllowAny
 
+
 from api.filters import LocationFilter
 from api.mixins import RetrieveListViewSet
 from api.serializers import (
@@ -18,14 +20,34 @@ class LocationViewSet(RetrieveListViewSet):
     Представление подробной информации о локациях с возможностью фильтрации
     по названию, категориям, метро и избранному.
     """
-    queryset = Location.objects.all().prefetch_related('location_extra_photo')
+    queryset = Location.objects.all()
     serializer_class = LocationGetSerializer
     permission_classes = (AllowAny,)
     pagination_class = LimitOffsetPagination
     filter_backends = (DjangoFilterBackend, filters.SearchFilter,)
     filterset_class = LocationFilter
     search_fields = ('$name', )
 
+    def get_queryset(self):
+        user = self.request.user
+        if user.is_authenticated:
+            qs = super().get_queryset().annotate(
+                is_favorited=Count('favorites', favorites__user=user),
+                low_price=Min('spots__price__total_price'),
+                rating=Avg('spots__orders__reviews__rating'),
+            ).prefetch_related(
+                Prefetch('location_extra_photo')
+            )
+        else:
+            qs = super().get_queryset().annotate(
+                is_favorited=Value(False),
+                low_price=Min('spots__price__total_price'),
+                rating=Avg('spots__orders__reviews__rating'),
+            ).prefetch_related(
+                Prefetch('location_extra_photo')
+            )
+        return qs
+
 
 @extend_schema(
     tags=('locations',)
@@ -43,6 +65,21 @@ class LocationShortListAPIView(ListAPIView):
     filterset_class = LocationFilter
     search_fields = ('$name', )
 
+    def get_queryset(self):
+        user = self.request.user
+        if user.is_authenticated:
+            return super().get_queryset().annotate(
+                is_favorited=Count('favorites', favorites__user=user),
+                low_price=Min('spots__price__total_price'),
+                rating=Avg('spots__orders__reviews__rating')
+            )
+        else:
+            return super().get_queryset().annotate(
+                is_favorited=Value(False),
+                low_price=Min('spots__price__total_price'),
+                rating=Avg('spots__orders__reviews__rating'),
+            )
+
 
 @extend_schema(
     tags=('locations',)
@@ -57,3 +94,8 @@ class LocationMapListAPIView(ListAPIView):
     pagination_class = LimitOffsetPagination
     filter_backends = (DjangoFilterBackend,)
     filterset_class = LocationFilter
+
+    def get_queryset(self):
+        return super().get_queryset().annotate(
+            rating=Avg('spots__orders__reviews__rating')
+        )

api_spot/spots/models/location.py

@@ -5,9 +5,9 @@
     DAYS_CHOICES, END_CHOICES, LAT_MAX, LAT_MIN, LAT_MSG_ERROR, LONG_MAX,
     LONG_MIN, LONG_MSG_ERROR, MEETING_ROOM, NAME_CACHE_MEETING_ROOM,
     NAME_CACHE_WORKSPACE, START_CHOICES, WORK_SPACE,
-
 )
-from spots.services import count_spots, get_low_price, get_rating_location
+from spots.services import count_spots
+# , get_low_price, get_rating_location
 
 
 class Location(models.Model):
@@ -117,17 +117,17 @@ def count_meeting_room(self, *args, **kwargs) -> int:
         """
         return count_spots(self, MEETING_ROOM, NAME_CACHE_MEETING_ROOM)
 
-    def rating(self, *args, **kwargs) -> float:
-        """
-        Получение среднего рейтинга по отзывам.
-        """
-        return get_rating_location(self)
+    # def rating(self, *args, **kwargs) -> float:
+    #     """
+    #     Получение среднего рейтинга по отзывам.
+    #     """
+    #     return get_rating_location(self)
 
-    def low_price(self, *args, **kwargs) -> int:
-        """
-        Минимальная цена.
-        """
-        return get_low_price(self)
+    # def low_price(self, *args, **kwargs) -> int:
+    #     """
+    #     Минимальная цена.
+    #     """
+    #     return get_low_price(self)
 
     def get_full_address_str(self) -> str:
         """