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

database changes:

- priority default to 0
- sizes to BigPositiveInteger
parent 7a56a4b6
No related branches found
No related tags found
3 merge requests!39Dev nico,!28Acceptance,!27Dev nico
......@@ -9,12 +9,12 @@ CORS_ORIGIN_ALLOW_ALL = True
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': os.environ['DATABASE_NAME'],
'HOST': os.environ['DATABASE_HOST'],
'PORT': os.environ['DATABASE_PORT'],
'USER': os.environ['DATABASE_USER'],
'PASSWORD': os.environ['DATABASE_PASSWORD'],
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'USER': 'atdb_admin',
'PASSWORD': 'atdb123',
'NAME': 'atdb_ldv',
'HOST': 'localhost',
'PORT': '',
},
}
......
# Generated by Django 3.1.4 on 2021-02-25 06:15
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('taskdatabase', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='task',
name='priority',
field=models.IntegerField(default=1, null=True),
),
migrations.AlterField(
model_name='task',
name='size_processed',
field=models.PositiveBigIntegerField(blank=True, default=0, null=True),
),
migrations.AlterField(
model_name='task',
name='size_to_process',
field=models.PositiveBigIntegerField(blank=True, default=0, null=True),
),
migrations.AlterField(
model_name='task',
name='total_processing_time',
field=models.IntegerField(blank=True, default=0, null=True),
),
]
......@@ -27,7 +27,7 @@ class Task(models.Model):
resume = models.BooleanField(default=True)
creationTime = models.DateTimeField(default=datetime.utcnow, blank=True)
priority = models.IntegerField(null=True)
priority = models.IntegerField(default=1, null=True)
purge_policy = models.CharField(max_length=5, default="no", blank=True, null=True)
stage_request_id = models.IntegerField(null=True)
......@@ -38,9 +38,9 @@ class Task(models.Model):
outputs = models.JSONField(null=True, blank=True)
metrics = models.JSONField(null=True, blank=True)
size_to_process = models.PositiveBigIntegerField(null=True)
size_processed = models.PositiveBigIntegerField(null=True)
total_processing_time = models.IntegerField(null=True)
size_to_process = models.PositiveBigIntegerField(default=0, null=True, blank=True)
size_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True)
total_processing_time = models.IntegerField(default=0, null=True, blank=True)
# relationships
......
......@@ -45,7 +45,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
<p class="footer"> Version 1.0.0 (20 feb 2021 - 19:00)
<p class="footer"> Version 1.0.0 (25 feb 2021 - 7:00)
<script type="text/javascript">
(function(seconds) {
var refresh,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment