From a0ae96923c7979c5f9374522692c9c7787989162 Mon Sep 17 00:00:00 2001
From: corentin-feys <corentin.feys@outlook.com>
Date: Sun, 13 Mar 2022 23:34:49 +0100
Subject: [PATCH] fix to pass invite request pytest

---
 .../migrations/0145_auto_20220312_1016.py     | 29 ------------------
 .../migrations/0145_auto_20220313_2206.py     | 30 +++++++++++++++++++
 ...alter_sitesettings_invite_question_text.py | 23 --------------
 bookwyrm/models/site.py                       |  2 +-
 4 files changed, 31 insertions(+), 53 deletions(-)
 delete mode 100644 bookwyrm/migrations/0145_auto_20220312_1016.py
 create mode 100644 bookwyrm/migrations/0145_auto_20220313_2206.py
 delete mode 100644 bookwyrm/migrations/0146_alter_sitesettings_invite_question_text.py

diff --git a/bookwyrm/migrations/0145_auto_20220312_1016.py b/bookwyrm/migrations/0145_auto_20220312_1016.py
deleted file mode 100644
index 7796e022..00000000
--- a/bookwyrm/migrations/0145_auto_20220312_1016.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 3.2.12 on 2022-03-12 10:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0144_alter_announcement_display_type'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='inviterequest',
-            name='answer',
-            field=models.TextField(default='Foundation by Isaac Azimov', max_length=50),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='sitesettings',
-            name='invite_question_text',
-            field=models.CharField(blank=True, default='What is your favourite book?', max_length=255),
-        ),
-        migrations.AddField(
-            model_name='sitesettings',
-            name='invite_request_question',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0145_auto_20220313_2206.py b/bookwyrm/migrations/0145_auto_20220313_2206.py
new file mode 100644
index 00000000..8d06ca8b
--- /dev/null
+++ b/bookwyrm/migrations/0145_auto_20220313_2206.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.2.12 on 2022-03-13 22:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0144_alter_announcement_display_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="inviterequest",
+            name="answer",
+            field=models.TextField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name="sitesettings",
+            name="invite_question_text",
+            field=models.CharField(
+                blank=True, default="What is your favourite book?", max_length=255
+            ),
+        ),
+        migrations.AddField(
+            model_name="sitesettings",
+            name="invite_request_question",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0146_alter_sitesettings_invite_question_text.py b/bookwyrm/migrations/0146_alter_sitesettings_invite_question_text.py
deleted file mode 100644
index 5d0eb93b..00000000
--- a/bookwyrm/migrations/0146_alter_sitesettings_invite_question_text.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.2.12 on 2022-03-11 15:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0145_auto_20220307_2025"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="sitesettings",
-            name="invite_question_text",
-            field=models.CharField(
-                blank=True,
-                default="What is your favourite book?",
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 51c7d3a8..e939da20 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -155,7 +155,7 @@ class InviteRequest(BookWyrmModel):
     invite = models.ForeignKey(
         SiteInvite, on_delete=models.SET_NULL, null=True, blank=True
     )
-    answer = models.TextField(max_length=50, unique=False, null=False)
+    answer = models.TextField(max_length=50, unique=False, null=True, blank=True)
     invite_sent = models.BooleanField(default=False)
     ignored = models.BooleanField(default=False)