feat: Add validation for adventure type matching trip type

backend/server/adventures/models.py

@@ -44,6 +44,8 @@ class Adventure(models.Model):
                 raise ValidationError('Adventures must be associated with trips owned by the same user. Trip owner: ' + self.trip.user_id.username + ' Adventure owner: ' + self.user_id.username)
             if self.type != self.trip.type:
                 raise ValidationError('Adventure type must match trip type. Trip type: ' + self.trip.type + ' Adventure type: ' + self.type)
+            if self.type == 'featured' and not self.is_public:
+                raise ValidationError('Featured adventures must be public. Adventure: ' + self.name)
 
     def __str__(self):
         return self.name
@@ -60,13 +62,12 @@ class Trip(models.Model):
 
     # if connected adventures are private and trip is public, raise an error
     def clean(self):
-        if self.is_public:
+        if self.is_public and self.pk:  # Only check if the instance has a primary key
             for adventure in self.adventure_set.all():
                 if not adventure.is_public:
                     raise ValidationError('Public trips cannot be associated with private adventures. Trip: ' + self.name + ' Adventure: ' + adventure.name)
-                
+        if self.type == 'featured' and not self.is_public:
-
+            raise ValidationError('Featured trips must be public. Trip: ' + self.name)
 
     def __str__(self):
-        return self.name
+        return self.name
-

backend/server/adventures/serializers.py

@@ -6,7 +6,7 @@ class AdventureSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Adventure
-        fields = '__all__'  # Serialize all fields of the Adventure model
+        fields = '__all__' 
 
     def to_representation(self, instance):
         representation = super().to_representation(instance)
@@ -19,9 +19,12 @@ class AdventureSerializer(serializers.ModelSerializer):
         return representation
     
 class TripSerializer(serializers.ModelSerializer):
+    adventures = AdventureSerializer(many=True, read_only=True, source='adventure_set')
 
     class Meta:
         model = Trip
-        fields = '__all__'  # Serialize all fields of the Adventure model
+        # fields are all plus the adventures field
+        fields = ['id', 'user_id', 'name', 'type', 'location', 'date', 'is_public', 'adventures']
+
 
    

backend/server/adventures/views.py

@@ -4,7 +4,7 @@ from rest_framework.response import Response
 from .models import Adventure, Trip
 from .serializers import AdventureSerializer, TripSerializer
 from rest_framework.permissions import IsAuthenticated
-from django.db.models import Q
+from django.db.models import Q, Prefetch
 from .permissions import IsOwnerOrReadOnly
 
 class AdventureViewSet(viewsets.ModelViewSet):
@@ -47,6 +47,10 @@ class TripViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         return Trip.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)
+            ))
         )
 
     def perform_create(self, serializer):
@@ -54,21 +58,18 @@ class TripViewSet(viewsets.ModelViewSet):
 
     @action(detail=False, methods=['get'])
     def visited(self, request):
-        trips = Trip.objects.filter(
+        trips = self.get_queryset().filter(type='visited', user_id=request.user.id)
-            type='visited', user_id=request.user.id)
         serializer = self.get_serializer(trips, many=True)
         return Response(serializer.data)
 
     @action(detail=False, methods=['get'])
     def planned(self, request):
-        trips = Trip.objects.filter(
+        trips = self.get_queryset().filter(type='planned', user_id=request.user.id)
-            type='planned', user_id=request.user.id)
         serializer = self.get_serializer(trips, many=True)
         return Response(serializer.data)
 
     @action(detail=False, methods=['get'])
     def featured(self, request):
-        trips = Trip.objects.filter(
+        trips = self.get_queryset().filter(type='featured', is_public=True)
-            type='featured', is_public=True)
         serializer = self.get_serializer(trips, many=True)
         return Response(serializer.data)