From fbaba8fcfbec557196d5420b5f024da6a1e8f7a8 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: Thu, 14 Dec 2023 14:13:43 +0100
Subject: [PATCH] TMSS-2637: add url parameters to remove lofar1/2 stations
---
.../tmss/tmssapp/viewsets/specification.py | 22 +++++++++++++++----
SAS/TMSS/backend/test/t_scheduling_units.py | 1 +
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
index b5fadea88df..1af8a62dcc5 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
@@ -1256,7 +1256,9 @@ class SchedulingUnitBlueprintViewSet(LOFARViewSet):
def copy_to_draft(self, request, pk=None):
scheduling_unit_blueprint = get_object_or_404(models.SchedulingUnitBlueprint, pk=pk)
- scheduling_unit_draft_copy = create_scheduling_unit_draft_from_scheduling_unit_blueprint(scheduling_unit_blueprint)
+ remove_lofar1_stations = strtobool(request.query_params.get('remove_lofar1_stations', 'False'))
+ remove_lofar2_stations = strtobool(request.query_params.get('remove_lofar2_stations', 'False'))
+ scheduling_unit_draft_copy = create_scheduling_unit_draft_from_scheduling_unit_blueprint(scheduling_unit_blueprint, remove_lofar1_stations, remove_lofar2_stations)
# return a response with the new serialized SchedulingUnitBlueprintExtendedSerializer
return Response(serializers.SchedulingUnitDraftExtendedSerializer(scheduling_unit_draft_copy, context={'request':request}).data,
@@ -1513,7 +1515,11 @@ class TaskDraftViewSet(LOFARViewSet):
@action(methods=['post'], detail=True, url_name="copy", name="Create Copy")
def copy(self, request, pk=None):
task_draft = get_object_or_404(models.TaskDraft, pk=pk)
- task_draft_copy = copy_task_draft(task_draft)
+
+ remove_lofar1_stations = strtobool(request.query_params.get('remove_lofar1_stations', 'False'))
+ remove_lofar2_stations = strtobool(request.query_params.get('remove_lofar2_stations', 'False'))
+
+ task_draft_copy = copy_task_draft(task_draft, remove_lofar1_stations, remove_lofar2_stations)
return Response(serializers.TaskDraftSerializer(task_draft_copy, context={'request':request}).data,
status=status.HTTP_201_CREATED)
@@ -1632,7 +1638,11 @@ class TaskBlueprintViewSet(LOFARViewSet):
@action(methods=['post'], detail=True, url_name="copy_to_new_draft", name="Copy to new TaskDraft")
def copy_to_new_draft(self, request, pk=None):
task_blueprint = get_object_or_404(models.TaskBlueprint, pk=pk)
- task_draft_copy = copy_task_blueprint_to_task_draft(task_blueprint)
+
+ remove_lofar1_stations = strtobool(request.query_params.get('remove_lofar1_stations', 'False'))
+ remove_lofar2_stations = strtobool(request.query_params.get('remove_lofar2_stations', 'False'))
+
+ task_draft_copy = copy_task_blueprint_to_task_draft(task_blueprint, remove_lofar1_stations, remove_lofar2_stations)
return Response(serializers.TaskDraftSerializer(task_draft_copy, context={'request':request}).data,
status=status.HTTP_201_CREATED)
@@ -1645,7 +1655,11 @@ class TaskBlueprintViewSet(LOFARViewSet):
def copy_to_new_blueprint(self, request, pk=None):
with transaction.atomic():
task_blueprint = get_object_or_404(models.TaskBlueprint, pk=pk)
- task_blueprint_copy = copy_task_blueprint_via_task_draft_to_new_task_blueprint(task_blueprint)
+
+ remove_lofar1_stations = strtobool(request.query_params.get('remove_lofar1_stations', 'False'))
+ remove_lofar2_stations = strtobool(request.query_params.get('remove_lofar2_stations', 'False'))
+
+ task_blueprint_copy = copy_task_blueprint_via_task_draft_to_new_task_blueprint(task_blueprint, remove_lofar1_stations, remove_lofar2_stations)
create_or_update_subtasks_from_task_blueprint(task_blueprint_copy)
task_blueprint_copy.refresh_from_db()
diff --git a/SAS/TMSS/backend/test/t_scheduling_units.py b/SAS/TMSS/backend/test/t_scheduling_units.py
index 14b1507d597..1a6321b8712 100644
--- a/SAS/TMSS/backend/test/t_scheduling_units.py
+++ b/SAS/TMSS/backend/test/t_scheduling_units.py
@@ -558,6 +558,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
station_schema_template.save()
get_lofar2_stations.cache_clear()
+
class TestFlatStations(unittest.TestCase):
"""
Test the property of 'flat_stations', retrieve a list of all station as a flat list
--
GitLab