Add API endpoint for future events. fixes #21

Author: kkaufmann

server/eventomat/event/views.py

@@ -1,9 +1,10 @@
 from datetime import datetime
+from django.utils.timezone import make_aware
 
 from dateutil.relativedelta import relativedelta
 from dateutil.rrule import rrulestr
 from rest_framework import status, viewsets
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import detail_route, list_route
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
@@ -49,19 +50,19 @@ def get_queryset(self):
         if self.action != 'list':
             return events
         events = list(events)
-        seriesList = Series.objects.all()
-        for series in seriesList:
+        series_list = Series.objects.all()
+        for series in series_list:
             if not series.rrule:
                 continue
             year_from_now = datetime.now() + relativedelta(years=1)
             rrule = rrulestr(series.rrule).replace(until=year_from_now)
             for date in rrule:
-                start = date.replace(hour=series.start.hour, minute=series.start.minute, second=0)
-                end = date.replace(hour=series.end.hour, minute=series.end.minute, second=0)
+                start = make_aware(date.replace(hour=series.start.hour, minute=series.start.minute, second=0))
+                end = make_aware(date.replace(hour=series.end.hour, minute=series.end.minute, second=0))
                 event = Event(name=series.name, description=series.description, start=start, end=end, room=series.room, series=series)
                 events.append(event)
         return events
-
+  
     @detail_route(methods=['post'])
     def attend(self, request, pk):
         event = self.get_object()
@@ -83,6 +84,13 @@ def perform_destroy(self, instance):
         instance.deleted = True
         instance.save(update_fields=['deleted'])
 
+class FutureEventViewSet(EventViewSet):
+    def get_queryset(self):
+        if self.action != 'list':
+            return EventViewSet.get_queryset(self).filter(end__gte=datetime.now())
+        return [x for x in EventViewSet.get_queryset(self) if x.end >= make_aware(datetime.now())]
+        
+
 
 class OwnUser(APIView):
     def get(self, request):

server/eventomat/urls.py

@@ -22,6 +22,7 @@
 
 router = routers.DefaultRouter()
 router.register(r'events', views.EventViewSet)
+router.register(r'future_events', views.FutureEventViewSet)
 router.register(r'series', views.SeriesViewSet)
 router.register(r'rooms', views.RoomViewSet)