fix available lots filter, add ordering

Author: ImToster

application/pay_parking/parking/admin.py

@@ -56,5 +56,9 @@ def payments_link(self, parking):
         link = f'<a href="{url}">Ссылка</a>'
         return mark_safe(link)
 
+    @admin.display(description='Свободные места', ordering='available_lots')
+    def available_lots(self, parking):
+        return parking.available_lots
+    
 
 admin.site.register(Parking, ParkingAdmin)

application/pay_parking/parking/models.py

@@ -31,29 +31,29 @@ def __str__(self):
             f'<br>{self.price_per_hour} руб./час'
 
 
-class Parking(AbstractParking):
-    # available_lots = models.GeneratedField(
-    #     expression=models.F('total_lots') - models.Func(
-    #         models.Aggregate(filter=models.Q(
-    #             payments__start__lte=models.functions.Now()
-    #         ) & models.Q(
-    #             payments__end__gte=models.functions.Now()
-    #         )),
-    #         'COUNT'
-    #     ),
-    #     db_persist=False,
-    #     output_field=models.PositiveIntegerField(),
-    #     verbose_name='Свободные места'
-    # )
+class ParkingManager(models.Manager):
+    def get_queryset(self):
+        from paying.models import Payment
+
+        return super().get_queryset().annotate(
+            available_lots=models.F('total_lots') - models.functions.Coalesce(
+                models.Subquery(
+                    Payment.objects.filter(
+                        parking=models.OuterRef('id')
+                    ).filter(
+                        start__lte=models.functions.Now()
+                    ).filter(
+                        end__gte=models.functions.Now()
+                    ).annotate(
+                        count=models.Count('id')
+                    ).values('count')
+                ), 0
+            )
+        )
 
-    def available_lots(self):
-        return self.total_lots - self.payments.filter(
-            start__lte=models.functions.Now()
-        ).filter(
-            end__gte=models.functions.Now()
-        ).count()
 
-    available_lots.short_description = 'Свободные места'
+class Parking(AbstractParking):
+    objects = ParkingManager()
 
     def __str__(self):
         return self.address

application/pay_parking/parking/views.py

@@ -24,11 +24,8 @@ class UserParkingAdmin(ParkingAdmin):
     @admin.display(description='')
     def choose_link(self, parking):
         url = reverse("paying:create", args=[parking.id])
-        if parking.available_lots:
-            link = f'<a href="{url}">Выбрать</a>'
-            return mark_safe(link)
-        else:
-            return None
+        link = f'<a href="{url}">Выбрать</a>'
+        return mark_safe(link)
 
     def has_add_permission(self, request):
         return False

application/pay_parking/paying/admin.py

@@ -5,15 +5,16 @@
 from django.utils.safestring import mark_safe
 from django.urls import reverse
 from .filters import (
-    MinCreatedAtFiler, MaxCreatedAtFiler, MinStartFiler, MaxStartFiler,
-    MinEndFiler, MaxEndFiler, MinPriceFiler, MaxPriceFiler,
-    MinDurationFiler, MaxDurationFiler,
-    AddressFiler, ParkingZoneFiler,
-    FirstNameFiler, SecondNameFiler, ThirdNameFiler,
-    EmailFiler, IsStaffFiler, UserIdFiler, ParkingIdFiler,
+    MinCreatedAtFilter, MaxCreatedAtFilter, MinStartFilter, MaxStartFilter,
+    MinEndFilter, MaxEndFilter, MinPriceFilter, MaxPriceFilter,
+    MinDurationFilter, MaxDurationFilter,
+    AddressFilter, ParkingZoneFilter,
+    FirstNameFilter, SecondNameFilter, ThirdNameFilter,
+    EmailFilter, IsStaffFilter, UserIdFilter, ParkingIdFilter,
     MinLatitudeFilter, MaxLatitudeFilter, MaxLongitudeFilter,
     MinLongitudeFilter, MaxTotalLotsFilter, MinTotalLotsFilter,
-    MaxPricePerHourFilter, MinPricePerHourFilter
+    MaxPricePerHourFilter, MinPricePerHourFilter,
+    MinAvailableLotsFilter, MaxAvailableLotsFilter
 )
 from pay_parking.filters import FakeFilterWithForm
 from django.shortcuts import get_object_or_404
@@ -44,15 +45,16 @@ class PaymentAdmin(CustomModelAdmin):
 
     list_filter = (
         FakeFilterWithForm,
-        MinCreatedAtFiler, MaxCreatedAtFiler, MinStartFiler, MaxStartFiler,
-        MinEndFiler, MaxEndFiler, MinPriceFiler, MaxPriceFiler,
-        MinDurationFiler, MaxDurationFiler,
-        AddressFiler, ParkingZoneFiler,
-        FirstNameFiler, SecondNameFiler, ThirdNameFiler,
-        EmailFiler, IsStaffFiler, UserIdFiler, ParkingIdFiler,
+        MinCreatedAtFilter, MaxCreatedAtFilter, MinStartFilter, MaxStartFilter,
+        MinEndFilter, MaxEndFilter, MinPriceFilter, MaxPriceFilter,
+        MinDurationFilter, MaxDurationFilter,
+        AddressFilter, ParkingZoneFilter,
+        FirstNameFilter, SecondNameFilter, ThirdNameFilter,
+        EmailFilter, IsStaffFilter, UserIdFilter, ParkingIdFilter,
         MinLatitudeFilter, MaxLatitudeFilter, MaxLongitudeFilter,
         MinLongitudeFilter, MaxTotalLotsFilter, MinTotalLotsFilter,
-        MaxPricePerHourFilter, MinPricePerHourFilter
+        MaxPricePerHourFilter, MinPricePerHourFilter,
+        MinAvailableLotsFilter, MaxAvailableLotsFilter
     )
 
     @admin.display(description='Пользователь', ordering='user_id')
@@ -104,16 +106,16 @@ def changelist_view(self, request, extra_context=None):
         user_id = request.GET.get('user_id')
         extra_context = {}
         if user_id:
-            user = get_object_or_404(User, pk=user_id)
-            extra_context.update({
-                'title': f'Оплаты пользователя {user}'
-            })
+            try:
+                extra_context['title'] = f'Оплаты {User.objects.get(pk=user_id)}'
+            except Exception:
+                pass
         parking_id = request.GET.get('parking_id')
         if parking_id:
-            parking = get_object_or_404(Parking, pk=parking_id)
-            extra_context.update({
-                'subtitle': f'Оплаты парковки {parking}'
-            })
+            try:
+                extra_context['subtitle'] = str(Parking.objects.get(pk=parking_id))
+            except Exception:
+                pass
         return super().changelist_view(request, extra_context)
 
     def add_view(self, request, form_url='', extra_context=None):

application/pay_parking/paying/filters.py

@@ -5,62 +5,62 @@
 )
 
 
-class MinCreatedAtFiler(MinFilter):
+class MinCreatedAtFilter(MinFilter):
     parameter_name = 'min_created_at'
     field_name = 'created_at'
 
 
-class MaxCreatedAtFiler(MaxFilter):
+class MaxCreatedAtFilter(MaxFilter):
     parameter_name = 'max_created_at'
     field_name = 'created_at'
 
 
-class MinStartFiler(MinFilter):
+class MinStartFilter(MinFilter):
     parameter_name = 'min_start'
     field_name = 'start'
 
 
-class MaxStartFiler(MaxFilter):
+class MaxStartFilter(MaxFilter):
     parameter_name = 'max_start'
     field_name = 'end'
 
 
-class MinEndFiler(MinFilter):
+class MinEndFilter(MinFilter):
     parameter_name = 'min_end'
     field_name = 'end'
 
 
-class MaxEndFiler(MaxFilter):
+class MaxEndFilter(MaxFilter):
     parameter_name = 'max_end'
     field_name = 'end'
 
 
-class MinPriceFiler(MinFilter):
+class MinPriceFilter(MinFilter):
     parameter_name = 'min_price'
     field_name = 'price'
 
 
-class MaxPriceFiler(MaxFilter):
+class MaxPriceFilter(MaxFilter):
     parameter_name = 'max_price'
     field_name = 'price'
 
 
-class MinDurationFiler(MinHourDurationFilter):
+class MinDurationFilter(MinHourDurationFilter):
     parameter_name = 'min_duration'
     field_name = 'duration'
 
 
-class MaxDurationFiler(MaxHourDurationFilter):
+class MaxDurationFilter(MaxHourDurationFilter):
     parameter_name = 'max_duration'
     field_name = 'duration'
 
 
-class AddressFiler(ContainFilter):
+class AddressFilter(ContainFilter):
     parameter_name = 'address'
     field_name = 'parking_detail__address'
 
 
-class ParkingZoneFiler(IntergerExactFilter):
+class ParkingZoneFilter(IntergerExactFilter):
     parameter_name = 'parking_zone'
     field_name = 'parking_detail__parking_zone'
 
@@ -95,6 +95,16 @@ class MaxTotalLotsFilter(MaxFilter):
     field_name = 'parking_detail__total_lots'
 
 
+class MinAvailableLotsFilter(MinFilter):
+    parameter_name = 'min_available_lots'
+    field_name = 'parking_detail__available_lots'
+
+
+class MaxAvailableLotsFilter(MaxFilter):
+    parameter_name = 'max_available_lots'
+    field_name = 'parking_detail__available_lots'
+
+
 class MinPricePerHourFilter(MinFilter):
     parameter_name = 'min_price_per_hour'
     field_name = 'parking_detail__price_per_hour'
