Use service layer functions in form views

Utilize create_team and disband_team in form views. Update forms to use
the service layer functions in the form's save() functions and update
the view logic accordingly.

Update the form for creating teams to be a Form instead of ModelForm in
order to simplify the validations since validation happens in the
service layer function and also in the model.

Update all the tests accordingly to these changes. Add more tests to the
service layer functions.

Refs. TS-2426

Author: Roffenlund

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

@@ -20,9 +20,9 @@ def create_team(agent: UserType, team_name: str) -> Team:
         raise PermissionValidationError("Must be authenticated to create teams")
     if getattr(agent, "service_account", None) is not None:
         raise PermissionValidationError("Service accounts cannot create teams")
-    if Team.objects.filter(name=team_name).exists():
+    if Team.objects.filter(name__iexact=team_name).exists():
         raise ValidationError("A team with the provided name already exists")
-    if Namespace.objects.filter(name=team_name).exists():
+    if Namespace.objects.filter(name__iexact=team_name).exists():
         raise ValidationError("A namespace with the provided name already exists")
 
     team = Team.objects.create(name=team_name)

django/thunderstore/api/cyberstorm/tests/services/test_team_services.py

@@ -111,3 +111,23 @@ def test_create_team_user_not_active(user):
     error_msg = "Must be authenticated to create teams"
     with pytest.raises(ValidationError, match=error_msg):
         team_services.create_team(agent=user, team_name="new_team")
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize(
+    ("name1", "name2", "should_fail"),
+    (
+        ("Team", "team", True),
+        ("Team", "t_eam", False),
+        ("team", "teaM", True),
+        ("team", "team", True),
+    ),
+)
+def test_create_team_name_conflict(user, name1: str, name2: str, should_fail: bool):
+    Team.create(name=name1)
+    if should_fail:
+        with pytest.raises(ValidationError):
+            team_services.create_team(agent=user, team_name=name2)
+    else:
+        team = team_services.create_team(agent=user, team_name=name2)
+        assert team.name == name2

django/thunderstore/repository/forms/team.py

@@ -4,53 +4,36 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 
-from thunderstore.core.exceptions import PermissionValidationError
+from thunderstore.api.cyberstorm.services.team import create_team, disband_team
 from thunderstore.core.types import UserType
-from thunderstore.repository.models import (
-    Namespace,
-    Team,
-    TeamMember,
-    TeamMemberRole,
-    transaction,
-)
+from thunderstore.repository.models import Team, TeamMember, TeamMemberRole, transaction
 from thunderstore.repository.validators import PackageReferenceComponentValidator
 
 User = get_user_model()
 
 
-class CreateTeamForm(forms.ModelForm):
+class CreateTeamForm(forms.Form):
     name = forms.CharField(
         validators=[PackageReferenceComponentValidator("Author name")]
     )
 
