tox fixes

website/events/api/serializers.py

@@ -95,3 +95,10 @@ class EventDataSerializer(serializers.ModelSerializer):
         model = Event
         fields = ('title', 'description', 'start', 'end', 'organiser',
                   'location', 'price', 'fine')
+
+
+class EventDataForEventListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Event
+        fields = ('title', 'description', 'start',
+                  'location', 'price', 'id')

website/events/api/viewsets.py

@@ -8,7 +8,8 @@ from rest_framework.decorators import list_route
 from rest_framework.permissions import IsAuthenticated, IsAdminUser
 
 from events.api.permissions import UnpublishedEventPermissions
-from events.api.serializers import EventSerializer, UnpublishedEventSerializer, EventDataSerializer
+from events.api.serializers import EventSerializer, UnpublishedEventSerializer, EventDataSerializer, \
+    EventDataForEventListSerializer
 from events.models import Event
 
 
@@ -70,3 +71,24 @@ class EventViewset(viewsets.ViewSet):
                     request.query_params['event_id']
                 )
             )
+
+    @list_route(permission_classes=[IsAuthenticated])
+    def eventlist(self, request):
+        try:
+            start = timezone.make_aware(
+                datetime.strptime(request.query_params['start'], '%Y-%m-%d')
+            )
+            end = timezone.make_aware(
+                datetime.strptime(request.query_params['end'], '%Y-%m-%d')
+            )
+        except:
+            raise ParseError(detail='start or end query parameters invalid')
+
+        queryset = self.queryset.filter(
+            end__gte=start,
+            start__lte=end,
+            published=True
+        )
+
+        serializer = EventDataForEventListSerializer(queryset, many=True)
+        return Response(serializer.data)