Merge pull request #89 from scaleoutsystems/FIX/fk_constraints

Set proper Foreign Key constraints across the DB models

components/studio/deployments/models.py

@@ -16,7 +16,7 @@ class DeploymentDefinition(models.Model):
     ]
 
     project = models.ForeignKey('projects.Project',
-                                on_delete=models.DO_NOTHING,
+                                on_delete=models.CASCADE,
                                 related_name='project_owner', blank=True, null=True)
     access = models.CharField(max_length=2, choices=ACCESS, default=PRIVATE)
     name = models.CharField(max_length=512, unique=True)
@@ -41,9 +41,9 @@ class DeploymentInstance(models.Model):
         (PUBLIC, 'Public'),
     ]
 
-    deployment = models.ForeignKey('deployments.DeploymentDefinition', on_delete=models.DO_NOTHING)
+    deployment = models.ForeignKey('deployments.DeploymentDefinition', on_delete=models.CASCADE)
 
-    model = models.OneToOneField('models.Model', on_delete=models.DO_NOTHING, related_name='deployed_model', unique=True)
+    model = models.OneToOneField('models.Model', on_delete=models.CASCADE, related_name='deployed_model', unique=True)
     access = models.CharField(max_length=2, choices=ACCESS, default=PRIVATE)
     endpoint = models.CharField(max_length=512)
     release = models.CharField(max_length=512)

components/studio/experiments/models.py

@@ -5,7 +5,7 @@
 class Experiment(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     command = models.CharField(max_length=1024)
-    environment = models.ForeignKey('projects.Environment', on_delete=models.DO_NOTHING, related_name='job_environment')
+    environment = models.ForeignKey('projects.Environment', on_delete=models.CASCADE, related_name='job_environment')
     project = models.ForeignKey('projects.Project', on_delete=models.CASCADE, related_name='job_project')
     created_at = models.DateTimeField(auto_now_add=True)
     uploaded_at = models.DateTimeField(auto_now=True)

components/studio/labs/models.py

@@ -53,7 +53,7 @@ class Session(models.Model):
         (FINISHED, 'Finished'),
         (ABORTED, 'Aborted'),
     ]
-    project = models.ForeignKey('projects.Project', on_delete=models.DO_NOTHING, related_name='session')
+    project = models.ForeignKey('projects.Project', on_delete=models.CASCADE, related_name='session')
 
     session_key = models.CharField(max_length=512)
     session_secret = models.CharField(max_length=512)

components/studio/models/models.py

@@ -16,9 +16,11 @@ class Model(models.Model):
 
     CREATED = 'CR'
     DEPLOYED = 'DP'
+    ARCHIVED = 'AR'
     STATUS = [
         (CREATED, 'Created'),
         (DEPLOYED, 'Deployed'),
+        (ARCHIVED, 'Archived'),
     ]
     uid = models.CharField(max_length=255)
     name = models.CharField(max_length=255)
@@ -27,7 +29,11 @@ class Model(models.Model):
     resource = models.URLField(max_length=2048, null=True, blank=True)
     url = models.URLField(max_length=512, null=True, blank=True)
     uploaded_at = models.DateTimeField(auto_now_add=True)
-    project = models.ForeignKey('projects.Project', on_delete=models.DO_NOTHING, related_name='model_owner')
+    project = models.ForeignKey(
+        'projects.Project',
+        on_delete=models.SET_NULL,
+        related_name='model_owner',
+        null=True)
     status = models.CharField(max_length=2, choices=STATUS, default=CREATED)
     tag = models.CharField(max_length=10, default='latest')
 

components/studio/projects/views.py

@@ -10,6 +10,7 @@
 import markdown
 from .forms import TransferProjectOwnershipForm
 from django.db.models import Q
+from models.models import Model
 
 logger = logging.getLogger(__name__)
 
@@ -172,6 +173,11 @@ def delete(request, user, project_slug):
 
     print("PROJECT RESOURCES DELETED SUCCESFULLY!")
 
+    models = Model.objects.filter(project=project)
+    for model in models:
+        model.status = 'AR'
+        model.save()
+
     project.delete()
 
     return HttpResponseRedirect(next_page, {'message': 'Deleted project successfully.'})

components/studio/reports/models.py

@@ -21,5 +21,5 @@ class Report(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     report = models.TextField(blank=True)
     job_id = models.CharField(max_length=256)
-    generator = models.ForeignKey('reports.ReportGenerator', on_delete=models.CASCADE)
+    generator = models.ForeignKey('reports.ReportGenerator', on_delete=models.SET_NULL, null=True)
     status = models.CharField(max_length=1, choices=REPORT_STATUS, default='I')

components/studio/workflows/models.py

@@ -25,10 +25,10 @@ class WorkflowInstance(models.Model):
         (FINISHED, 'Finished'),
         (ABORTED, 'Aborted'),
     ]
-    project = models.ForeignKey('projects.Project', on_delete=models.DO_NOTHING, related_name='project')
+    project = models.ForeignKey('projects.Project', on_delete=models.CASCADE, related_name='project')
     status = models.CharField(max_length=2, choices=STATUS, default=CREATED)
 
-    workflow = models.ForeignKey('workflows.WorkflowDefinition', on_delete=models.DO_NOTHING,
+    workflow = models.ForeignKey('workflows.WorkflowDefinition', on_delete=models.CASCADE,
                                  related_name='workflow_definition')
     name = models.CharField(max_length=512, unique=False)
     created_at = models.DateTimeField(auto_now_add=True)