Include proper unit for time duration in pipeline API

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

vulnerabilities/api_v2.py

@@ -644,6 +644,7 @@ class PipelineRunAPISerializer(serializers.HyperlinkedModelSerializer):
     status = serializers.SerializerMethodField()
     execution_time = serializers.SerializerMethodField()
     log = serializers.SerializerMethodField()
+    execution_time = serializers.SerializerMethodField()
 
     class Meta:
         model = PipelineRun
@@ -666,7 +667,7 @@ def get_status(self, run):
 
     def get_execution_time(self, run):
         if run.execution_time:
-            return round(run.execution_time, 2)
+            return f"{round(run.execution_time, 2)}s"
 
     def get_log(self, run):
         """Return only last 5000 character of log."""
@@ -675,10 +676,13 @@ def get_log(self, run):
 
 class PipelineScheduleAPISerializer(serializers.HyperlinkedModelSerializer):
     url = serializers.HyperlinkedIdentityField(
-        view_name="schedule-detail", lookup_field="pipeline_id"
+        view_name="schedule-detail",
+        lookup_field="pipeline_id",
     )
     latest_run = serializers.SerializerMethodField()
     next_run_date = serializers.SerializerMethodField()
+    run_interval = serializers.SerializerMethodField()
+    execution_timeout = serializers.SerializerMethodField()
 
     class Meta:
         model = PipelineSchedule
@@ -703,6 +707,12 @@ def get_latest_run(self, schedule):
             return PipelineRunAPISerializer(latest).data
         return None
 
+    def get_run_interval(self, schedule):
+        return f"{schedule.run_interval}hr"
+
+    def get_execution_timeout(self, schedule):
+        return f"{schedule.execution_timeout}hr"
+
 
 class PipelineScheduleCreateSerializer(serializers.ModelSerializer):
     class Meta:

vulnerabilities/tests/test_api_v2.py

@@ -757,7 +757,7 @@ def test_schedule_update_anon_user_not_permitted(self, mock_create_new_job):
 
         self.assertNotEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEqual(self.schedule1.run_interval, 1)
+        self.assertEqual(self.schedule1.run_interval, 24)
 
     @patch("vulnerabilities.models.PipelineSchedule.create_new_job")
     def test_schedule_update_with_staff_token_not_permitted(self, mock_create_new_job):
@@ -772,7 +772,7 @@ def test_schedule_update_with_staff_token_not_permitted(self, mock_create_new_jo
 
         self.assertNotEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEqual(self.schedule1.run_interval, 1)
+        self.assertEqual(self.schedule1.run_interval, 24)
 
     @patch("vulnerabilities.models.PipelineSchedule.create_new_job")
     def test_schedule_update_with_staff_session_permitted(self, mock_create_new_job):