Further fixes on jira payload readings

lsst-ts · Jan 25, 2023 · c49f977 · c49f977
1 parent a39b3d5
commit c49f977
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/manager/api/tests/test_jira.py b/manager/api/tests/test_jira.py
@@ -17,15 +17,10 @@ def setUp(self):
             "user_agent",
             "tags",
         ]
-        exposure_params = ["obs_id", "instrument", "exposure_flag"]
-        narrative_params = [
-            "systems",
-            "subsystems",
-            "cscs",
+        exposure_params_required = ["obs_id", "instrument", "exposure_flag"]
+        narrative_params_required = [
             "date_begin",
             "date_end",
-            "time_lost",
-            "level",
         ]
 
         request_shared = {
@@ -92,7 +87,7 @@ def setUp(self):
         )
 
         data_exposure_without_param = {**request_full_exposure}
-        del data_exposure_without_param[random.choice(exposure_params)]
+        del data_exposure_without_param[random.choice(exposure_params_required)]
         self.jira_request_exposure_without_param = requests.Request(
             data=data_exposure_without_param
         )
@@ -111,7 +106,7 @@ def setUp(self):
         )
 
         data_narrative_without_param = {**request_full_narrative}
-        del data_narrative_without_param[random.choice(narrative_params)]
+        del data_narrative_without_param[random.choice(narrative_params_required)]
         self.jira_request_narrative_without_param = requests.Request(
             data=data_narrative_without_param
         )

diff --git a/manager/api/views.py b/manager/api/views.py
@@ -1194,9 +1194,21 @@ def makeJiraDescription(request_data):
     # Narrative log params
     if request_type == "narrative":
         try:
-            systems = ", ".join(request_data["systems"].split(","))
-            subsystems = ", ".join(request_data["subsystems"].split(","))
-            cscs = ", ".join(request_data["cscs"].split(","))
+            systems = (
+                ", ".join(request_data["systems"].split(","))
+                if request_data.get("systems", False)
+                else "None"
+            )
+            subsystems = (
+                ", ".join(request_data["subsystems"].split(","))
+                if request_data.get("subsystems", False)
+                else "None"
+            )
+            cscs = (
+                ", ".join(request_data["cscs"].split(","))
+                if request_data.get("cscs", False)
+                else "None"
+            )
             begin_date = request_data["date_begin"]
             end_date = request_data["date_end"]
             time_lost = str(request_data["time_lost"])