From d930a8dd6db839f8f36d84a91c94ec6232937726 Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban@inaf.it>
Date: Mon, 6 Sep 2021 16:02:28 +0200
Subject: [PATCH] Added filter to 'vos_job list' command.
Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>
---
transfer_service/db_connector.py | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py
index 3fc1366..fabca6e 100644
--- a/transfer_service/db_connector.py
+++ b/transfer_service/db_connector.py
@@ -414,10 +414,16 @@ class DbConnector(object):
start_time,
owner_id
FROM job
- WHERE phase
- NOT IN ('ABORTED',
- 'COMPLETED',
- 'ERROR')
+ WHERE phase NOT IN ('ABORTED',
+ 'COMPLETED',
+ 'ERROR')
+ AND
+ job_type IN ('pullFromVoSpace',
+ 'pullToVoSpace',
+ 'pushToVoSpace',
+ 'vos_data',
+ 'vos_group',
+ 'vos_import')
ORDER BY creation_time DESC;
""")
result = cursor.fetchall()
@@ -451,6 +457,13 @@ class DbConnector(object):
owner_id
FROM job
WHERE phase = %s
+ AND
+ job_type IN ('pullFromVoSpace',
+ 'pullToVoSpace',
+ 'pushToVoSpace',
+ 'vos_data',
+ 'vos_group',
+ 'vos_import')
ORDER BY creation_time DESC;
""",
(phase,))
@@ -464,6 +477,13 @@ class DbConnector(object):
owner_id
FROM job
WHERE phase = %s
+ AND
+ job_type IN ('pullFromVoSpace',
+ 'pullToVoSpace',
+ 'pushToVoSpace',
+ 'vos_data',
+ 'vos_group',
+ 'vos_import')
ORDER BY creation_time DESC;
""",
(phase,))
--
GitLab