diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py index d0660311e04974f7bec4cc8c2f24b49c51d115e4..01ca8544b68aa4c5280f9d9f5b5feced84f0822b 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py +++ b/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): diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py index 9cea775af716487a03fd1f9e6c6c8c845f2e0b19..a29fcbcfb975811d317d98a9adee1000b42d7ac5 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py +++ b/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}) }