collections v1

backend/server/adventures/views.py

@@ -3,9 +3,9 @@ from rest_framework.decorators import action
 from rest_framework import viewsets
 from django.db.models.functions import Lower
 from rest_framework.response import Response
-from .models import Adventure, Trip
+from .models import Adventure, Collection
 from worldtravel.models import VisitedRegion, Region, Country
-from .serializers import AdventureSerializer, TripSerializer
+from .serializers import AdventureSerializer, CollectionSerializer
 from rest_framework.permissions import IsAuthenticated
 from django.db.models import Q, Prefetch
 from .permissions import IsOwnerOrReadOnly, IsPublicReadOnly
@@ -65,7 +65,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
     @action(detail=False, methods=['get'])
     def filtered(self, request):
         types = request.query_params.get('types', '').split(',')
-        valid_types = ['visited', 'planned', 'featured']
+        valid_types = ['visited', 'planned']
         types = [t for t in types if t in valid_types]
 
         if not types:
@@ -76,10 +76,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
         for adventure_type in types:
             if adventure_type in ['visited', 'planned']:
                 queryset |= Adventure.objects.filter(
-                    type=adventure_type, user_id=request.user.id, trip=None)
-            elif adventure_type == 'featured':
-                queryset |= Adventure.objects.filter(
-                    type='featured', is_public=True, trip=None)
+                    type=adventure_type, user_id=request.user.id, collection=None)
 
         queryset = self.apply_sorting(queryset)
         adventures = self.paginate_and_respond(queryset, request)
@@ -89,7 +86,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
     def all(self, request):
         if not request.user.is_authenticated:
             return Response({"error": "User is not authenticated"}, status=400)
-        queryset = Adventure.objects.filter(user_id=request.user.id).exclude(type='featured')
+        queryset = Adventure.objects.filter(user_id=request.user.id)
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
@@ -101,39 +98,77 @@ class AdventureViewSet(viewsets.ModelViewSet):
             return paginator.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
-class TripViewSet(viewsets.ModelViewSet):
-    serializer_class = TripSerializer
+    
+class CollectionViewSet(viewsets.ModelViewSet):
+    serializer_class = CollectionSerializer
     permission_classes = [IsOwnerOrReadOnly, IsPublicReadOnly]
+    pagination_class = StandardResultsSetPagination
+
+    def apply_sorting(self, queryset):
+        order_by = self.request.query_params.get('order_by', 'name')
+        order_direction = self.request.query_params.get('order_direction', 'asc')
+
+        valid_order_by = ['name']
+        if order_by not in valid_order_by:
+            order_by = 'name'
+
+        if order_direction not in ['asc', 'desc']:
+            order_direction = 'asc'
+
+        # Apply case-insensitive sorting for the 'name' field
+        if order_by == 'name':
+            queryset = queryset.annotate(lower_name=Lower('name'))
+            ordering = 'lower_name'
+        else:
+            ordering = order_by
+
+        if order_direction == 'desc':
+            ordering = f'-{ordering}'
+
+        print(f"Ordering by: {ordering}")  # For debugging
+
+        return queryset.order_by(ordering)
 
     def get_queryset(self):
-        return Trip.objects.filter(
+        collections =  Collection.objects.filter(
             Q(is_public=True) | Q(user_id=self.request.user.id)
         ).prefetch_related(
             Prefetch('adventure_set', queryset=Adventure.objects.filter(
                 Q(is_public=True) | Q(user_id=self.request.user.id)
             ))
         )
+        return self.apply_sorting(collections)
 
     def perform_create(self, serializer):
         serializer.save(user_id=self.request.user)
 
-    @action(detail=False, methods=['get'])
-    @action(detail=False, methods=['get'])
-    def visited(self, request):
-        visited_adventures = Adventure.objects.filter(
-            type='visited', user_id=request.user.id, trip=None)
-        return self.get_paginated_response(visited_adventures)
+    # @action(detail=False, methods=['get'])
+    # def filtered(self, request):
+    #     types = request.query_params.get('types', '').split(',')
+    #     valid_types = ['visited', 'planned']
+    #     types = [t for t in types if t in valid_types]
 
-    @action(detail=False, methods=['get'])
-    def planned(self, request):
-        trips = self.get_queryset().filter(type='planned', user_id=request.user.id)
-        serializer = self.get_serializer(trips, many=True)
-        return Response(serializer.data)
+    #     if not types:
+    #         return Response({"error": "No valid types provided"}, status=400)
 
-    @action(detail=False, methods=['get'])
-    def featured(self, request):
-        trips = self.get_queryset().filter(type='featured', is_public=True)
-        serializer = self.get_serializer(trips, many=True)
+    #     queryset = Collection.objects.none()
+
+    #     for adventure_type in types:
+    #         if adventure_type in ['visited', 'planned']:
+    #             queryset |= Collection.objects.filter(
+    #                 type=adventure_type, user_id=request.user.id)
+
+    #     queryset = self.apply_sorting(queryset)
+    #     collections = self.paginate_and_respond(queryset, request)
+    #     return collections
+    
+    def paginate_and_respond(self, queryset, request):
+        paginator = self.pagination_class()
+        page = paginator.paginate_queryset(queryset, request)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return paginator.get_paginated_response(serializer.data)
+        serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
     
 class StatsViewSet(viewsets.ViewSet):
@@ -145,9 +180,7 @@ class StatsViewSet(viewsets.ViewSet):
             type='visited', user_id=request.user.id).count()
         planned_count = Adventure.objects.filter(
             type='planned', user_id=request.user.id).count()
-        featured_count = Adventure.objects.filter(
-            type='featured', is_public=True).count()
-        trips_count = Trip.objects.filter(
+        trips_count = Collection.objects.filter(
             user_id=request.user.id).count()
         visited_region_count = VisitedRegion.objects.filter(
             user_id=request.user.id).count()
@@ -158,7 +191,6 @@ class StatsViewSet(viewsets.ViewSet):
         return Response({
             'visited_count': visited_count,
             'planned_count': planned_count,
-            'featured_count': featured_count,
             'trips_count': trips_count,
             'visited_region_count': visited_region_count,
             'total_regions': total_regions,