@@ -105,36 +115,36 @@ class MaxPricePerHourFilter(MaxFilter):
     field_name = 'parking_detail__price_per_hour'
 
 
-class FirstNameFiler(ContainFilter):
+class FirstNameFilter(ContainFilter):
     parameter_name = 'first_name'
     field_name = 'user_detail__first_name'
 
 
-class SecondNameFiler(ContainFilter):
+class SecondNameFilter(ContainFilter):
     parameter_name = 'second_name'
     field_name = 'user_detail__second_name'
 
 
-class ThirdNameFiler(ContainFilter):
+class ThirdNameFilter(ContainFilter):
     parameter_name = 'third_name'
     field_name = 'user_detail__third_name'
 
 
-class EmailFiler(ContainFilter):
+class EmailFilter(ContainFilter):
     parameter_name = 'email'
     field_name = 'user_detail__email'
 
 
-class IsStaffFiler(BooleanExactFilter):
+class IsStaffFilter(BooleanExactFilter):
     parameter_name = 'is_staff'
     field_name = 'user_detail__is_staff'
 
 
-class UserIdFiler(ExactFilter):
+class UserIdFilter(ExactFilter):
     parameter_name = 'user_id'
     field_name = 'user_id'
 
 
-class ParkingIdFiler(ExactFilter):
-    parameter_name = 'user_id'
-    field_name = 'user_id'
+class ParkingIdFilter(ExactFilter):
+    parameter_name = 'parking_id'
+    field_name = 'parking_id'

application/pay_parking/paying/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from .models import Payment, Parking
+from .models import Payment, Parking, User
 from django.core.validators import MinValueValidator, MaxValueValidator
 from pay_parking.forms import FormWithFormsets
 from .models import now
@@ -11,10 +11,6 @@
 
 
 class AdminPaymentForm(forms.ModelForm):
-    # parking = forms.ModelChoiceField(
-    #     Parking.objects.all(),
-    #     widget=widgets.FilteredSelectMultiple('Парковка', False)
-    # )
     class Meta:
         model = Payment
         fields = ('start', 'end', 'parking', 'user', )
@@ -139,6 +135,16 @@ class UserPaymentFilterForm(FormWithFormsets):
         validators=[MinValueValidator(0)],
         label='Макс. число мест'
     )
+    min_available_lots = forms.IntegerField(
+        validators=[MinValueValidator(0)],
+        required=False,
+        label='Мин. число свободных мест'
+    )
+    max_available_lots = forms.IntegerField(
+        required=False,
+        validators=[MinValueValidator(0)],
+        label='Макс. число свободных мест'
+    )
     min_price_per_hour = forms.DecimalField(
         max_digits=8, decimal_places=2,
         required=False,
@@ -196,6 +202,7 @@ class Meta:
             ('Парковка', {
                 'fields': (
                     'address', 'parking_zone', 'min_total_lots', 'max_total_lots',
+                    'min_available_lots', 'max_available_lots',
                     'min_price_per_hour', 'max_price_per_hour', 'min_longitude',
                     'max_longitude', 'min_latitude', 'max_latitude'
                 )
@@ -211,8 +218,16 @@ class PaymentFilterForm(UserPaymentFilterForm):
         max_length=30, required=False, label='Отчество')
     email = forms.CharField(max_length=254, required=False, label='Email')
     is_staff = forms.BooleanField(required=False, label='Сотрудник')
-    user_id = forms.HiddenInput()
-    parking_id = forms.HiddenInput()
+    user_id = forms.ModelChoiceField(
+        User.objects.all(),
+        required=False, label='ID',
+        widget=forms.TextInput()
+    )
+    parking_id = forms.ModelChoiceField(
+        Parking.objects.all(),
+        required=False, label='ID',
+        widget=forms.TextInput()
+    )
 
     class Meta:
         fieldsets = (
@@ -235,10 +250,10 @@ class Meta:
                 'fields': (
                     'address', 'parking_zone', 'min_total_lots', 'max_total_lots',
                     'min_price_per_hour', 'max_price_per_hour', 'min_longitude',
-                    'max_longitude', 'min_latitude', 'max_latitude'
+                    'max_longitude', 'min_latitude', 'max_latitude', 'parking_id'
                 )
             }),
             ('Пользователь', {
-                'fields': ('first_name', 'second_name', 'third_name', 'email', 'is_staff')
+                'fields': ('first_name', 'second_name', 'third_name', 'email', 'is_staff', 'user_id')
             }),
         )