Merge pull request #39 from cloudblue/feature/LITE-28073-Tasks-executor

LITE-28073: Refactoring process code. Adding validation for deploymen…

connect_ext_ppr/models/deployment.py

@@ -33,7 +33,7 @@ class Deployment(Model):
     created_at = db.Column(db.DateTime(), default=datetime.utcnow)
     updated_at = db.Column(db.DateTime(), onupdate=datetime.utcnow, default=datetime.utcnow)
 
-    product = relationship('Product', backref="deployments")
+    product = relationship('Product', foreign_keys="Deployment.product_id")
 
 
 class DeploymentRequest(Model):

connect_ext_ppr/models/enums.py

@@ -24,6 +24,12 @@ class TasksStatusChoices(str, enum.Enum):
     ABORTED = 'aborted'
 
 
+class TaskTypesChoices(str, enum.Enum):
+    PPR_VALIDATION = 'ppr_validation'
+    APPLY_AND_DELEGATE = 'apply_ppr_and_delegate_to_marketplace'
+    DELEGATE_TO_L2 = 'delegate_to_l2'
+
+
 class MimeTypeChoices(str, enum.Enum):
     application_json = 'application/json'
     application_manifest_json = 'application/manifest+json'

connect_ext_ppr/models/task.py

@@ -3,7 +3,7 @@
 import sqlalchemy as db
 
 from connect_ext_ppr.db import Model
-from connect_ext_ppr.models.enums import TasksStatusChoices
+from connect_ext_ppr.models.enums import TasksStatusChoices, TaskTypesChoices
 from connect_ext_ppr.models.deployment import DeploymentRequest
 
 
@@ -20,6 +20,7 @@ class Task(Model):
     deployment_request = db.Column(db.ForeignKey(DeploymentRequest.id))
     title = db.Column(db.String(100))
     error_message = db.Column(db.String((4000)))
+    type = db.Column(db.Enum(TaskTypesChoices, validate_strings=True))
 
     created_at = db.Column(db.DateTime(), default=datetime.utcnow)
     created_by = db.Column(db.String(20))