Refactor park queryset logic: move base queryset to a dedicated module for improved organization and maintainability

parks/filters.py

@@ -12,7 +12,7 @@ from django_filters import (
     BooleanFilter
 )
 from .models import Park
-from .views import get_base_park_queryset
+from .querysets import get_base_park_queryset
 from companies.models import Company
 
 def validate_positive_integer(value):

parks/querysets.py

@@ -0,0 +1,14 @@
+from django.db.models import QuerySet, Count, Q
+from .models import Park
+
+def get_base_park_queryset() -> QuerySet[Park]:
+    """Get base queryset with all needed annotations and prefetches"""
+    return (
+        Park.objects.select_related('owner')
+        .prefetch_related('location', 'photos', 'rides')
+        .annotate(
+            current_ride_count=Count('rides', distinct=True),
+            current_coaster_count=Count('rides', filter=Q(rides__category="RC"), distinct=True)
+        )
+        .order_by('name')
+    )

parks/views.py

@@ -29,17 +29,7 @@ def get_view_mode(request: HttpRequest) -> ViewMode:
     return cast(ViewMode, 'list' if view_mode == 'list' else 'grid')
 
 
-def get_base_park_queryset() -> QuerySet[Park]:
+from .querysets import get_base_park_queryset
-    """Get base queryset with all needed annotations and prefetches"""
-    return (
-        Park.objects.select_related('owner')
-        .prefetch_related('location', 'photos', 'rides')
-        .annotate(
-            current_ride_count=Count('rides', distinct=True),
-            current_coaster_count=Count('rides', filter=Q(rides__category="RC"), distinct=True)
-        )
-        .order_by('name')
-    )
 
 def add_park_button(request: HttpRequest) -> HttpResponse:
     """Return the add park button partial template"""