From 9b0cf5c6937ce0d1ba3d1a58159dd6bd085c80dd Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Wed, 20 Jan 2021 11:32:14 +0100
Subject: [PATCH] Remove not necessary fields
---
atdb/taskdatabase/models.py | 3 ---
atdb/taskdatabase/serializers.py | 28 +++++++++++++--------------
atdb/taskdatabase/services/signals.py | 23 ----------------------
3 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 16cd9d74..f732bc58 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -31,9 +31,6 @@ class Task(models.Model):
sas_id = models.CharField(max_length=30, blank=True, null=True)
priority = models.IntegerField(default=0)
purge_policy = models.CharField(max_length=5, default="no", blank=True, null=True)
- desired_workflow_id = models.CharField(max_length=12, blank=True, null=True)
- desired_workflow_uri = models.CharField(max_length=100, blank=True, null=True)
- workflow = models.ForeignKey(Workflow, related_name='tasks', on_delete=models.SET_NULL, null=True,blank=True)
inputs = models.JSONField(null=True, blank=True)
outputs = models.JSONField(null=True, blank=True)
diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py
index 74546845..7ac8e7f1 100644
--- a/atdb/taskdatabase/serializers.py
+++ b/atdb/taskdatabase/serializers.py
@@ -2,19 +2,30 @@ from rest_framework import serializers
from .models import Status, Task, Workflow, LogEntry
-class TaskSerializer(serializers.ModelSerializer):
+class WorkflowSerializer(serializers.ModelSerializer):
+
+# tasks = serializers.StringRelatedField(
+# many=True,
+# required=False,
+# )
+
+ class Meta:
+ model = Workflow
+ fields = "__all__"
+
+
+class TaskSerializer(serializers.ModelSerializer):
status_history = serializers.StringRelatedField(
many=True,
required=False,
)
-
class Meta:
model = Task
fields = ('id','task_type','taskID',
'desired_predecessor_id','predecessor','successor',
'project','sas_id','priority','purge_policy','skip',
- 'desired_workflow_id','desired_workflow_uri','workflow',
+ 'workflow',
'status','desired_status',
'inputs','outputs','status_history')
@@ -26,17 +37,6 @@ class StatusSerializer(serializers.ModelSerializer):
fields = "__all__"
-class WorkflowSerializer(serializers.ModelSerializer):
-
-# tasks = serializers.StringRelatedField(
-# many=True,
-# required=False,
-# )
-
- class Meta:
- model = Workflow
- fields = "__all__"
-
class LogEntrySerializer(serializers.ModelSerializer):
diff --git a/atdb/taskdatabase/services/signals.py b/atdb/taskdatabase/services/signals.py
index 03ce4475..deda8633 100644
--- a/atdb/taskdatabase/services/signals.py
+++ b/atdb/taskdatabase/services/signals.py
@@ -34,28 +34,6 @@ def pre_save_task_handler(sender, **kwargs):
handle_pre_save(sender, **kwargs)
-def add_workflow(myTaskObject):
- desired_workflow_id = myTaskObject.desired_workflow_id
- desired_workflow_uri = myTaskObject.desired_workflow_uri
-
- # first try to find the workflow by desired workflow_id
- try:
- desired_workflow = Workflow.objects.get(id=desired_workflow_id)
- except:
- desired_workflow = None
-
- if (desired_workflow == None):
- # then try workflow_uri
- desired_workflow = Workflow.objects.get(workflow_uri=desired_workflow_uri)
-
- # first check if works needs to be done at all
- if (myTaskObject.workflow != desired_workflow):
- # set the new status
- myTaskObject.workflow = desired_workflow
-
- return myTaskObject
-
-
def add_predecessor(myTaskObject):
# connect the task to a workflow after posting a (flat) task through the REST API
@@ -101,7 +79,6 @@ def handle_pre_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_predecessor(myTaskObject)
--
GitLab