-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add CS Package Deprecate form and view #1025
Open
Oksamies
wants to merge
1
commit into
cs-pkg-rate
Choose a base branch
from
cs-deprecate
base: cs-pkg-rate
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+326
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
import json | ||
|
||
import pytest | ||
from rest_framework.test import APIClient | ||
|
||
from thunderstore.core.types import UserType | ||
from thunderstore.repository.models import Package | ||
from thunderstore.repository.models.team import TeamMember | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_api_view__succeeds( | ||
api_client: APIClient, | ||
package: Package, | ||
team_member: TeamMember, | ||
) -> None: | ||
api_client.force_authenticate(team_member.user) | ||
|
||
assert Package.objects.get(pk=package.pk).is_deprecated == False | ||
|
||
response = api_client.post( | ||
f"/api/cyberstorm/package/{package.namespace}/{package.name}/deprecate/", | ||
json.dumps({"is_deprecated": True}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["is_deprecated"] == True | ||
assert Package.objects.get(pk=package.pk).is_deprecated == True | ||
|
||
response = api_client.post( | ||
f"/api/cyberstorm/package/{package.namespace}/{package.name}/deprecate/", | ||
json.dumps({"is_deprecated": False}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["is_deprecated"] == False | ||
assert Package.objects.get(pk=package.pk).is_deprecated == False | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_api_view__returns_error_for_non_existent_package( | ||
api_client: APIClient, | ||
user: UserType, | ||
) -> None: | ||
api_client.force_authenticate(user) | ||
response = api_client.post( | ||
f"/api/cyberstorm/package/BAD/BAD/deprecate/", | ||
json.dumps({"is_deprecated": True}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["detail"] == "Not found." | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_api_view__returns_error_for_no_user( | ||
api_client: APIClient, | ||
) -> None: | ||
response = api_client.post( | ||
f"/api/cyberstorm/package/BAD/BAD/deprecate/", | ||
json.dumps({"is_deprecated": True}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["detail"] == "Authentication credentials were not provided." | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_api_view__returns_error_for_bad_data( | ||
api_client: APIClient, | ||
package: Package, | ||
user: UserType, | ||
) -> None: | ||
api_client.force_authenticate(user) | ||
package.is_active = False | ||
package.save() | ||
|
||
response = api_client.post( | ||
f"/api/cyberstorm/package/{package.namespace}/{package.name}/deprecate/", | ||
json.dumps({"bad_data": True}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["is_deprecated"] == ["This field is required."] | ||
|
||
response = api_client.post( | ||
f"/api/cyberstorm/package/{package.namespace}/{package.name}/deprecate/", | ||
json.dumps({"is_deprecated": "bad"}), | ||
content_type="application/json", | ||
) | ||
actual = response.json() | ||
|
||
assert actual["is_deprecated"] == ["Must be a valid boolean."] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
from django.http import HttpRequest | ||
from rest_framework import serializers | ||
from rest_framework.exceptions import ValidationError | ||
from rest_framework.generics import get_object_or_404 | ||
from rest_framework.permissions import IsAuthenticated | ||
from rest_framework.response import Response | ||
from rest_framework.views import APIView | ||
|
||
from thunderstore.api.utils import conditional_swagger_auto_schema | ||
from thunderstore.repository.forms import DeprecateForm | ||
from thunderstore.repository.models import Package | ||
|
||
|
||
class CyberstormDeprecatePackageRequestSerialiazer(serializers.Serializer): | ||
is_deprecated = serializers.BooleanField() | ||
|
||
|
||
class CyberstormDeprecatePackageResponseSerialiazer(serializers.Serializer): | ||
is_deprecated = serializers.BooleanField() | ||
|
||
|
||
class PackageDeprecateAPIView(APIView): | ||
permission_classes = [IsAuthenticated] | ||
|
||
@conditional_swagger_auto_schema( | ||
request_body=CyberstormDeprecatePackageRequestSerialiazer, | ||
responses={200: CyberstormDeprecatePackageResponseSerialiazer}, | ||
operation_id="cyberstorm.package.deprecate", | ||
tags=["cyberstorm"], | ||
) | ||
def post(self, request: HttpRequest, namespace_id: str, package_name: str): | ||
serializer = CyberstormDeprecatePackageRequestSerialiazer(data=request.data) | ||
serializer.is_valid(raise_exception=True) | ||
package = get_object_or_404( | ||
Package, | ||
namespace__name=namespace_id, | ||
name__iexact=package_name, | ||
) | ||
form = DeprecateForm( | ||
user=request.user, | ||
instance=package, | ||
data=serializer.validated_data, | ||
) | ||
if form.is_valid(): | ||
package = form.execute() | ||
return Response(CyberstormDeprecatePackageResponseSerialiazer(package).data) | ||
else: | ||
raise ValidationError(form.errors) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
from .package import * | ||
from .package_rating import * | ||
from .team import * |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
from typing import Optional | ||
|
||
from django import forms | ||
from django.contrib.auth import get_user_model | ||
|
||
from thunderstore.core.types import UserType | ||
from thunderstore.repository.models import Package | ||
|
||
User = get_user_model() | ||
|
||
|
||
class DeprecateForm(forms.ModelForm): | ||
class Meta: | ||
model = Package | ||
fields = ["is_deprecated"] | ||
|
||
def __init__(self, user: Optional[UserType], *args, **kwargs): | ||
super().__init__(*args, **kwargs) | ||
self.user = user | ||
|
||
def clean(self): | ||
self.instance.ensure_user_can_manage_deprecation(self.user) | ||
value = self.data.get("is_deprecated", None) | ||
if not isinstance(value, bool): | ||
raise forms.ValidationError("Given value for is_deprecated is invalid.") | ||
return super().clean() | ||
|
||
def execute(self): | ||
desired_state = self.cleaned_data.get("is_deprecated") | ||
if desired_state: | ||
self.instance.deprecate() | ||
else: | ||
self.instance.undeprecate() | ||
return self.instance |
137 changes: 137 additions & 0 deletions
137
django/thunderstore/repository/tests/test_package_forms.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
import pytest | ||
from django.forms import ValidationError | ||
|
||
from thunderstore.account.models.service_account import ServiceAccount | ||
from thunderstore.repository.forms import DeprecateForm | ||
from thunderstore.repository.models import Package | ||
from thunderstore.repository.models.team import TeamMember | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__correct_values__succeeds( | ||
team_member: TeamMember, package: Package | ||
) -> None: | ||
# Deprecate | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": True}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == True | ||
# Undeprecate | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": False}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == False | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__already_on_state__succeeds( | ||
team_member: TeamMember, package: Package | ||
) -> None: | ||
# Deprecate | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": True}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == True | ||
# Second time | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": True}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == True | ||
# Undeprecate | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": False}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == False | ||
# Second time | ||
p = Package.objects.get(pk=package.pk) | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=p, | ||
data={"is_deprecated": False}, | ||
) | ||
assert form.is_valid() is True | ||
pkg = form.execute() | ||
assert pkg.is_deprecated == False | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__bad_value__fails( | ||
team_member: TeamMember, package: Package | ||
) -> None: | ||
error = "Given value for is_deprecated is invalid." | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=package, | ||
data={"is_deprecated": "bad"}, | ||
) | ||
assert form.is_valid() is False | ||
assert error in str(repr(form.errors)) | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__user_none__fails( | ||
package: Package, | ||
) -> None: | ||
form = DeprecateForm( | ||
user=None, | ||
instance=package, | ||
data={"is_deprecated": True}, | ||
) | ||
with pytest.raises(ValidationError) as e: | ||
form.clean() | ||
assert "Must be authenticated" in str(e.value) | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__user_deactivated__fails( | ||
team_member: TeamMember, package: Package | ||
) -> None: | ||
team_member.user.is_active = False | ||
team_member.user.save() | ||
form = DeprecateForm( | ||
user=team_member.user, | ||
instance=package, | ||
data={"is_deprecated": True}, | ||
) | ||
with pytest.raises(ValidationError) as e: | ||
form.clean() | ||
assert "User has been deactivated" in str(e.value) | ||
|
||
|
||
@pytest.mark.django_db | ||
def test_package_deprecate_form__user_is_service_account__fails( | ||
service_account: ServiceAccount, package: Package | ||
) -> None: | ||
form = DeprecateForm( | ||
user=service_account.user, | ||
instance=package, | ||
data={"is_deprecated": True}, | ||
) | ||
with pytest.raises(ValidationError) as e: | ||
form.clean() | ||
assert "Service accounts are unable to perform this action" in str(e.value) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a typo in both class names -
Serialiazer
should beSerializer
. The corrected names should be:Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.