Use service layer function in form views

Utilize the remove team member service layer function in the form views.
Remove logic from the form as this logic has now moved to the service
layer and update the tests accordingly. The form is now only intended
for validating POST data to the view.

Refs. TS-2315

Author: Roffenlund

django/thunderstore/repository/forms/team.py

@@ -93,16 +93,6 @@ def __init__(self, user: Optional[UserType], *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
 
-    def clean_membership(self):
-        membership = self.cleaned_data["membership"]
-        if membership.user != self.user:
-            membership.team.ensure_user_can_manage_members(self.user)
-        membership.team.ensure_member_can_be_removed(membership)
-        return membership
-
-    def save(self):
-        self.cleaned_data["membership"].delete()
-
 
 class EditTeamMemberForm(forms.ModelForm):
     class Meta:

django/thunderstore/repository/tests/test_team_forms.py

@@ -179,87 +179,9 @@ def test_form_add_team_member(
         assert form.errors
 
 
-@pytest.mark.django_db
-@pytest.mark.parametrize("remover_type", TestUserTypes.options())
-@pytest.mark.parametrize("removed_type", TestUserTypes.options())
-@pytest.mark.parametrize("remover_role", TeamMemberRole.options() + [None])
-@pytest.mark.parametrize("removed_role", TeamMemberRole.options() + [None])
-def test_form_remove_team_member(
-    remover_type: str, removed_type: str, remover_role: str, removed_role: str
-) -> None:
-    remover_type_valid_map = {
-        TestUserTypes.no_user: False,
-        TestUserTypes.unauthenticated: False,
-        TestUserTypes.regular_user: True,
-        TestUserTypes.deactivated_user: False,
-        TestUserTypes.service_account: False,
-        TestUserTypes.site_admin: True,
-        TestUserTypes.superuser: True,
-    }
-    removed_type_valid_map = {
-        **remover_type_valid_map,
-        **{TestUserTypes.deactivated_user: True},
-    }
-    remover_role_valid_map = {
-        None: False,
-        TeamMemberRole.member: False,
-        TeamMemberRole.owner: True,
-    }
-    removed_role_valid_map = {
-        None: False,
-        TeamMemberRole.member: True,
-        TeamMemberRole.owner: True,
-    }
-    remover_valid = all(
-        (
-            remover_type_valid_map[remover_type],
-            remover_role_valid_map[remover_role],
-        )
-    )
-    removed_valid = all(
-        (
-            removed_type_valid_map[removed_type],
-            removed_role_valid_map[removed_role],
-        )
-    )
-
-    remover = TestUserTypes.get_user_by_type(remover_type)
-    removed = TestUserTypes.get_user_by_type(removed_type)
-    team = Team.create(name="Test")
-
-    if remover is not None and remover.is_authenticated and remover_role is not None:
-        TeamMember.objects.create(
-            team=team,
-            user=remover,
-            role=remover_role,
-        )
-
-    if removed is not None and removed.is_authenticated and removed_role is not None:
-        membership = TeamMember.objects.create(
-            team=team,
-            user=removed,
-            role=removed_role,
-        ).pk
-    else:
-        membership = None
-
-    form = RemoveTeamMemberForm(
-        user=remover,
-        data={"membership": membership},
-    )
-    should_be_valid = all((remover_valid, removed_valid))
-    if should_be_valid:
-        assert form.is_valid() is True
-        assert form.save() is None
-        assert TeamMember.objects.filter(pk=membership).exists() is False
-    else:
-        assert form.is_valid() is False
-        assert form.errors
-
-
 @pytest.mark.django_db
 @pytest.mark.parametrize("role", TeamMemberRole.options())
-def test_form_remove_team_member_works_on_self(role: str) -> None:
+def test_form_remove_team_member_valid_membership_roles(role: str) -> None:
     user = UserFactory()
     team = Team.create(name="Test")
     TeamMember.objects.create(
@@ -277,25 +199,6 @@ def test_form_remove_team_member_works_on_self(role: str) -> None:
         data={"membership": membership.pk},
     )
     assert form.is_valid() is True
-    assert form.save() is None
-    assert TeamMember.objects.filter(pk=membership.pk).exists() is False
-
-
-@pytest.mark.django_db
-def test_form_remove_team_member_last_owner() -> None:
-    user = UserFactory()
-    team = Team.create(name="Test")
-    last_owner = TeamMember.objects.create(
-        user=user,
-        team=team,
-        role=TeamMemberRole.owner,
-    )
-    form = RemoveTeamMemberForm(
-        user=user,
-        data={"membership": last_owner.pk},
-    )
-    assert form.is_valid() is False
-    assert "Cannot remove last owner from team" in str(repr(form.errors))
 
 
 @pytest.mark.django_db

django/thunderstore/repository/views/team_settings.py

@@ -16,6 +16,7 @@
     CreateServiceAccountForm,
     DeleteServiceAccountForm,
 )
+from thunderstore.api.cyberstorm.services.team import remove_team_member
 from thunderstore.core.mixins import RequireAuthenticationMixin
 from thunderstore.core.utils import capture_exception
 from thunderstore.frontend.views import SettingsViewMixin
@@ -26,7 +27,6 @@
     DonationLinkTeamForm,
     EditTeamMemberForm,
     RemoveTeamMemberForm,
-    TeamMemberRole,
 )
 from thunderstore.repository.models import Team, TeamMember, reverse
 
@@ -111,17 +111,31 @@ def get_context_data(self, **kwargs):
         return context
 
     def form_invalid(self, form):
-        messages.error(
-            self.request, "There was a problem performing the requested action"
-        )
+        error_msg = "There was a problem performing the requested action"
+        messages.error(self.request, error_msg)
         capture_exception(ValidationError(form.errors))
         return super().form_invalid(form)
 
     def form_valid(self, form):
+        if "kick" in self.request.POST:
+            return self._handle_kick_action(form)
+
         form.save()
         messages.success(self.request, "Action performed successfully")
         return redirect(self.object.settings_url)
 
+    def _handle_kick_action(self, form):
+        try:
+            remove_team_member(
+                agent=self.request.user,
+                team_member=form.cleaned_data["membership"],
+            )
+        except ValidationError:
+            return self.form_invalid(form)
+
+        messages.success(self.request, "Action performed successfully")
+        return redirect(self.object.settings_url)
+
 
 class SettingsTeamAddMemberView(TeamDetailView, UserFormKwargs, FormView):
     template_name = "settings/team_add_member.html"
@@ -190,16 +204,21 @@ def get_context_data(self, **kwargs):
         context["can_leave"] = not self.object.is_last_owner(self.membership.user)
         return context
 
-    def form_invalid(self, form):
-        messages.error(
-            self.request, "There was a problem performing the requested action"
-        )
+    def form_invalid(self, form, error_msg=None):
+        error_msg = "There was a problem performing the requested action"
+        messages.error(self.request, error_msg)
         capture_exception(ValidationError(form.errors))
         return super().form_invalid(form)
 
     @transaction.atomic
     def form_valid(self, form):
-        form.save()
+        try:
+            remove_team_member(
+                agent=self.request.user,
+                team_member=form.cleaned_data["membership"],
+            )
+        except ValidationError:
+            return self.form_invalid(form)
         return redirect(reverse("settings.teams"))