From f093907393b4f479f62409286831b938ba65c558 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:27:18 +0200
Subject: Create a signal to unassign roles from user when deleted

Add a signal to the api app that automatically unassigns
deleted roles from users that have them
---
 pydis_site/apps/api/signals.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 pydis_site/apps/api/signals.py

(limited to 'pydis_site/apps/api/signals.py')

diff --git a/pydis_site/apps/api/signals.py b/pydis_site/apps/api/signals.py
new file mode 100644
index 00000000..c69704b1
--- /dev/null
+++ b/pydis_site/apps/api/signals.py
@@ -0,0 +1,12 @@
+from django.db.models.signals import pre_delete
+from django.dispatch import receiver
+
+from pydis_site.apps.api.models.bot import Role, User
+
+
+@receiver(signal=pre_delete, sender=Role)
+def delete_role_from_user(sender: Role, instance: Role, **kwargs) -> None:
+    """Unassigns the Role (instance) that is being deleted from every user that has it."""
+    for user in User.objects.filter(roles__contains=[instance.id]):
+        del user.roles[user.roles.index(instance.id)]
+        user.save()
-- 
cgit v1.2.3


From f34a52016bd5a7d50c1146d6fbd213ce889f58c7 Mon Sep 17 00:00:00 2001
From: D0rs4n <41237606+D0rs4n@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:21:36 +0200
Subject: Patch signals to use post_delete, instead of pre_delete

From now on the signal will only get executed after the Role has been deleted
The commit also introduces minor changes in the tests of roles
---
 pydis_site/apps/api/signals.py          | 4 ++--
 pydis_site/apps/api/tests/test_roles.py | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/api/signals.py')

diff --git a/pydis_site/apps/api/signals.py b/pydis_site/apps/api/signals.py
index c69704b1..5c26bfb6 100644
--- a/pydis_site/apps/api/signals.py
+++ b/pydis_site/apps/api/signals.py
@@ -1,10 +1,10 @@
-from django.db.models.signals import pre_delete
+from django.db.models.signals import post_delete
 from django.dispatch import receiver
 
 from pydis_site.apps.api.models.bot import Role, User
 
 
-@receiver(signal=pre_delete, sender=Role)
+@receiver(signal=post_delete, sender=Role)
 def delete_role_from_user(sender: Role, instance: Role, **kwargs) -> None:
     """Unassigns the Role (instance) that is being deleted from every user that has it."""
     for user in User.objects.filter(roles__contains=[instance.id]):
diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
index 88c0256b..73c80c77 100644
--- a/pydis_site/apps/api/tests/test_roles.py
+++ b/pydis_site/apps/api/tests/test_roles.py
@@ -4,7 +4,6 @@ from .base import AuthenticatedAPITestCase
 from ..models import Role, User
 
 
-
 class CreationTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
@@ -96,11 +95,11 @@ class CreationTests(AuthenticatedAPITestCase):
         url = reverse('api:bot:role-list')
 
         response = self.client.get(url)
-        self.assertContains(response, text="id", count=4, status_code=200)
+        self.assertContains(response, text="id", count=5, status_code=200)
 
         roles = response.json()
         self.assertIsInstance(roles, list)
-        self.assertEqual(len(roles), 4)
+        self.assertEqual(len(roles), 5)
 
         for role in roles:
             self._validate_roledict(role)
-- 
cgit v1.2.3