perf: 优化字段名称

apps/ops/models/celery.py

@@ -12,18 +12,24 @@ from ops.celery import app
 
 class CeleryTask(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
-    name = models.CharField(max_length=1024)
+    name = models.CharField(max_length=1024, verbose_name=_('Name'))
     last_published_time = models.DateTimeField(null=True)
 
     @property
     def meta(self):
         task = app.tasks.get(self.name, None)
         return {
-            "display_name": getattr(task, 'verbose_name', None),
-            "comment": getattr(task, 'comment', None),
+            "comment": getattr(task, 'verbose_name', None),
             "queue": getattr(task, 'queue', 'default')
         }
 
+    @property
+    def summary(self):
+        executions = CeleryTaskExecution.objects.filter(name=self.name)
+        total = executions.count()
+        success = executions.filter(state='SUCCESS').count()
+        return {'total': total, 'success': success}
+
     @property
     def state(self):
         last_five_executions = CeleryTaskExecution.objects.filter(name=self.name).order_by('-date_published')[:5]
@@ -49,9 +55,21 @@ class CeleryTaskExecution(models.Model):
     kwargs = models.JSONField(verbose_name=_("Kwargs"))
     state = models.CharField(max_length=16, verbose_name=_("State"))
     is_finished = models.BooleanField(default=False, verbose_name=_("Finished"))
-    date_published = models.DateTimeField(auto_now_add=True)
-    date_start = models.DateTimeField(null=True)
-    date_finished = models.DateTimeField(null=True)
+    date_published = models.DateTimeField(auto_now_add=True, verbose_name=_('Date published'))
+    date_start = models.DateTimeField(null=True, verbose_name=_('Date start'))
+    date_finished = models.DateTimeField(null=True, verbose_name=_('Date finished'))
+
+    @property
+    def time_cost(self):
+        if self.date_finished and self.date_start:
+            return (self.date_finished - self.date_start).total_seconds()
+        return None
+
+    @property
+    def timedelta(self):
+        if self.date_start and self.date_finished:
+            return self.date_finished - self.date_start
+        return None
 
     def __str__(self):
         return "{}: {}".format(self.name, self.id)

apps/ops/models/job.py

@@ -84,6 +84,12 @@ class JobExecution(BaseCreateUpdateModel):
     def short_id(self):
         return str(self.id).split('-')[-1]
 
+    @property
+    def time_cost(self):
+        if self.date_finished and self.date_start:
+            return (self.date_finished - self.date_start).total_seconds()
+        return None
+
     @property
     def timedelta(self):
         if self.date_start and self.date_finished:
@@ -98,12 +104,6 @@ class JobExecution(BaseCreateUpdateModel):
     def is_success(self):
         return self.status == 'success'
 
-    @property
-    def time_cost(self):
-        if self.date_finished and self.date_start:
-            return (self.date_finished - self.date_start).total_seconds()
-        return None
-
     @property
     def inventory_path(self):
         return os.path.join(self.private_dir, 'inventory', 'hosts')

apps/ops/serializers/celery.py

@@ -30,14 +30,15 @@ class CeleryPeriodTaskSerializer(serializers.ModelSerializer):
 class CeleryTaskSerializer(serializers.ModelSerializer):
     class Meta:
         model = CeleryTask
-        fields = [
-            'id', 'name', 'meta', 'state', 'last_published_time',
-        ]
+        read_only_fields = ['id', 'name', 'meta', 'summary', 'state', 'last_published_time']
+        fields = read_only_fields
 
 
 class CeleryTaskExecutionSerializer(serializers.ModelSerializer):
     class Meta:
         model = CeleryTaskExecution
         fields = [
-            "id", "name", "args", "kwargs", "state", "is_finished", "date_published", "date_start", "date_finished"
+            "id", "name", "args", "kwargs", "time_cost", "timedelta", "state", "is_finished", "date_published",
+            "date_start",
+            "date_finished"
         ]