Modified Scan API, Sidebar Scan Status completed

web/api/serializers.py

@@ -42,6 +42,9 @@ class ScanHistorySerializer(serializers.ModelSerializer):
     subdomain_count = serializers.SerializerMethodField('get_subdomain_count')
     endpoint_count = serializers.SerializerMethodField('get_endpoint_count')
     vulnerability_count = serializers.SerializerMethodField('get_vulnerability_count')
+    current_progress = serializers.SerializerMethodField('get_progress')
+    completed_time = serializers.SerializerMethodField('get_completed_time_in_sec')
+    elapsed_time = serializers.SerializerMethodField('get_elapsed_time')
 
     class Meta:
         model = ScanHistory
@@ -60,6 +63,15 @@ class ScanHistorySerializer(serializers.ModelSerializer):
         if scan_history.get_vulnerability_count:
             return scan_history.get_vulnerability_count()
 
+    def get_progress(self, scan_history):
+        return scan_history.get_progress()
+
+    def get_completed_time_in_sec(self, scan_history):
+        return scan_history.get_completed_time_in_sec()
+
+    def get_elapsed_time(self, scan_history):
+        return scan_history.get_elapsed_time()
+
 
 class OrganizationSerializer(serializers.ModelSerializer):
 

web/api/views.py

@@ -40,9 +40,9 @@ class ScanStatus(APIView):
         pending_scans = ScanHistory.objects.filter(scan_status=-1)
 
         response = {
-            'recently_completed_scans': ScanHistorySerializer(recently_completed_scans, many=True).data,
-            'scanning': currently_scanning.values(),
-            'pending': pending_scans.values()
+            'pending': ScanHistorySerializer(pending_scans, many=True).data,
+            'scanning': ScanHistorySerializer(currently_scanning, many=True).data,
+            'recently_completed_scans': ScanHistorySerializer(recently_completed_scans, many=True).data
         }
         return Response(response)