diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 290c5e8ba6793b882d29f399a6825e578b1670b0..1ca1c9b8d2d55c4a59544d76cfbf87387ffa2052 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -240,7 +240,13 @@ class Task(models.Model): # if so, temporarily put it on hold so that the ancillary service can play with it if self.is_summary: - self.resume = False + # slightly bothered by the idea that ATDB puts it on HOLD and depends on the ancillary service + # to resume it. But users have earlier asked for the same dynamic for scrubbed. Acceptable + + pass + # TODO: uncomment this, but I don't want to have it accidentally active without + # the summary service available and running to resume it. + #self.resume = False # nv:20feb2024, same as above, but for backward compatibilty reasons. # For tasks that are already beyond PROCESSED, but not yet ingested. diff --git a/atdb/taskdatabase/tests/test_models_processed_summary.py b/atdb/taskdatabase/tests/test_models_processed_summary.py index 4030f586fb1b375a494454ff75cb076574852df6..706e3acf3c77daa925b34d2e80fc14ccbeef80ed 100644 --- a/atdb/taskdatabase/tests/test_models_processed_summary.py +++ b/atdb/taskdatabase/tests/test_models_processed_summary.py @@ -38,6 +38,7 @@ class TestProcessedSummary(TestCase): """ actual = self.task2.resume + # this test fails, because "self.resume = False" is still commented out in models.py L249 self.assertEqual(actual, False) def test_activity_is_processed(self): diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index e3469e622ebb30439a37691d76cdcd5b1140a1fa..23aa284d53a3356fcd0cca09c93ccbf7276c056c 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -89,6 +89,7 @@ class TaskFilter(filters.FilterSet): 'predecessor__status': ['exact', 'icontains', 'in', 'startswith'], 'activity' : ['isnull'], 'activity__id': ['exact'], + 'activity__status': ['exact', 'icontains', 'in', 'startswith'], 'activity__ingested_fraction' : ['exact','lt', 'lte', 'gt', 'gte','isnull'], } @@ -130,6 +131,10 @@ class ActivityFilter(filters.FilterSet): 'finished_fraction': ['exact', 'lt', 'lte', 'gt', 'gte'], 'total_size': ['exact', 'lt', 'lte', 'gt', 'gte'], 'remaining': ['exact', 'lt', 'lte', 'gt', 'gte'], + 'is_processed': ['exact'], + 'is_verified': ['exact'], + 'is_validated': ['exact'], + 'is_combined': ['exact'], }