Merge pull request #65 from WDI-Ideas/development

Development

manage_events/api/serializers.py

@@ -41,7 +41,7 @@ class VenueSerializer(serializers.ModelSerializer):
 class VenueShortSerializer(serializers.ModelSerializer):
     class Meta:
         model = Venue
-        fields= ["id","title"]
+        fields = ["id", "title"]
 
 
 class EventCategorySerializer(serializers.ModelSerializer):

manage_events/api/views.py

@@ -990,7 +990,7 @@ class EventShareView(APIView):
 class EventListView(generics.ListAPIView):
     authentication_classes = [JWTAuthentication]
     permission_classes = [IsAuthenticated]
-    queryset = Event.objects.filter(active=True, draft=False, deleted=False)
+    queryset = Event.objects.filter(active=True, draft=False, deleted=False, end_date__gte=timezone.now().date())
     serializer_class = EventListSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_class = EventFilter
@@ -1010,7 +1010,7 @@ class EventListView(generics.ListAPIView):
 
         # Replace 'latest' with '-created_on' in the ordering fields
         ordering = ",".join(
-            "-created_on" if field == "latest" else f"-{field}"
+            "start_date" if field == "latest" else f"-{field}"
             for field in ordering_fields
         )
         # Apply the ordering to the queryset
@@ -1042,4 +1042,4 @@ class EventListView(generics.ListAPIView):
             data = self.get_paginated_response(serializer.data)
             return ApiResponse.success(message=constants.SUCCESS, data=data)
         serializer = self.get_serializer(queryset, many=True)
-        return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)
+        return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)