Merge pull request #621 from alan-turing-institute/437-user-story-imp…

…lement-commenting-feature-for-enhanced-collaboration-on-assurance-case-elements Fixing migration problems
alan-turing-institute · Sep 26, 2024 · 874235f · 874235f
2 parents 58a82a4 + a7bceba
commit 874235f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 82 deletions.
diff --git a/eap_backend/eap_api/migrations/0024_auto_20240926_0816.py b/eap_backend/eap_api/migrations/0024_auto_20240926_0816.py
diff --git a/...api/migrations/0025_auto_20240926_0821.py → ...api/migrations/0024_auto_20240926_1231.py b/...api/migrations/0025_auto_20240926_0821.py → ...api/migrations/0024_auto_20240926_1231.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.8 on 2024-09-26 08:21
+# Generated by Django 3.2.8 on 2024-09-26 12:31
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -7,21 +7,11 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("eap_api", "0024_auto_20240926_0816"),
+        ("eap_api", "0023_assurancecaseimage"),
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name="comment",
-            name="assurance_case",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="comments",
-                to="eap_api.assurancecase",
-            ),
-        ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name="comment",
             name="context",
             field=models.ForeignKey(
@@ -32,7 +22,7 @@ class Migration(migrations.Migration):
                 to="eap_api.context",
             ),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name="comment",
             name="evidence",
             field=models.ForeignKey(
@@ -43,7 +33,7 @@ class Migration(migrations.Migration):
                 to="eap_api.evidence",
             ),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name="comment",
             name="goal",
             field=models.ForeignKey(
@@ -54,7 +44,7 @@ class Migration(migrations.Migration):
                 to="eap_api.toplevelnormativegoal",
             ),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name="comment",
             name="property_claim",
             field=models.ForeignKey(
@@ -65,7 +55,7 @@ class Migration(migrations.Migration):
                 to="eap_api.propertyclaim",
             ),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name="comment",
             name="strategy",
             field=models.ForeignKey(
@@ -76,4 +66,15 @@ class Migration(migrations.Migration):
                 to="eap_api.strategy",
             ),
         ),
+        migrations.AlterField(
+            model_name="comment",
+            name="assurance_case",
+            field=models.ForeignKey(
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="comments",
+                to="eap_api.assurancecase",
+            ),
+        ),
     ]
diff --git a/eap_backend/eap_api/models.py b/eap_backend/eap_api/models.py
@@ -247,7 +247,11 @@ class Comment(models.Model):
     )
 
     assurance_case = models.ForeignKey(
-        AssuranceCase, related_name="comments", on_delete=models.CASCADE, null=True
+        AssuranceCase,
+        related_name="comments",
+        on_delete=models.CASCADE,
+        null=True,
+        default=None,
     )
     goal = models.ForeignKey(
         TopLevelNormativeGoal,