get rid of new_workflow_uri and new_workflow_id in models.py

atdb/taskdatabase/models.py

@@ -24,8 +24,6 @@ class Task(models.Model):
     new_status = models.CharField(max_length=50, default="defining", null=True)
     status = models.CharField(db_index=True, default="unknown", max_length=50,blank=True, null=True)
 
-    new_workflow_id = models.CharField(max_length=15, blank=True, null=True)
-    new_workflow_uri = models.CharField(max_length=100, blank=True, null=True)
     resume = models.BooleanField(default=True)
     creationTime = models.DateTimeField(default=datetime.utcnow, blank=True)
 

atdb/taskdatabase/serializers.py

@@ -41,6 +41,9 @@ class TaskSerializer(serializers.ModelSerializer):
         required=False,
     )
 
+    new_workflow_id = serializers.SerializerMethodField()  # no corresponding model property.
+    new_workflow_uri = serializers.SerializerMethodField()  # no corresponding model property.
+
     class Meta:
         model = Task
         fields = ('id','task_type','filter','predecessor','successors',
@@ -52,6 +55,30 @@ class TaskSerializer(serializers.ModelSerializer):
                   'log_entries'
                   )
 
+    def get_new_workflow_id(self, instance):
+        return instance.workflow.id
+
+    def get_new_workflow_uri(self, instance):
+        return instance.workflow.workflow_uri
+
+    def create(self, validated_data):
+        task = Task.objects.create(**validated_data)
+
+        workflow_uri = self.initial_data['new_workflow_uri']
+        if workflow_uri:
+            #workflow_uri = validated_data['new_workflow_uri']
+            workflow = Workflow.objects.get(workflow_uri=workflow_uri)
+            task.workflow = workflow
+            task.save()
+            return task
+
+        workflow_id = self.initial_data['new_workflow_id']
+        if workflow_id:
+            workflow = Workflow.objects.get(id=workflow_id)
+            task.workflow = workflow
+            task.save()
+            return task
+
 
 class StatusSerializer(serializers.ModelSerializer):
 

atdb/taskdatabase/services/signals.py

@@ -143,7 +143,7 @@ def handle_post_save(sender, **kwargs):
         myStatus.save()
 
     # connect the task to a workflow after posting a (flat) task through the REST API
-    myTaskObject = add_workflow(myTaskObject)
+    #myTaskObject = add_workflow(myTaskObject)
     #myTaskObject = add_predecessor(myTaskObject)
 
     # temporarily disconnect the post_save handler to save the dataproduct (again) and avoiding recursion.

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -44,7 +44,7 @@
     </div>
     {% include 'taskdatabase/pagination.html' %}
 </div>
-    <p class="footer"> Version 1.0.0 (29 jan 2021 - 16:00)
+    <p class="footer"> Version 1.0.0 (1 feb 2021 - 17:00)
     <script type="text/javascript">
         (function(seconds) {
             var refresh,