Skip to content
Snippets Groups Projects
Commit 15897418 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'SDC-957-database-change-only' into 'master'

database change, calculated_qualities as jsonfield

See merge request !300
parents 90bbcf3f 5b2ec10c
Branches
No related tags found
3 merge requests!304update branch with master,!301Master,!300database change, calculated_qualities as jsonfield
Pipeline #51975 passed
# Generated by Django 3.1.4 on 2023-06-21 07:08
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('taskdatabase', '0026_task_calculated_quality'),
]
operations = [
migrations.AddField(
model_name='task',
name='calculated_qualities',
field=models.JSONField(blank=True, null=True),
),
]
# Generated by Django 3.1.4 on 2023-06-21 07:46
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('taskdatabase', '0027_task_calculated_qualities'),
]
operations = [
migrations.RemoveField(
model_name='task',
name='calculated_quality',
),
]
......@@ -77,7 +77,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)
calculated_qualities = models.JSONField(null=True, blank=True)
resume = models.BooleanField(verbose_name="Resume", default=True)
creationTime = models.DateTimeField(verbose_name="CreationTime",default=datetime.utcnow, blank=True)
......
......@@ -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','calculated_quality',
'status','new_status','quality','calculated_qualities',
'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','calculated_quality',
'status','new_status','quality','calculated_qualities',
'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','calculated_quality',
'status','new_status','quality','calculated_qualities',
'inputs','outputs','metrics','archive',
'size_to_process', 'size_processed', 'total_processing_time',
]
......
......@@ -61,7 +61,6 @@ 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'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment