Merge branch 'master' into 'SDC-957-automate-validation'

Merge changes from master into branch

See merge request !299

atdb/taskdatabase/migrations/0026_task_calculated_quality.py

+# Generated by Django 3.1.4 on 2023-06-20 07:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taskdatabase', '0025_auto_20230509_1631'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='calculated_quality',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+    ]

atdb/taskdatabase/models.py

@@ -111,6 +111,7 @@ class Task(models.Model):
     new_status = models.CharField(max_length=50, default="defining", null=True)
     status = models.CharField(db_index=True, default="unknown", max_length=50,blank=True, null=True)
     quality = models.CharField(max_length=10,blank=True, null=True)
+    calculated_quality = models.CharField(max_length=10, blank=True, null=True)
 
     resume = models.BooleanField(verbose_name="Resume", default=True)
     creationTime = models.DateTimeField(verbose_name="CreationTime",default=datetime.utcnow, blank=True)

atdb/taskdatabase/serializers.py

@@ -41,7 +41,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'new_workflow_id','new_workflow_uri','workflow',
                   'stage_request_id',
-                  'status','new_status','quality',
+                  'status','new_status','quality','calculated_quality',
                   'inputs','outputs','metrics','status_history','remarks',
                   'size_to_process','size_processed','total_processing_time',
                   'log_entries','meta_scheduling','environment','archive'
@@ -95,7 +95,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',
-                  'status','new_status','quality',
+                  'status','new_status','quality','calculated_quality',
                   'inputs','outputs','metrics','remarks','status_history',
                   'size_to_process', 'size_processed', 'total_processing_time',
                   'log_entries','meta_scheduling','environment','archive'
@@ -126,7 +126,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer):
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',
-                  'status','new_status','quality',
+                  'status','new_status','quality','calculated_quality',
                   'inputs','outputs','metrics','archive',
                   'size_to_process', 'size_processed', 'total_processing_time',
                   ]

atdb/taskdatabase/views.py

@@ -61,6 +61,7 @@ class TaskFilter(filters.FilterSet):
             'sas_id': ['exact', 'icontains', 'in'],
             'status': ['exact', 'icontains', 'in', 'startswith'],
             'quality': ['exact', 'icontains', 'in', 'startswith'],
+            'calculated_quality': ['exact', 'icontains', 'in'],
             'purge_policy': ['exact'],
             'cleanup_policy': ['exact','icontains','in'],
             'priority': ['exact', 'lte', 'gte'],