From 5b66ba51c1578f176ce529c7612e7223b1de821b Mon Sep 17 00:00:00 2001 From: werwty Date: Mon, 14 Aug 2017 11:19:49 -0400 Subject: [PATCH] Update task to serialize progress_report closes #2969 https://pulp.plan.io/issues/2969 --- platform/pulpcore/app/models/progress.py | 2 +- platform/pulpcore/app/serializers/task.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/pulpcore/app/models/progress.py b/platform/pulpcore/app/models/progress.py index 14806bf7ac..2851479506 100644 --- 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 index 2c5563f074..58f82e33ba 100755 --- 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):