mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-15 09:24:52 +03:00
Fix style in users api views and serializers
This commit is contained in:
parent
fc06128f9e
commit
742321f64d
|
@ -7,7 +7,7 @@ User = get_user_model()
|
||||||
class UserSerializer(serializers.ModelSerializer):
|
class UserSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = User
|
model = User
|
||||||
{% if cookiecutter.username_type == "email" -%}
|
{%- if cookiecutter.username_type == "email" %}
|
||||||
fields = ["name", "url"]
|
fields = ["name", "url"]
|
||||||
|
|
||||||
extra_kwargs = {
|
extra_kwargs = {
|
||||||
|
|
|
@ -13,7 +13,7 @@ User = get_user_model()
|
||||||
class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
|
class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
|
||||||
serializer_class = UserSerializer
|
serializer_class = UserSerializer
|
||||||
queryset = User.objects.all()
|
queryset = User.objects.all()
|
||||||
{% if cookiecutter.username_type == "email" -%}
|
{%- if cookiecutter.username_type == "email" %}
|
||||||
lookup_field = "pk"
|
lookup_field = "pk"
|
||||||
{%- else %}
|
{%- else %}
|
||||||
lookup_field = "username"
|
lookup_field = "username"
|
||||||
|
|
|
@ -4,7 +4,7 @@ from {{ cookiecutter.project_slug }}.users.models import User
|
||||||
|
|
||||||
|
|
||||||
def test_user_detail(user: User):
|
def test_user_detail(user: User):
|
||||||
{% if cookiecutter.username_type == "email" -%}
|
{%- if cookiecutter.username_type == "email" %}
|
||||||
assert (
|
assert (
|
||||||
reverse("api:user-detail", kwargs={"pk": user.pk})
|
reverse("api:user-detail", kwargs={"pk": user.pk})
|
||||||
== f"/api/users/{user.pk}/"
|
== f"/api/users/{user.pk}/"
|
||||||
|
|
|
@ -29,7 +29,7 @@ class TestUserViewSet:
|
||||||
response = view.me(request) # type: ignore
|
response = view.me(request) # type: ignore
|
||||||
|
|
||||||
assert response.data == {
|
assert response.data == {
|
||||||
{% if cookiecutter.username_type == "email" -%}
|
{%- if cookiecutter.username_type == "email" %}
|
||||||
"url": f"http://testserver/api/users/{user.pk}/",
|
"url": f"http://testserver/api/users/{user.pk}/",
|
||||||
{%- else %}
|
{%- else %}
|
||||||
"username": user.username,
|
"username": user.username,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user