From ccbab5fa6a8e74561140ea820ae5888314d94a25 Mon Sep 17 00:00:00 2001
From: Roy de Goei <goei@astron.nl>
Date: Mon, 24 Jan 2022 16:52:16 +0100
Subject: [PATCH] SDC-470: Fixes after local testing
---
atdb/atdb/settings/dev.py | 2 +-
atdb/taskdatabase/services/algorithms.py | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py
index 43608c90..fc7c77cb 100644
--- a/atdb/atdb/settings/dev.py
+++ b/atdb/atdb/settings/dev.py
@@ -15,7 +15,7 @@ DATABASES = {
'PASSWORD': 'atdb123',
'NAME': 'atdb_ldv',
'HOST': 'localhost',
- 'PORT': '',
+ 'PORT': '5432',
},
}
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 8f64e867..10720c2b 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -52,12 +52,14 @@ def get_min_start_and_max_end_time(sas_id):
min_start_time = None
max_end_time = None
logger.info("get_min_start_and_max_end_time(" + str(sas_id) + ")")
- tasks = Task.objects.filter(sas_id=sas_id).filter(status='archived') + Task.objects.filter(sas_id=sas_id).filter(status='finished')
+ tasks = Task.objects.filter(sas_id=sas_id).filter(Q(status='archived') | Q(status='finished'))
for task in tasks:
# If more entrees are found for 'processing' task, get the latest
- start_time = LogEntry.objects.filter(task=task.pk).filter(step_name='running').filter(status='processing').lastest('timestamp').timestamp
+ latest_start_time = LogEntry.objects.filter(task=task.pk).filter(step_name='running').filter(status='processing').latest('timestamp')
+ start_time = latest_start_time.timestamp
# If more entrees are found for 'processed' task, get the latest
- end_time = LogEntry.objects.filter(task=task.pk).filter(step_name='running').filter(status='processed').lastest('timestamp').timestamp
+ lastest_end_time = LogEntry.objects.filter(task=task.pk).filter(step_name='running').filter(status='processed').latest('timestamp')
+ end_time = lastest_end_time.timestamp
if min_start_time is None:
min_start_time = start_time
elif start_time < min_start_time:
--
GitLab