diff --git a/apiserver/plane/ee/migrations/0023_alter_importjob_status_and_more.py b/apiserver/plane/ee/migrations/0023_alter_importjob_status_and_more.py new file mode 100644 index 0000000000..c7df5dc7ea --- /dev/null +++ b/apiserver/plane/ee/migrations/0023_alter_importjob_status_and_more.py @@ -0,0 +1,30 @@ +# Generated by Django 4.2.18 on 2025-01-28 08:32 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('db', '0090_rename_dashboard_deprecateddashboard_and_more'), + ('ee', '0022_workflowactivity_workflowapproval_workflowapprover_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='importjob', + name='status', + field=models.CharField(choices=[('CREATED', 'Created'), ('QUEUED', 'Queued'), ('INITIATED', 'Initiated'), ('PULLING', 'Pulling'), ('PULLED', 'Pulled'), ('TRANSFORMING', 'Transforming'), ('PUSHING', 'Pushing'), ('FINISHED', 'Finished'), ('ERROR', 'Error'), ('CANCELLED', 'Cancelled')], default='CREATED', max_length=20), + ), + migrations.AlterField( + model_name='workspaceentityconnection', + name='issue', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='entity_connections', to='db.issue'), + ), + migrations.AlterField( + model_name='workspaceentityconnection', + name='project', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='entity_connections', to='db.project'), + ), + ] diff --git a/apiserver/plane/ee/models/job.py b/apiserver/plane/ee/models/job.py index bd34b3d0c5..bba36ad8a3 100644 --- a/apiserver/plane/ee/models/job.py +++ b/apiserver/plane/ee/models/job.py @@ -35,6 +35,7 @@ class ImportJob(BaseModel): QUEUED = "QUEUED", "Queued" INITIATED = "INITIATED", "Initiated" PULLING = "PULLING", "Pulling" + PULLED = "PULLED", "Pulled" TRANSFORMING = "TRANSFORMING", "Transforming" PUSHING = "PUSHING", "Pushing" FINISHED = "FINISHED", "Finished" diff --git a/apiserver/plane/ee/models/workspace.py b/apiserver/plane/ee/models/workspace.py index 51ef2a6b4d..7231a8a4ff 100644 --- a/apiserver/plane/ee/models/workspace.py +++ b/apiserver/plane/ee/models/workspace.py @@ -137,7 +137,11 @@ class WorkspaceConnection(BaseModel): "db.Workspace", on_delete=models.CASCADE, related_name="connections" ) credential = models.ForeignKey( - "ee.WorkspaceCredential", on_delete=models.CASCADE, related_name="connections", null=True, blank=True + "ee.WorkspaceCredential", + on_delete=models.CASCADE, + related_name="connections", + null=True, + blank=True, ) target_hostname = models.TextField(null=True, blank=True) source_hostname = models.TextField(null=True, blank=True) @@ -175,10 +179,18 @@ class WorkspaceEntityConnection(BaseModel): "db.Workspace", on_delete=models.CASCADE, related_name="entity_connections" ) project = models.ForeignKey( - "db.Project", on_delete=models.CASCADE, related_name="entity_connections" + "db.Project", + on_delete=models.CASCADE, + related_name="entity_connections", + null=True, + blank=True, ) issue = models.ForeignKey( - "db.Issue", on_delete=models.CASCADE, related_name="entity_connections" + "db.Issue", + on_delete=models.CASCADE, + related_name="entity_connections", + null=True, + blank=True, ) entity_type = models.CharField(max_length=30, blank=True, null=True) entity_id = models.CharField(max_length=255, blank=True, null=True)