Use service layer in form view

Utilize the service layer function for removing team members in the
form views responsible for kicking members from a team, and in the form
responsible for leaving a team.

Update tests accordingly to the new changes.

Remove redundant get_team_or_404 function.

Refs. TS-2315

Author: Roffenlund

django/thunderstore/api/cyberstorm/views/team.py

@@ -30,13 +30,6 @@
 from thunderstore.repository.models.team import Team, TeamMember
 
 
-def get_team_object_or_404(team_name: str) -> Team:
-    return get_object_or_404(
-        Team.objects.exclude(is_active=False),
-        name=team_name,
-    )
-
-
 def get_team_member_object_or_404(team_name: str, team_member: str) -> TeamMember:
     return get_object_or_404(
         TeamMember.objects.real_users(),

django/thunderstore/repository/forms/team.py

@@ -4,6 +4,7 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 
+from thunderstore.api.cyberstorm.services.team import remove_team_member
 from thunderstore.core.exceptions import PermissionValidationError
 from thunderstore.core.types import UserType
 from thunderstore.repository.models import (
@@ -93,15 +94,17 @@ 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()
+        if self.errors:
+            raise ValidationError(self.errors)
+
+        try:
+            membership = self.cleaned_data["membership"]
+            remove_team_member(agent=self.user, team_member=membership)
+        except ValidationError as e:
+            self.add_error(None, e)
+
+        return None
 
 
 class EditTeamMemberForm(forms.ModelForm):

django/thunderstore/repository/tests/test_team_forms.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 import pytest
+from django.core.exceptions import ValidationError
 
 from conftest import TestUserTypes
 from thunderstore.core.factories import UserFactory
@@ -253,8 +254,14 @@ def test_form_remove_team_member(
         assert form.save() is None
         assert TeamMember.objects.filter(pk=membership).exists() is False
     else:
-        assert form.is_valid() is False
-        assert form.errors
+        if form.errors:
+            assert form.is_valid() is False
+            with pytest.raises(ValidationError):
+                form.save()
+        else:
+            form.save()
+            assert form.is_valid() is False
+            assert form.errors
 
 
 @pytest.mark.django_db
@@ -294,6 +301,7 @@ def test_form_remove_team_member_last_owner() -> None:
         user=user,
         data={"membership": last_owner.pk},
     )
+    form.save()
     assert form.is_valid() is False
     assert "Cannot remove last owner from team" in str(repr(form.errors))
 

django/thunderstore/repository/views/team_settings.py

@@ -26,7 +26,6 @@
     DonationLinkTeamForm,
     EditTeamMemberForm,
     RemoveTeamMemberForm,
-    TeamMemberRole,
 )
 from thunderstore.repository.models import Team, TeamMember, reverse
 
@@ -111,14 +110,15 @@ 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_message = "There was a problem performing the requested action"
+        messages.error(self.request, error_message)
         capture_exception(ValidationError(form.errors))
         return super().form_invalid(form)
 
     def form_valid(self, form):
         form.save()
+        if form.errors:  # Check if there are any errors in the form post-validation
+            return self.form_invalid(form)
         messages.success(self.request, "Action performed successfully")
         return redirect(self.object.settings_url)
 
@@ -200,6 +200,8 @@ def form_invalid(self, form):
     @transaction.atomic
     def form_valid(self, form):
         form.save()
+        if form.errors:
+            return self.form_invalid(form)
         return redirect(reverse("settings.teams"))