Merge branch 'SDC-937-many-to-one-join' into 'master'

add many-to-1 joined tasks fields

See merge request !310

atdb/taskdatabase/migrations/0029_auto_20230707_1135.py

+# Generated by Django 3.1.4 on 2023-07-07 09:35
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taskdatabase', '0028_remove_task_calculated_quality'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='job',
+            name='timestamp',
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='joined_input_tasks',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='joined_output_task', to='taskdatabase.task'),
+        ),
+        migrations.AlterField(
+            model_name='status',
+            name='timestamp',
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='creationTime',
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now, verbose_name='CreationTime'),
+        ),
+    ]

atdb/taskdatabase/migrations/0030_auto_20230707_1144.py

+# Generated by Django 3.1.4 on 2023-07-07 09:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taskdatabase', '0029_auto_20230707_1135'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='task',
+            name='joined_input_tasks',
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='joined_output_task',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='joined_input_tasks', to='taskdatabase.task'),
+        ),
+    ]

atdb/taskdatabase/models.py

@@ -123,6 +123,7 @@ class Task(models.Model):
     # relationships
     workflow = models.ForeignKey(Workflow, related_name='tasks', on_delete=models.CASCADE, null=True, blank=True)
     predecessor = models.ForeignKey('self', related_name='successors', on_delete=models.SET_NULL, null=True, blank=True)
+    joined_output_task = models.ForeignKey('self', related_name='joined_input_tasks', on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return str(self.id) + ' - (' + self.task_type + ') - ' + str(self.sas_id)
@@ -384,6 +385,7 @@ class Job(models.Model):
     type = models.CharField(db_index=True, max_length=20, default=None,null=True, blank=True)
     task_id = models.IntegerField(null=True, blank=True)
     job_id = models.IntegerField(null=True, blank=True)
+    timestamp = models.DateTimeField(default=timezone.now, blank=True)
     metadata = models.JSONField(null=True, blank=True)
 
     # the representation of the value in the REST API

atdb/taskdatabase/serializers.py

@@ -37,7 +37,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Task
-        fields = ('id','task_type','filter','predecessor','successors',
+        fields = ('id','task_type','filter','predecessor','successors','joined_input_tasks','joined_output_task',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'new_workflow_id','new_workflow_uri','workflow',
                   'stage_request_id',
@@ -91,7 +91,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
     class Meta:
         model = Task
         fields = ['id','task_type','creationTime','filter',
-                  'predecessor','predecessor_status','successors',
+                  'predecessor','predecessor_status','successors', 'joined_input_tasks','joined_output_task',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',
@@ -123,6 +123,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer):
     class Meta:
         model = Task
         fields = ['id','task_type','creationTime','filter','predecessor','predecessor_status',
+                  'joined_input_tasks', 'joined_output_task',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',
@@ -159,7 +160,7 @@ class JobSerializer(serializers.ModelSerializer):
     class Meta:
         model = Job
         fields = "__all__"
-        fields = ['id','type','task_id','job_id','metadata','webdav_url']
+        fields = ['id','type','task_id','job_id','timestamp','metadata','webdav_url']
 
 class PostProcessingRuleSerializer(serializers.ModelSerializer):