fix(access): adding/deleting team group actions moved to model save/delete method override

!13

app/access/models.py

@@ -1,9 +1,10 @@
 from django.conf import settings
 from django.db import models
-from django.contrib.auth.models import Group, Permission
+from django.contrib.auth.models import User, Group, Permission
 
 from .fields import *
 
+from core.middleware.get_request import get_request
 from core.mixin.history_save import SaveHistory
 
 
@@ -71,7 +72,6 @@ class Team(Group, TenancyObject, SaveHistory):
 
     def save(self, *args, **kwargs):
 
-
         self.name = self.organization.name.lower().replace(' ', '_') + '_' + self.team_name.lower().replace(' ', '_')
 
         super().save(*args, **kwargs)
@@ -122,3 +122,36 @@ class TeamUsers(SaveHistory):
     created = AutoCreatedField()
 
     modified = AutoLastModifiedField()
+
+
+    def delete(self, using=None, keep_parents=False):
+        """ Delete Team
+
+        Overrides, post-action
+            As teams are an extension of Groups, remove the user to the team.
+        """
+
+        super().delete(using=using, keep_parents=keep_parents)
+
+        group = Group.objects.get(pk=self.team.id)
+
+        user = User.objects.get(pk=self.user_id)
+        
+        user.groups.remove(group)
+
+
+    def save(self, *args, **kwargs):
+        """ Save Team
+
+        Overrides, post-action
+            As teams are an extension of groups, add the user to the matching group.
+        """
+
+        super().save(*args, **kwargs)
+
+        group = Group.objects.get(pk=self.team.id)
+
+        user = User.objects.get(pk=self.user_id)
+
+        user.groups.add(group) 
+

app/access/views/user.py

@@ -24,10 +24,6 @@ class Add(PermissionRequiredMixin, OrganizationPermission, generic.CreateView):
         team = Team.objects.get(pk=self.kwargs['pk'])
         form.instance.team = team
 
-        group = Group.objects.get(pk=team.group_ptr_id)
-        user = User.objects.get(pk=self.request.POST['user'][0])
-        user.groups.add(group)  
-
         return super().form_valid(form)
 
 
@@ -52,20 +48,6 @@ class Delete(PermissionRequiredMixin, OrganizationPermission, generic.DeleteView
     template_name = 'form.html.j2'
 
 
-    def form_valid(self, form):
-
-        team = Team.objects.get(pk=self.kwargs['team_id'])
-        teamuser = TeamUsers.objects.get(pk=self.kwargs['pk'])
-
-        group = Group.objects.get(pk=team.group_ptr_id)
-
-        user = User.objects.get(pk=teamuser.user_id)
-        
-        user.groups.remove(group)  
-
-        return super().form_valid(form)
-
-
     def get_success_url(self, **kwargs):
         return f"/organization/{self.kwargs['organization_id']}/team/{self.kwargs['team_id']}"