Patch AoC tables to use the Discord user as PK.

4 files changed, 16 insertions, 14 deletions

diff --git a/pydis_site/apps/api/migrations/0080_add_aoc_tables.py b/pydis_site/apps/api/migrations/0080_add_aoc_tables.py
index 917c5b7f..2c0c689a 100644
--- a/pydis_site/apps/api/migrations/0080_add_aoc_tables.py
+++ b/pydis_site/apps/api/migrations/0080_add_aoc_tables.py
@@ -13,21 +13,19 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='AocCompletionistBlock',
+            name='AocAccountLink',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_blocked', models.BooleanField(default=True, help_text='Whether this user is actively being blocked from getting the AoC Completionist Role', verbose_name='Blocked')),
-                ('reason', models.TextField(help_text='The reason for the AoC Completionist Role Block.', null=True)),
-                ('user', models.OneToOneField(help_text='The user that is blocked from getting the AoC Completionist Role', on_delete=django.db.models.deletion.CASCADE, to='api.user')),
+                ('user', models.OneToOneField(help_text='The user that is blocked from getting the AoC Completionist Role', on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='api.user')),
+                ('aoc_username', models.CharField(help_text='The AoC username associated with the Discord User.', max_length=120)),
             ],
             bases=(pydis_site.apps.api.models.mixins.ModelReprMixin, models.Model),
         ),
         migrations.CreateModel(
-            name='AocAccountLink',
+            name='AocCompletionistBlock',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('aoc_username', models.CharField(help_text='The AoC username associated with the Discord User.', max_length=120)),
-                ('user', models.OneToOneField(help_text='The user that is blocked from getting the AoC Completionist Role', on_delete=django.db.models.deletion.CASCADE, to='api.user')),
+                ('user', models.OneToOneField(help_text='The user that is blocked from getting the AoC Completionist Role', on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='api.user')),
+                ('is_blocked', models.BooleanField(default=True, help_text='Whether this user is actively being blocked from getting the AoC Completionist Role', verbose_name='Blocked')),
+                ('reason', models.TextField(help_text='The reason for the AoC Completionist Role Block.', null=True)),
             ],
             bases=(pydis_site.apps.api.models.mixins.ModelReprMixin, models.Model),
         ),
diff --git a/pydis_site/apps/api/models/bot/aoc_completionist_block.py b/pydis_site/apps/api/models/bot/aoc_completionist_block.py
index 6605cbc4..acbc0eba 100644
--- a/pydis_site/apps/api/models/bot/aoc_completionist_block.py
+++ b/pydis_site/apps/api/models/bot/aoc_completionist_block.py
@@ -10,7 +10,8 @@ class AocCompletionistBlock(ModelReprMixin, models.Model):
     user = models.OneToOneField(
         User,
         on_delete=models.CASCADE,
-        help_text="The user that is blocked from getting the AoC Completionist Role"
+        help_text="The user that is blocked from getting the AoC Completionist Role",
+        primary_key=True
     )
 
     is_blocked = models.BooleanField(
diff --git a/pydis_site/apps/api/models/bot/aoc_link.py b/pydis_site/apps/api/models/bot/aoc_link.py
index 9b47456d..4e9d4882 100644
--- a/pydis_site/apps/api/models/bot/aoc_link.py
+++ b/pydis_site/apps/api/models/bot/aoc_link.py
@@ -10,7 +10,8 @@ class AocAccountLink(ModelReprMixin, models.Model):
     user = models.OneToOneField(
         User,
         on_delete=models.CASCADE,
-        help_text="The user that is blocked from getting the AoC Completionist Role"
+        help_text="The user that is blocked from getting the AoC Completionist Role",
+        primary_key=True
     )
 
     aoc_username = models.CharField(
diff --git a/pydis_site/apps/api/viewsets/bot/aoc_link.py b/pydis_site/apps/api/viewsets/bot/aoc_link.py
index 263b548d..c3fa6854 100644
--- a/pydis_site/apps/api/viewsets/bot/aoc_link.py
+++ b/pydis_site/apps/api/viewsets/bot/aoc_link.py
@@ -24,7 +24,8 @@ class AocAccountLinkViewSet(
     ...     {
     ...         "user": 2,
     ...         "aoc_username": "AoCUser1"
-    ...     }
+    ...     },
+    ...     ...
     ... ]
 
 
@@ -32,11 +33,12 @@ class AocAccountLinkViewSet(
     Retrieve a AoC account link by User ID
 
     #### Response format
-    >>>
+    >>> [
     ...     {
     ...         "user": 2,
     ...         "aoc_username": "AoCUser1"
-    ...     }
+    ...     },
+    ... ]
 
     #### Status codes
     - 200: returned on success