Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-22 06:19:38 +02:00
Code Issues Releases Activity

sorting server side

Browse source
This commit is contained in:
Sean Morley 2024-07-11 20:25:56 -04:00
parent fc9ba3ad96
commit a95e3f2a64
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/server/adventures/views.py
View file

@ -1,5 +1,6 @@
from rest_framework.decorators import action from rest_framework.decorators import action
from rest_framework import viewsets from rest_framework import viewsets
from django.db.models.functions import Lower
from rest_framework.response import Response from rest_framework.response import Response
from .models import Adventure, Trip from .models import Adventure, Trip
from worldtravel.models import VisitedRegion, Region, Country from worldtravel.models import VisitedRegion, Region, Country
@ -26,9 +27,12 @@ class AdventureViewSet(viewsets.ModelViewSet):
pagination_class = StandardResultsSetPagination pagination_class = StandardResultsSetPagination
def get_queryset(self): def get_queryset(self):
return Adventure.objects.filter( lower_name = Lower('name')
queryset = Adventure.objects.annotate(
).filter(
Q(is_public=True) | Q(user_id=self.request.user.id) Q(is_public=True) | Q(user_id=self.request.user.id)
) ).order_by(lower_name) # Sort by the annotated lowercase name
return queryset
def perform_create(self, serializer): def perform_create(self, serializer):
serializer.save(user_id=self.request.user) serializer.save(user_id=self.request.user)
@ -52,7 +56,10 @@ class AdventureViewSet(viewsets.ModelViewSet):
queryset |= Adventure.objects.filter( queryset |= Adventure.objects.filter(
type='featured', is_public=True, trip=None) type='featured', is_public=True, trip=None)
return self.paginate_and_respond(queryset, request) lower_name = Lower('name')
queryset = queryset.order_by(lower_name)
adventures = self.paginate_and_respond(queryset, request)
return adventures
def paginate_and_respond(self, queryset, request): def paginate_and_respond(self, queryset, request):
paginator = self.pagination_class() paginator = self.pagination_class()