From dff7f1e618d0915707b2e0033573bf3f307992d1 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Thu, 22 Feb 2024 14:28:43 +0100
Subject: [PATCH] add 2 additional flags in Activity for future use (doing all
database changes in 1 migration)
---
...ivity_is_combined_activity_is_validated.py | 23 +++++++++++++++++++
atdb/taskdatabase/models.py | 10 +++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 atdb/taskdatabase/migrations/0043_activity_is_combined_activity_is_validated.py
diff --git a/atdb/taskdatabase/migrations/0043_activity_is_combined_activity_is_validated.py b/atdb/taskdatabase/migrations/0043_activity_is_combined_activity_is_validated.py
new file mode 100644
index 00000000..6bbc07c6
--- /dev/null
+++ b/atdb/taskdatabase/migrations/0043_activity_is_combined_activity_is_validated.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0 on 2024-02-22 13:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('taskdatabase', '0042_task_is_summary'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='activity',
+ name='is_combined',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='is_validated',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 14d24b81..24ebb6e2 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -111,7 +111,15 @@ class Activity(models.Model):
# this is the JSON blob that is filled in by the ldv_archiver during the ingest process
archive = models.JSONField(null=True, blank=True)
- is_verified = models.BooleanField(default=False)
+ # set by update_activity, used by Validation Page
+ is_verified = models.BooleanField(default=False)
+
+ # TODO: flag set by the 'validate' step in ATDB, used by combine service
+ is_validated = models.BooleanField(default=False)
+
+ # TODO: flag set (and used) by the combine service, so that it doesn't do double work
+ is_combined = models.BooleanField(default=False)
+
finished_fraction = models.FloatField(blank=True, null=True)
ingested_fraction = models.FloatField(blank=True, null=True)
total_size = models.FloatField(blank=True, null=True)
--
GitLab