From 23bae8cf3da59f80830f39ade72a8537338b7bf2 Mon Sep 17 00:00:00 2001 From: bobbyvish Date: Fri, 12 Jul 2024 13:13:53 +0530 Subject: [PATCH 1/3] fix(module_2_filter):changed base query of event filter --- manage_events/api/serializers.py | 2 +- manage_events/api/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manage_events/api/serializers.py b/manage_events/api/serializers.py index b198381..7ea484a 100644 --- a/manage_events/api/serializers.py +++ b/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): diff --git a/manage_events/api/views.py b/manage_events/api/views.py index 2acdeb1..923e868 100644 --- a/manage_events/api/views.py +++ b/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 @@ -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) \ No newline at end of file From 91dba0308c580a406ab1ebf132ff9250dfeda68a Mon Sep 17 00:00:00 2001 From: bobbyvish Date: Fri, 12 Jul 2024 16:00:22 +0530 Subject: [PATCH 2/3] fix(module_2_filter):fixed order by latest --- manage_events/api/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage_events/api/views.py b/manage_events/api/views.py index 923e868..84543d7 100644 --- a/manage_events/api/views.py +++ b/manage_events/api/views.py @@ -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 From 83efd286873135bb4c09cc3021fcd4bf92e09c88 Mon Sep 17 00:00:00 2001 From: bobbyvish Date: Fri, 12 Jul 2024 16:00:55 +0530 Subject: [PATCH 3/3] fix(module_2_filter):fixed order by latest --- manage_events/api/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage_events/api/views.py b/manage_events/api/views.py index 84543d7..4d4be00 100644 --- a/manage_events/api/views.py +++ b/manage_events/api/views.py @@ -1010,7 +1010,7 @@ class EventListView(generics.ListAPIView): # Replace 'latest' with '-created_on' in the ordering fields ordering = ",".join( - "-start_date" 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