From bc28ff06ed8e47ef66c591ba2e4ef71b0e3a9932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Tue, 20 Apr 2021 15:17:04 +0200
Subject: [PATCH] TMSS-698: make input/output dataproducts expandable, fix typo
---
SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py | 5 +++++
.../backend/src/tmss/tmssapp/serializers/specification.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
index d0660311e04..68f1898a6af 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
@@ -87,6 +87,11 @@ class SubtaskSerializer(DynamicRelationalHyperlinkedModelSerializer):
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 9cea775af71..a29fcbcfb97 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})
}
--
GitLab