Update task to serialize progress_report

closes #2969 https://pulp.plan.io/issues/2969
pulp · Aug 14, 2017 · 5b66ba5 · 5b66ba5
1 parent fc8f567
commit 5b66ba5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/platform/pulpcore/app/models/progress.py b/platform/pulpcore/app/models/progress.py
@@ -60,7 +60,7 @@ class ProgressReport(Model):
     total = models.IntegerField(null=True)
     done = models.IntegerField(default=0)
 
-    task = models.ForeignKey("Task", on_delete=models.CASCADE)
+    task = models.ForeignKey("Task", related_name='progress_reports', on_delete=models.CASCADE)
     suffix = models.TextField(default='')
 
     _using_context_manager = False

diff --git a/platform/pulpcore/app/serializers/task.py b/platform/pulpcore/app/serializers/task.py
@@ -3,7 +3,7 @@
 from rest_framework import serializers
 
 from pulpcore.app import models
-from pulpcore.app.serializers import ModelSerializer
+from pulpcore.app.serializers import ModelSerializer, ProgressReportSerializer
 
 
 class TaskTagSerializer(serializers.ModelSerializer):
@@ -73,11 +73,17 @@ class TaskSerializer(ModelSerializer):
         read_only=True
     )
 
+    progress_reports = ProgressReportSerializer(
+        many=True,
+        read_only=True
+    )
+
     class Meta:
         model = models.Task
         fields = ModelSerializer.Meta.fields + ('group', 'state', 'started_at',
                                                 'finished_at', 'non_fatal_errors',
-                                                'error', 'worker', 'parent', 'tags')
+                                                'error', 'worker', 'parent', 'tags',
+                                                'progress_reports')
 
 
 class WorkerSerializer(ModelSerializer):