Skip to content

Commit

Permalink
fix(backend): fix filtering based on year in list queries
Browse files Browse the repository at this point in the history
  • Loading branch information
Adibov authored and azare242 committed Nov 27, 2023
1 parent 220bf5c commit d247aac
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions backend/backend_api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ class WorkshopViewSet(viewsets.GenericViewSet,
def list(self, request, year=None, **kwargs):
if year is None:
year = datetime.datetime.now().year
queryset = models.Workshop.objects.filter(year=year)
return super().list(request, queryset=queryset, **kwargs)
self.queryset = models.Workshop.objects.filter(year=year)
return super().list(request, **kwargs)

def retrieve(self, request, year=None, pk=None):
if year is None:
year = datetime.datetime.now().year
queryset = models.Workshop.objects.filter(year=year)
return super().retrieve(request, pk=pk, queryset=queryset)
self.queryset = models.Workshop.objects.filter(year=year)
return super().retrieve(request, pk=pk)


class PresentationViewSet(viewsets.GenericViewSet,
Expand All @@ -124,14 +124,14 @@ class PresentationViewSet(viewsets.GenericViewSet,
def list(self, request, year=None, **kwargs):
if year is None:
year = datetime.datetime.now().year
queryset = self.queryset.filter(year=year)
return super().list(request, queryset=queryset, **kwargs)
self.queryset = self.queryset.filter(year=year)
return super().list(request, **kwargs)

def retrieve(self, request, year=None, pk=None):
if year is None:
year = datetime.datetime.now().year
queryset = models.Presentation.objects.filter(year=year)
return super().retrieve(request, pk=pk, queryset=queryset)
self.queryset = models.Presentation.objects.filter(year=year)
return super().retrieve(request, pk=pk)


class MiscViewSet(viewsets.ViewSet):
Expand Down

0 comments on commit d247aac

Please sign in to comment.