diff --git a/atdb/docs/ATDB-LDV Data Model.png b/atdb/docs/ATDB-LDV Data Model.png index b82814904d74f2303a3a6cf5dd27c2927c289a49..e75767f34cc841cfcb4275218997e7c2baeeb0a5 100644 Binary files a/atdb/docs/ATDB-LDV Data Model.png and b/atdb/docs/ATDB-LDV Data Model.png differ diff --git a/atdb/docs/ATDB-LDV Workflow Diagram.png b/atdb/docs/ATDB-LDV Workflow Diagram.png index eeed7db92827385b647afd4d7cd5bbe68545db9b..bfc181c2409bfe8314261e540aa2d2bef3f4cd09 100644 Binary files a/atdb/docs/ATDB-LDV Workflow Diagram.png and b/atdb/docs/ATDB-LDV Workflow Diagram.png differ diff --git a/atdb/taskdatabase/migrations/0046_rename_is_combined_activity_is_aggregated_and_more.py b/atdb/taskdatabase/migrations/0046_rename_is_combined_activity_is_aggregated_and_more.py new file mode 100644 index 0000000000000000000000000000000000000000..97e7ced0047d910acb32b4280ee8f501f1d62db8 --- /dev/null +++ b/atdb/taskdatabase/migrations/0046_rename_is_combined_activity_is_aggregated_and_more.py @@ -0,0 +1,22 @@ +# Generated by Django 5.0 on 2024-04-05 07:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0045_activity_is_processed'), + ] + + operations = [ + migrations.RenameField( + model_name='activity', + old_name='is_combined', + new_name='is_aggregated', + ), + migrations.RemoveField( + model_name='activity', + name='is_validated', + ), + ] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 1ca1c9b8d2d55c4a59544d76cfbf87387ffa2052..5a32371b5dbe4937b8f0fcabb266a65ba7906dbb 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -118,11 +118,8 @@ class Activity(models.Model): # flag set by ATDB to indicate that all tasks of this Activity has been processed is_processed = models.BooleanField(default=False) - # TODO: flag set by the 'validate' step in ATDB, used by ancillary service - is_validated = models.BooleanField(default=False) - # TODO: flag set (and used) by the ancillary service, so that it doesn't do double work - is_combined = models.BooleanField(default=False) + is_aggregated = models.BooleanField(default=False) finished_fraction = models.FloatField(blank=True, null=True) ingested_fraction = models.FloatField(blank=True, null=True) diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index 860589b73e604651d513cccb4173c1158b2c3945..50a92d74ee2ea00f477b4c62ef5df9470e52fd7c 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/atdb/taskdatabase/services/activities_handler.py @@ -142,9 +142,9 @@ def update_activity(task): # only save when changed if activity.is_processed != current_is_processed: - # if the whole activity has become processed, then set the status of this activity to 'HANDLE_ANCILLARY' + # if the whole activity has become processed, then set the status of this activity to 'AGGREGATE' if activity.is_processed: - activity.status = State.HANDLE_ANCILLARY.value + activity.status = State.AGGREGATE.value activity.save() diff --git a/atdb/taskdatabase/services/common.py b/atdb/taskdatabase/services/common.py index 19035e7f8c0c0cc0bf8aef4629696d5b56419dbf..78e1a83cea6da9315ec9d229505639ac1aa7822f 100644 --- a/atdb/taskdatabase/services/common.py +++ b/atdb/taskdatabase/services/common.py @@ -13,8 +13,8 @@ class State(Enum): STAGED = "staged" FETCHED = "fetched" PROCESSED = "processed" - HANDLE_ANCILLARY = "handle_ancillary" - ANCILLARY_HANDLED = "ancillary_handled" + AGGREGATE = "aggregate" + AGGREGATED = "aggregated" STORED = 'stored' VALIDATED = "validated" SCRUBBED = "scrubbed" diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index f5c6af67b05c31c27fb497d2ff4c028aba413472..7ceb99b0d9bf89dd55dde7520ef35e0ed32bd656 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -31,7 +31,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 2 Apr 2024 + <p class="footer"> Version 5 Apr 2024 </div> {% include 'taskdatabase/refresh.html' %} diff --git a/atdb/taskdatabase/tests/test_update_activity.py b/atdb/taskdatabase/tests/test_update_activity.py index 68b4f5ac23d14d81d920b18ea177370eccb8aeef..4076e73433c4542dfe16dacdcbe57ed81714a532 100644 --- a/atdb/taskdatabase/tests/test_update_activity.py +++ b/atdb/taskdatabase/tests/test_update_activity.py @@ -197,4 +197,4 @@ class TestUpdateActivity(TestCase): self.assertEqual(actual, True) actual = activity.status - self.assertEqual(actual, State.HANDLE_ANCILLARY.value) \ No newline at end of file + self.assertEqual(actual, State.AGGREGATE.value) \ No newline at end of file diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 23aa284d53a3356fcd0cca09c93ccbf7276c056c..b80e2361a8a7c0ead2aea3751b56a1472d180e86 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -133,8 +133,7 @@ class ActivityFilter(filters.FilterSet): 'remaining': ['exact', 'lt', 'lte', 'gt', 'gte'], 'is_processed': ['exact'], 'is_verified': ['exact'], - 'is_validated': ['exact'], - 'is_combined': ['exact'], + 'is_aggregated': ['exact'], }