TMSS-221: Fix nested url for listing projects in a cycle when cycle name...

TMSS-221: Fix nested url for listing projects in a cycle when cycle name contains a space. Also allow filtering project list by cycle via url parameter.

SAS/TMSS/src/tmss/tmssapp/viewsets/specification.py

@@ -170,6 +170,16 @@ class ProjectViewSet(LOFARViewSet):
     serializer_class = serializers.ProjectSerializer
     ordering = ['name']
 
+    def get_queryset(self):
+        queryset = models.Project.objects.all()
+
+        # query by cycle
+        cycle = self.request.query_params.get('cycle', None)
+        if cycle is not None:
+            return queryset.filter(cycles__name=cycle)
+
+        return queryset
+
 
 class ProjectNestedViewSet(LOFARNestedViewSet):
     queryset = models.Project.objects.all()

SAS/TMSS/src/tmss/urls.py

@@ -118,7 +118,7 @@ router.register(r'task_scheduling_relation_draft', viewsets.TaskSchedulingRelati
 router.register(r'task_scheduling_relation_blueprint', viewsets.TaskSchedulingRelationBlueprintViewSet)
 
 # nested
-router.register(r'cycle/(?P<cycle_id>[\w\-]+)/project', viewsets.ProjectNestedViewSet)
+router.register(r'cycle/(?P<cycle_id>[\w\- ]+)/project', viewsets.ProjectNestedViewSet)
 router.register(r'scheduling_set/(?P<scheduling_set_id>\d+)/scheduling_unit_draft', viewsets.SchedulingUnitDraftNestedViewSet)
 router.register(r'scheduling_unit_draft/(?P<scheduling_unit_draft_id>\d+)/scheduling_unit_blueprint', viewsets.SchedulingUnitBlueprintNestedViewSet)
 router.register(r'scheduling_unit_draft/(?P<scheduling_unit_draft_id>\d+)/task_draft', viewsets.TaskDraftNestedViewSet)