Reworked model such that the block_document/order tuple is unique

MaxCunningham19 · Mar 2, 2023 · 23ba78c · 23ba78c
1 parent 570c964
commit 23ba78c
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/node_modules
+/node_modules
+/env
diff --git a/api/__pycache__/__init__.cpython-310.pyc b/api/__pycache__/__init__.cpython-310.pyc
diff --git a/api/__pycache__/admin.cpython-310.pyc b/api/__pycache__/admin.cpython-310.pyc
diff --git a/api/__pycache__/apps.cpython-310.pyc b/api/__pycache__/apps.cpython-310.pyc
diff --git a/api/__pycache__/models.cpython-310.pyc b/api/__pycache__/models.cpython-310.pyc
diff --git a/api/__pycache__/serializers.cpython-310.pyc b/api/__pycache__/serializers.cpython-310.pyc
diff --git a/api/__pycache__/spellcheck.cpython-310.pyc b/api/__pycache__/spellcheck.cpython-310.pyc
diff --git a/api/__pycache__/urls.cpython-310.pyc b/api/__pycache__/urls.cpython-310.pyc
diff --git a/api/__pycache__/views.cpython-310.pyc b/api/__pycache__/views.cpython-310.pyc
diff --git a/api/migrations/0004_alter_block_unique_together.py b/api/migrations/0004_alter_block_unique_together.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.5 on 2023-03-02 14:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_block_block_order'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='block',
+            unique_together={('block_document', 'block_order')},
+        ),
+    ]
diff --git a/api/migrations/__pycache__/0001_initial.cpython-310.pyc b/api/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/...grations/__pycache__/0002_block_document_delete_post_block_block_document.cpython-310.pyc b/...grations/__pycache__/0002_block_document_delete_post_block_block_document.cpython-310.pyc
diff --git a/api/migrations/__pycache__/0003_block_block_order.cpython-310.pyc b/api/migrations/__pycache__/0003_block_block_order.cpython-310.pyc
diff --git a/api/migrations/__pycache__/0004_alter_block_unique_together.cpython-310.pyc b/api/migrations/__pycache__/0004_alter_block_unique_together.cpython-310.pyc
diff --git a/api/migrations/__pycache__/__init__.cpython-310.pyc b/api/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/api/models.py b/api/models.py
@@ -21,14 +21,17 @@ class Block(models.Model):
     The text content of a block.
     """
 
-    block_order = models.IntegerField(default=0, unique=True)
+    block_order = models.IntegerField(default=0)
     """
     The index of a block within a document.
     """
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now_add=True)
 
+    class Meta:
+        unique_together = ['block_document', 'block_order']
+
     def __str__(self):
         return self.block_content
 

diff --git a/client/__pycache__/__init__.cpython-310.pyc b/client/__pycache__/__init__.cpython-310.pyc
diff --git a/client/__pycache__/admin.cpython-310.pyc b/client/__pycache__/admin.cpython-310.pyc
diff --git a/client/__pycache__/apps.cpython-310.pyc b/client/__pycache__/apps.cpython-310.pyc
diff --git a/client/__pycache__/models.cpython-310.pyc b/client/__pycache__/models.cpython-310.pyc
diff --git a/client/__pycache__/urls.cpython-310.pyc b/client/__pycache__/urls.cpython-310.pyc
diff --git a/client/__pycache__/views.cpython-310.pyc b/client/__pycache__/views.cpython-310.pyc
diff --git a/client/migrations/__pycache__/__init__.cpython-310.pyc b/client/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/server/__pycache__/__init__.cpython-310.pyc b/server/__pycache__/__init__.cpython-310.pyc
diff --git a/server/__pycache__/settings.cpython-310.pyc b/server/__pycache__/settings.cpython-310.pyc
diff --git a/server/__pycache__/urls.cpython-310.pyc b/server/__pycache__/urls.cpython-310.pyc
diff --git a/test.sh b/test.sh
@@ -0,0 +1,8 @@
+mkdir -p static/client/js
+touch static/client/js/main.js
+cd docker
+sudo docker-compose build
+sudo docker-compose up -d webserver
+sudo docker-compose exec -T webserver bash -c '. scripts/install.sh; python3 manage.py test'
+sudo rm -rf ../static
+sudo docker-compose down