-    class Meta:
-        model = Team
-        fields = ["name"]
-
-    def __init__(self, user: UserType, *args, **kwargs):
+    def __init__(self, user: UserType, instance: Team = None, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
-
-    def clean_name(self):
-        name = self.cleaned_data["name"]
-        if Team.objects.filter(name__iexact=name.lower()).exists():
-            raise ValidationError(f"A team with the provided name already exists")
-        if Namespace.objects.filter(name__iexact=name.lower()).exists():
-            raise ValidationError("A namespace with the provided name already exists")
-        return name
-
-    def clean(self):
-        if not self.user or not self.user.is_authenticated or not self.user.is_active:
-            raise PermissionValidationError("Must be authenticated to create teams")
-        if getattr(self.user, "service_account", None) is not None:
-            raise PermissionValidationError("Service accounts cannot create teams")
-        return super().clean()
+        self.instance = instance
 
     @transaction.atomic
     def save(self, *args, **kwargs) -> Team:
-        instance = super().save()
-        instance.add_member(user=self.user, role=TeamMemberRole.owner)
-        return instance
+        if self.errors:
+            raise ValueError("Form has errors")
+
+        try:
+            team_name = self.cleaned_data["name"]
+            self.instance = create_team(agent=self.user, team_name=team_name)
+        except ValidationError as e:
+            self.add_error(None, e)
+
+        return self.instance
 
 
 class AddTeamMemberForm(forms.ModelForm):
@@ -152,21 +135,24 @@ def __init__(self, user: UserType, *args, **kwargs):
         self.user = user
 
     def clean_verification(self):
-        data = self.cleaned_data["verification"]
-        if data != self.instance.name:
+        verification = self.cleaned_data["verification"]
+        if verification != self.instance.name:
             raise forms.ValidationError("Invalid verification")
-        return data
+        return verification
 
     def clean(self):
         if not self.instance.pk:
             raise ValidationError("Missing team instance")
-        self.instance.ensure_user_can_disband(self.user)
         return super().clean()
 
-    @transaction.atomic
     def save(self, **kwargs):
-        self.instance.ensure_user_can_disband(self.user)
-        self.instance.delete()
+        if self.errors:
+            raise ValueError("Form has errors")
+
+        try:
+            disband_team(agent=self.user, team=self.instance)
+        except ValidationError as e:
+            self.add_error(None, e)
 
 
 class DonationLinkTeamForm(forms.ModelForm):

django/thunderstore/repository/tests/test_team_forms.py

@@ -39,6 +39,7 @@ def test_form_create_team_valid_data(user_type: str) -> None:
         data={"name": "TeamName"},
     )
     if expected_error:
+        form.save()
         assert form.is_valid() is False
         assert expected_error in str(repr(form.errors))
     else:
@@ -70,6 +71,7 @@ def test_form_create_team_team_name_conflict(
         data={"name": name2},
     )
     if should_fail:
+        form.save()
         assert form.is_valid() is False
         assert "A team with the provided name already exists" in str(repr(form.errors))
     else:
@@ -102,6 +104,8 @@ def test_form_create_team_team_name_validation(
         data={"name": name},
     )
     if should_fail:
+        with pytest.raises(ValueError):
+            form.save()
         assert form.is_valid() is False
         assert error in str(repr(form.errors))
     else:
@@ -452,6 +456,7 @@ def test_form_disband_team_form(
         assert form.save() is None
         assert Team.objects.filter(pk=team.pk).exists() is False
     else:
+        form.save()
         assert form.is_valid() is False
         assert form.errors
 
@@ -470,6 +475,8 @@ def test_form_disband_team_form_invalid_verification(
         instance=team,
         data={"verification": f"invalid-{team.name}"},
     )
+    with pytest.raises(ValueError):
+        form.save()
     assert form.is_valid() is False
     assert "Invalid verification" in str(repr(form.errors))
 
@@ -488,6 +495,7 @@ def test_form_disband_team_form_packages_exist(
         instance=team,
         data={"verification": team.name},
     )
+    form.save()
     assert form.is_valid() is False
     assert "Unable to disband teams with packages" in str(repr(form.errors))
 

django/thunderstore/repository/views/team_settings.py

@@ -16,6 +16,7 @@
     CreateServiceAccountForm,
     DeleteServiceAccountForm,
 )
+from thunderstore.api.cyberstorm.services import team as team_service
 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
 
@@ -152,8 +152,10 @@ def get_context_data(self, **kwargs):
 
     @transaction.atomic
     def form_valid(self, form):
-        instance = form.save()
-        return redirect(instance.settings_url)
+        self.object = form.save()
+        if form.errors:
+            return self.form_invalid(form)
+        return redirect(reverse("settings.teams"))
 
 
 class SettingsTeamDisbandView(TeamDetailView, UserFormKwargs, FormView):
@@ -175,6 +177,8 @@ def get_form_kwargs(self):
     @transaction.atomic
     def form_valid(self, form):
         form.save()
+        if form.errors:
+            return self.form_invalid(form)
         return redirect(reverse("settings.teams"))