Skip to content

Commit

Permalink
Add RemoveTeamMemberAPIView
Browse files Browse the repository at this point in the history
  • Loading branch information
Oksamies committed Jan 4, 2024
1 parent 463470a commit e425149
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 1 deletion.
2 changes: 2 additions & 0 deletions django/thunderstore/api/cyberstorm/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
TeamMemberAddAPIView,
TeamMemberListAPIView,
TeamServiceAccountListAPIView,
RemoveTeamMemberAPIView,
)

__all__ = [
Expand All @@ -31,4 +32,5 @@
"TeamMemberAddAPIView",
"TeamMemberListAPIView",
"TeamServiceAccountListAPIView",
"RemoveTeamMemberAPIView",
]
54 changes: 53 additions & 1 deletion django/thunderstore/api/cyberstorm/views/team.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib.auth import get_user_model
from django.db.models import Q, QuerySet
from django.http import HttpRequest
from rest_framework import serializers
from rest_framework.exceptions import PermissionDenied, ValidationError
from rest_framework.generics import ListAPIView, RetrieveAPIView, get_object_or_404
Expand All @@ -19,7 +20,7 @@
CyberstormAutoSchemaMixin,
conditional_swagger_auto_schema,
)
from thunderstore.repository.forms import AddTeamMemberForm
from thunderstore.repository.forms import AddTeamMemberForm, RemoveTeamMemberForm
from thunderstore.repository.models.team import Team, TeamMember

User = get_user_model()
Expand Down Expand Up @@ -107,6 +108,57 @@ def post(self, request, team_name, format=None):
raise ValidationError(form.errors)


class CyberstormRemoveTeamMemberRequestSerialiazer(serializers.Serializer):
username = serializers.CharField()


class CyberstormRemoveTeamMemberResponseSerialiazer(serializers.Serializer):
username = serializers.CharField()
team_name = serializers.CharField()


class RemoveTeamMemberAPIView(APIView):
permission_classes = [IsAuthenticated]

@conditional_swagger_auto_schema(
request_body=CyberstormRemoveTeamMemberRequestSerialiazer,
responses={200: CyberstormRemoveTeamMemberResponseSerialiazer},
operation_id="cyberstorm.team.members.remove",
tags=["cyberstorm"],
)
def post(self, request: HttpRequest, team_name: str):
team = get_object_or_404(Team, name__iexact=team_name)

Check warning on line 130 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

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

Added line #L130 was not covered by tests

serializer = CyberstormRemoveTeamMemberRequestSerialiazer(data=request.data)
serializer.is_valid(raise_exception=True)

Check warning on line 133 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

django/thunderstore/api/cyberstorm/views/team.py#L132-L133

Added lines #L132 - L133 were not covered by tests

team_member = get_object_or_404(

Check warning on line 135 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

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

Added line #L135 was not covered by tests
TeamMember,
user__username__iexact=serializer.validated_data["username"],
team=team,
)

membership = team.get_membership_for_user(team_member.user)

Check warning on line 141 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

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

Added line #L141 was not covered by tests

form = RemoveTeamMemberForm(

Check warning on line 143 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

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

Added line #L143 was not covered by tests
user=request.user,
data={"membership": membership},
)

if form.is_valid():
form.save()
return Response(

Check warning on line 150 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

django/thunderstore/api/cyberstorm/views/team.py#L149-L150

Added lines #L149 - L150 were not covered by tests
CyberstormRemoveTeamMemberResponseSerialiazer(
{
"username": serializer.validated_data["username"],
"team_name": team_name,
}
).data
)
else:
raise ValidationError(form.errors)

Check warning on line 159 in django/thunderstore/api/cyberstorm/views/team.py

View check run for this annotation

Codecov / codecov/patch

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

Added line #L159 was not covered by tests


class TeamServiceAccountListAPIView(CyberstormAutoSchemaMixin, TeamRestrictedAPIView):
serializer_class = CyberstormServiceAccountSerializer
filter_backends = [StrictOrderingFilter]
Expand Down
6 changes: 6 additions & 0 deletions django/thunderstore/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
TeamMemberAddAPIView,
TeamMemberListAPIView,
TeamServiceAccountListAPIView,
RemoveTeamMemberAPIView,
)

cyberstorm_urls = [
Expand Down Expand Up @@ -98,4 +99,9 @@
TeamServiceAccountListAPIView.as_view(),
name="cyberstorm.team.service-account",
),
path(
"team/<str:team_name>/members/remove/",
RemoveTeamMemberAPIView.as_view(),
name="cyberstorm.team.members.remove",
),
]

0 comments on commit e425149

Please sign in to comment.