Merge pull request #66 from WDI-Ideas/development
feat(module_2_filter): fix nearest ordering issue
This commit is contained in:
@@ -1013,6 +1013,12 @@ class EventListView(generics.ListAPIView):
|
||||
"start_date" if field == "latest" else f"-{field}"
|
||||
for field in ordering_fields
|
||||
)
|
||||
|
||||
# If ordering is empty, set a default ordering
|
||||
if not ordering:
|
||||
ordering = "-start_date"
|
||||
|
||||
print(f"++++++++++++++++++++++++++++++++ordering data in populatirn flow {ordering}")
|
||||
# Apply the ordering to the queryset
|
||||
return queryset.order_by(*ordering.split(","))
|
||||
|
||||
@@ -1029,12 +1035,15 @@ class EventListView(generics.ListAPIView):
|
||||
gmaps_service = GoogleMapsservice()
|
||||
queryset = gmaps_service.get_nearest_events(queryset, float(latitude), float(longitude))
|
||||
|
||||
print(f"=======orderring data is {ordering}")
|
||||
|
||||
# Apply popularity annotation and ordering if requested
|
||||
if ordering:
|
||||
queryset = self.apply_popularity_latest(queryset, ordering)
|
||||
return queryset
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
print(f"getquery set data is {self.get_queryset()}")
|
||||
queryset = self.filter_queryset(self.get_queryset())
|
||||
page = self.paginate_queryset(queryset)
|
||||
if page is not None:
|
||||
|
||||
Reference in New Issue
Block a user