Merge branch 'TMSS-698' into 'master'

Resolve TMSS-698

Closes TMSS-698

See merge request !428

SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py

@@ -83,10 +83,18 @@ class SubtaskSerializer(DynamicRelationalHyperlinkedModelSerializer):
     subtask_type = serializers.StringRelatedField(source='specifications_template.type', label='subtask_type', read_only=True, help_text='The subtask type as defined in the specifications template, provided here to safe an addition lookup.')
     specifications_doc = JSONEditorField(schema_source='specifications_template.schema')
     duration = FloatDurationField(read_only=True)
+    input_dataproducts = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dataproduct-detail')
+    output_dataproducts = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dataproduct-detail')
+
 
     class Meta:
         model = models.Subtask
         fields = '__all__'
+        extra_fields = ['input_dataproducts', 'output_dataproducts']
+        expandable_fields = {
+            'input_dataproducts': ('lofar.sas.tmss.tmss.tmssapp.serializers.DataproductSerializer', {'many': True}),
+            'output_dataproducts': ('lofar.sas.tmss.tmss.tmssapp.serializers.DataproductSerializer', {'many': True})
+        }
 
 
 class SubtaskInputSerializer(DynamicRelationalHyperlinkedModelSerializer):

SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py

@@ -332,7 +332,7 @@ class TaskBlueprintSerializer(DynamicRelationalHyperlinkedModelSerializer):
             'draft': 'lofar.sas.tmss.tmss.tmssapp.serializers.TaskDraftSerializer',
             'scheduling_unit_blueprint': 'lofar.sas.tmss.tmss.tmssapp.serializers.SchedulingUnitBlueprintSerializer',
             'specifications_template': 'lofar.sas.tmss.tmss.tmssapp.serializers.TaskTemplateSerializer',
-            'subtasks': ('lofar.sas.tmss.tmss.tmssapp.serializers.SutaskSerializer', {'many': True})
+            'subtasks': ('lofar.sas.tmss.tmss.tmssapp.serializers.SubtaskSerializer', {'many': True})
         }